f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-09-23 20:32:56 +00:00
Code Wiki Activity
1,357 Commits 125 Branches 40 Tags
3063337eb211a4e83d3db65edeb3cd4297783183
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner f0d82b2751 Merge pull request #1549 from Gazook89/Images-Snippet-Menu 
New Snippet Menu for Images, +3 new snippets
 2021-09-01 14:56:32 -04:00
Trevor Buckner 0610c9fe98 fix injecting images putting the cursor midway into the next line of text. 2021-09-01 14:54:52 -04:00
Trevor Buckner 1320f5c6c6 remove uncompressed watercolor splatters 2021-09-01 14:37:39 -04:00
Trevor Buckner 8e1706532b Fix classTable border dimensions 2021-09-01 14:19:01 -04:00
Trevor Buckner 1770323690 Remove standalone snippet; include in classTable snippets 2021-09-01 13:37:07 -04:00
Trevor Buckner 177173d599 Moved classTableDecoration to local file and use decoration class. 2021-09-01 13:19:53 -04:00
Trevor Buckner a15ef8489c Merge pull request #1630 from naturalcrit/dependabot/npm_and_yarn/googleapis-85.0.0 
Bump googleapis from 84.0.0 to 85.0.0
 2021-09-01 00:02:37 -04:00
Trevor Buckner 59fd2454a4 Make images local, change snippet to allow color instead of hue-rotate 2021-08-31 23:57:08 -04:00
Trevor Buckner c178d189c9 Update default.json 2021-08-31 22:08:19 -04:00
Trevor Buckner 1abd151c67 Merge branch 'master' into pr/1549 2021-08-31 16:45:14 -04:00
Trevor Buckner 2f9c08ac49 Merge pull request #1544 from Gazook89/ClassTable-Revisions 
Class table revisions - 1/3 Table, minor fixes
 2021-08-31 16:42:28 -04:00
Trevor Buckner f5057119da Shrink tables width 2021-08-31 16:39:13 -04:00
Trevor Buckner 44172dc5b1 Merge pull request #1627 from naturalcrit/Marked.jsToV3.02 
Make Markdown extensions work with Marked.js 3
 2021-08-31 13:51:08 -04:00
Trevor Buckner 1096c80b17 Make Markdown extensions work with Marked.js 3 2021-08-31 13:50:45 -04:00
Trevor Buckner 43d18191f9 Merge pull request #1626 from naturalcrit/V3ChangelogPrep 
\page alone on line, fix snippets crashing empty brew
 2021-08-31 12:45:37 -04:00
Trevor Buckner 1a71ba0eb2 Force \page on V3 to be alone on line. 2021-08-31 12:08:31 -04:00
Trevor Buckner e14c8c5e91 Lint 2021-08-31 12:03:59 -04:00
Trevor Buckner 13ba5ebcc8 Fix snippets crashing in empty brew 
If this.props.brew.text is an empty string, it will evaluate to `false` and, but since `isStyle()` is also false, `text` is just undefined.
 2021-08-31 11:56:48 -04:00
Trevor Buckner 800c714b9e Merge pull request #1625 from naturalcrit/V3ChangelogPrep 
Fixing drop caps inside `columnWrap`
 2021-08-31 08:56:34 -04:00
Trevor Buckner 493c31b244 Merge pull request #1623 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.25.1 
Bump eslint-plugin-react from 7.25.0 to 7.25.1
 2021-08-30 23:11:49 -04:00
Trevor Buckner 21dfaf6a5a Merge pull request #1621 from naturalcrit/FixMonsterHangingIndentColor 
Allows DL hanging indents in the mosnter stat block that are not red.
 2021-08-30 13:41:45 -04:00
Trevor Buckner 03eef94232 Allows DL hanging indents in the mosnter stat block that are not red. 2021-08-30 13:40:43 -04:00
Trevor Buckner 0e5ed35b6c Fixing drop caps inside columnWrap 2021-08-30 13:34:12 -04:00
Trevor Buckner ac8ef4608a Merge pull request #1618 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-5.2.1 
Bump react-router-dom from 5.2.0 to 5.2.1
 2021-08-29 23:04:52 -04:00
Trevor Buckner a669cd5d86 Merge pull request #1619 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.25.0 
Bump eslint-plugin-react from 7.24.0 to 7.25.0
 2021-08-29 23:04:33 -04:00
Trevor Buckner 0d9981b3c6 Merge pull request #1543 from G-Ambatte/fixViewCountDuringEdit-#406 
Stop view count being reduced by an open Edit page
 2021-08-27 23:04:30 -04:00
Trevor Buckner 2b9362f7bf Merge pull request #1573 from G-Ambatte/addFilteringToUserPage 
User Page filtering
 2021-08-27 23:03:10 -04:00
Trevor Buckner 6b1b9bdce2 Merge branch 'master' into addFilteringToUserPage 2021-08-27 23:00:01 -04:00
Trevor Buckner 539b52ecbd Merge pull request #1594 from G-Ambatte/fixHandleInject-#1593 
Handle `brew.style` being `undefined` when injecting snippets.
 2021-08-27 19:35:05 -04:00
Trevor Buckner e5cfa98bbd Shorten Features column to match shorter names 2021-08-27 12:30:57 -04:00
Trevor Buckner 9d5130154b Remixed Feature names to be shorter. 2021-08-27 12:29:11 -04:00
Trevor Buckner 4ce915100b Merge pull request #1591 from Gazook89/fix-ink-friendly-snippet 
minor fix for ink-friendly legacy snippet
 2021-08-27 09:36:47 -04:00
Trevor Buckner 9b180a1c50 Merge pull request #1574 from Gazook89/metadata-panel-css-tweak 
[very minor] Update metadataEditor.less "small" text
 2021-08-27 09:35:28 -04:00
Trevor Buckner 1e8c285eef Just renaming/rearranging variables 2021-08-26 23:09:56 -04:00
Trevor Buckner c09d0940d4 Merge pull request #1613 from naturalcrit/WrapperColsDiv 
Fix column-wrapper on print page
 2021-08-26 22:53:36 -04:00
Trevor Buckner a7005d779a Fix /print, make .page outer element for consistency with legacy 2021-08-26 22:43:57 -04:00
Trevor Buckner 85841d22f5 Merge pull request #1596 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.62.3 
Bump codemirror from 5.62.2 to 5.62.3
 2021-08-25 21:48:01 -04:00
Trevor Buckner 2403d0a18a Merge pull request #1577 from Gazook89/Turn-Box-Shadows-to-Drop-Shadows 
Turn box shadows to drop shadows
 2021-08-25 21:47:33 -04:00
Trevor Buckner a3354e9614 Move .note shadow to main box, not ::before element. 2021-08-25 21:46:59 -04:00
Trevor Buckner 9673a9a0f6 Merge pull request #1542 from G-Ambatte/fixGoogleModifiedTime-#1506 
Set modifiedTime during view count update of Google brews
 2021-08-24 23:55:57 -04:00
Trevor Buckner e9939e7a0d Fix alignment 2021-08-24 23:55:03 -04:00
Trevor Buckner 7a74fc03fe Merge pull request #1277 from jsocol/column-fill-mode 
Parametrize fillMode for .useColumns
 2021-08-24 23:47:58 -04:00
Trevor Buckner 050a1d45fd Move to new theme file, make balance default 2021-08-24 23:47:31 -04:00
Trevor Buckner b61f4e935a Merge branch 'column-fill-mode' of https://github.com/jsocol/homebrewery into pr/1277 2021-08-24 23:44:30 -04:00
Trevor Buckner 3233b7c23a Merge pull request #1597 from naturalcrit/WrapperColsDiv 
Add wrapper to .page to improve `wide` behavior with columns
 2021-08-23 23:04:47 -04:00
Trevor Buckner 039db01b31 Artificial column-break at page end 
Inserting a \column into the end of the page (and a nbsp after). This makes the page emulate column-fill:auto (the standard "Homebrewery" behavior) since there is always at least one column-break, making the browser try less hard to aggressively "balance" the columns.

Then, when a user inserts `wide` or `column-span` elements, `column-fill: balance` will be able to take over and work as we expect.
 2021-08-23 23:03:57 -04:00
Trevor Buckner 9c6d875524 Add wrapper to .page to improve wide behavior with columns 2021-08-22 23:00:43 -04:00
Trevor Buckner 653fd513ad inject newlines around \column so its DIV isn't consumed as markdown 2021-08-21 01:36:25 -04:00
Trevor Buckner ecdf4aee50 Merge pull request #1547 from Gazook89/Fix-improper-css-values 
Fix two css values throwing errors in console
 2021-08-21 00:55:18 -04:00
Trevor Buckner 9cdfbc7459 Fix Table of Content spacing 2021-08-21 00:15:53 -04:00
Trevor Buckner 519d102a6e Throw errors in listGoogleBrews() and getGoogleFolder() 2021-08-20 01:45:50 -04:00
Trevor Buckner 5f388ed41f Merge pull request #1491 from G-Ambatte/addPageCountToUserPage 
Display Brew page count on User Page
 2021-08-18 10:52:42 -04:00
Trevor Buckner 72360be3e9 up version to 2.13.4 2021-08-17 23:58:16 -04:00
Trevor Buckner 1885a8d0cc Merge pull request #1541 from G-Ambatte/updateBrewTooltips 
Update BrewItem tooltips
 2021-08-16 23:26:01 -04:00
Trevor Buckner 64b62c5e98 Merge pull request #1575 from naturalcrit/v3WelcomePage 
V3 welcome page
 2021-08-16 10:17:45 -04:00
Trevor Buckner 425d03f6b5 Link in metadata panel 2021-08-16 10:16:25 -04:00
Trevor Buckner 7977e869c3 Small tweaks. Move "Create your own" button slightly. 2021-08-16 00:52:34 -04:00
Trevor Buckner 3f395ad4f3 Lint 2021-08-15 00:51:22 -04:00
Trevor Buckner ec92a0307b Merge pull request #1562 from Gazook89/Page-Snippet-Menu 
Editor-Specific Snippet Groups, and Print Snippet Menu Changes
 2021-08-15 00:45:47 -04:00
Trevor Buckner edce4e5bbc Refactoring switching logic, formatting LESS 2021-08-15 00:45:01 -04:00
Trevor Buckner d853643874 Inherit colors 2021-08-14 23:40:38 -04:00
Trevor Buckner 28884d6774 Merge pull request #1509 from Gazook89/v3-Artist-Snippet 
Add Artist Credit Snippet
 2021-08-14 23:22:23 -04:00
Trevor Buckner 8f7d6a3eb5 Update color, snippet positioning, added into v3 Image and BackgroundImage 2021-08-14 23:21:13 -04:00
Trevor Buckner 58568468f6 Fix font in v3. Clean up LESS formatting. 2021-08-14 00:52:35 -04:00
Trevor Buckner 53de59940f Merge pull request #1561 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.7 
Bump mongoose from 5.13.6 to 5.13.7
 2021-08-13 20:34:56 -04:00
Trevor Buckner bd5b3fa6e9 Merge pull request #1567 from naturalcrit/dependabot/npm_and_yarn/nanoid-3.1.25 
Bump nanoid from 3.1.23 to 3.1.25
 2021-08-13 15:02:46 -04:00
Trevor Buckner 9dc6d2532a Drastic simplification of SpanTables via better regex 
Thanks @ericscheid for finding a good regex!
 2021-08-13 14:38:43 -04:00
Trevor Buckner 9726fb5666 Merge pull request #1558 from naturalcrit/GoogleExpiredNotification 
Popup error when gDrive credentials are expired on both /edit and /new
 2021-08-12 00:08:59 -04:00
Trevor Buckner db22725687 New fix to table regex. Avoids ReDOS issues. 2021-08-12 00:06:56 -04:00
Trevor Buckner 0075b0836a Popup error when gDrive credentials are expired on both /edit and /new 2021-08-11 15:36:57 -04:00
Trevor Buckner 77d447c0a3 Fix redundant Codemirror hotkeys 2021-08-11 12:54:18 -04:00
Trevor Buckner af8ca7141d Update welcome_msg_v3.md 2021-08-11 01:01:04 -04:00
Trevor Buckner a48c74b2e7 Replace Regex Lookbehind with obnoxious workaround so Safari doesn't break 2021-08-10 23:42:46 -04:00
Trevor Buckner 3cf5dc74bb update Patreon link in homepage 2021-08-10 00:53:48 -04:00
Trevor Buckner 7021715543 /v3_preview page will show a v3 version of the homepage 2021-08-10 00:51:30 -04:00
Trevor Buckner a351e2a118 Merge pull request #1540 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.6 
Bump mongoose from 5.13.5 to 5.13.6
 2021-08-09 23:11:15 -04:00
Trevor Buckner 82355f0175 Merge pull request #1539 from naturalcrit/v2.13.3 
up version to 2.13.3
 2021-08-09 22:48:45 -04:00
Trevor Buckner 965645f1e6 up version to 2.13.3 2021-08-09 22:47:19 -04:00
Trevor Buckner 79e05b1665 Merge pull request #1534 from G-Ambatte/addMetaToLocalStorage-#1498 
Save Renderer data in LocalStorage and GoogleDrive
 2021-08-09 22:08:52 -04:00
Trevor Buckner e3da09cb0e Merge pull request #1531 from G-Ambatte/hidePrivateBrews 
Hide Private brew `<div>` if UserPage is not for logged in User
 2021-08-09 00:56:30 -04:00
Trevor Buckner cba3282541 Merge branch 'master' of https://github.com/naturalcrit/homebrewery 2021-08-09 00:52:57 -04:00
Trevor Buckner 621d34954a Allow paragraphs to break across columns 2021-08-09 00:52:49 -04:00
Trevor Buckner 5fc45ad22f Merge pull request #1530 from Gazook89/v3-style-tweaks 
Make Minor Tweaks to v3 Style
 2021-08-09 00:40:45 -04:00
Trevor Buckner 9ca8afb3ba optional chaining not needed on props 2021-08-09 00:40:25 -04:00
Trevor Buckner 175b2f8664 Further tweaking, use cm instead of px, top-margin when possible 2021-08-09 00:31:08 -04:00
Trevor Buckner d6fbfe75bc Merge pull request #1533 from naturalcrit/dependabot/npm_and_yarn/googleapis-84.0.0 
Bump googleapis from 83.0.0 to 84.0.0
 2021-08-08 23:19:38 -04:00
Trevor Buckner 08cf83de2a Merge pull request #1529 from Gazook89/Commenting-Hotkeys 
Add HTML Comment Hotkeys
 2021-08-08 22:16:32 -04:00
Trevor Buckner 86184f8595 Changed shortcut to CTRL + /, fixed icon 2021-08-08 22:13:23 -04:00
Trevor Buckner 2119d755ee Merge pull request #1526 from G-Ambatte/addTooltipToRecent-#1525 
Add title tooltip to Recent NavBar dropdown
 2021-08-08 19:33:39 -04:00
Trevor Buckner ed9ca74b4f Merge pull request #1524 from G-Ambatte/fixIncorrectOrdering-#1506 
Fix incorrect ordering on UserPage
 2021-08-08 17:26:36 -04:00
Trevor Buckner deeaa90667 Merge pull request #1523 from G-Ambatte/addClassNameToUserPageDivs-#1511 
Add tooltip and classNames to UserPage and BrewItem
 2021-08-08 00:00:16 -04:00
Trevor Buckner 7d79d29e7e Merge pull request #1500 from Gazook89/Legacy-SpellList-Update 
Legacy spell list update
 2021-08-07 23:50:31 -04:00
Trevor Buckner 4ed1a4bddb Merge pull request #1510 from G-Ambatte/fixAdmin-#1508 
Modify buildAdmin.js for Node compatibility
 2021-08-07 23:48:31 -04:00
Trevor Buckner 1324bc05e8 Remove commented line 2021-08-07 23:47:04 -04:00
Trevor Buckner b98daed19c Merge pull request #1507 from G-Ambatte/ignoreDockerConfig 
Ignore Docker config files
 2021-08-07 22:42:21 -04:00
Trevor Buckner 64e5444c06 Merge pull request #1519 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.15.0 
Bump @babel/plugin-transform-runtime from 7.14.5 to 7.15.0
 2021-08-07 22:41:32 -04:00
Trevor Buckner dc1a77ee38 Merge pull request #1527 from naturalcrit/tableColSpan 
Fix catastrophic backtracking in Spannable Tables and trim starting pipes
 2021-08-07 00:52:39 -04:00
Trevor Buckner 9ea068bf64 Fix catastrophic backtracking and trim starting pipes 2021-08-07 00:48:59 -04:00
Trevor Buckner e31e8dec98 Merge pull request #1522 from naturalcrit/tableColSpan 
Tables now support row spans
 2021-08-06 16:59:25 -04:00
Trevor Buckner 8103d7d31f Update Classtable snippet 2021-08-06 16:58:10 -04:00