Commit Graph
100 Commits
Author SHA1 Message Date
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
Trevor Buckner f23b661a4b Lint 2021-08-06 16:49:53 -04:00
Trevor Buckner 20691f8ab5 Update markdown.js 2021-08-06 16:45:22 -04:00
Trevor Buckner e1bd40dea3 Change DL to display inline, not float. 2021-08-06 12:34:59 -04:00
Trevor Buckner 17926775e7 Fix ScalySans Font for Mac? 2021-08-06 00:49:42 -04:00
Trevor Buckner 303de4ae8a Merge pull request #1502 from naturalcrit/dependabot/npm_and_yarn/googleapis-83.0.0
Bump googleapis from 82.0.0 to 83.0.0
2021-08-04 23:34:07 -04:00
Trevor Buckner 5caeafe2c3 Merge pull request #1501 from naturalcrit/dependabot/npm_and_yarn/eslint-7.32.0
Bump eslint from 7.31.0 to 7.32.0
2021-08-04 23:33:50 -04:00
Trevor Buckner 481919bc03 Merge pull request #1503 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.5
Bump mongoose from 5.13.4 to 5.13.5
2021-08-04 23:33:39 -04:00
Trevor Buckner 558664760b Merge pull request #1518 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.15.0
Bump @babel/core from 7.14.8 to 7.15.0
2021-08-04 23:33:20 -04:00
Trevor Buckner f4e8c6ca51 Merge pull request #1517 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.15.0
Bump @babel/preset-env from 7.14.8 to 7.15.0
2021-08-04 23:33:12 -04:00
Trevor Buckner e1e7264bfc Merge pull request #1514 from naturalcrit/tableColSpan
Multi-header and column-span tables
2021-08-04 01:29:01 -04:00
Trevor Buckner afb26fdb6f Multi-header and column-span tables 2021-08-04 01:27:47 -04:00
Trevor Buckner 0a742e8c2f Merge pull request #1513 from G-Ambatte/fix#1512
Confirm `Brew.Title` exists before ordering by it
2021-08-03 23:49:38 -04:00
Trevor Buckner 6f6c4acf7e Merge pull request #1505 from naturalcrit/fixMonsterMac
Fix monster blocks breaking on Mac
2021-08-01 23:09:08 -04:00
Trevor Buckner 30745c2be3 Update 5ePhb.style.less 2021-08-01 23:07:45 -04:00
Trevor Buckner 4d087f4aa9 Fix spaces not working in mustache divs / spans 2021-08-01 00:20:58 -04:00
Trevor Buckner 874c8a9fd1 Merge pull request #1494 from naturalcrit/v2.13.2
up version to 2.13.2
2021-07-31 12:17:32 -04:00
Trevor Buckner 3cb50bc7fc up version to 2.13.2 2021-07-30 23:30:34 -04:00
Trevor Buckner 213ef9d94b Fix cursor getting stuck on divider in Meta panel view 2021-07-30 22:44:00 -04:00
Trevor Buckner 046b6266b3 Merge pull request #1483 from Gazook89/pageNumber-v3
v3 Snippets: Page Numbers
2021-07-30 22:35:58 -04:00
Trevor Buckner 8a03062e3d Fix indent and vertical spacing 2021-07-30 22:32:17 -04:00
Trevor Buckner 2a40f05e90 Revert "Update css for classTables v3"
This reverts commit 3c2feeb2aa.
2021-07-30 20:33:34 -04:00
Trevor Buckner ce73e9293d Revert "Update to v3 moustache syntax"
This reverts commit fdb294bad9.
2021-07-30 20:33:24 -04:00
Trevor Buckner 61ca7fd0f6 Merge pull request #1457 from G-Ambatte/fixUndefinedCSS
Fix issue with undefined Style tab data
2021-07-30 18:53:16 -04:00
Trevor Buckner 21223cbcd4 Merge branch 'master' into fixUndefinedCSS 2021-07-30 18:05:02 -04:00
Trevor Buckner d02d51717d Merge pull request #1480 from Gazook89/Gazook89-HB-Meta-Editor-Tweaks
Update metadataEditor.less for CSS adjustments
2021-07-30 17:56:14 -04:00
Trevor Buckner 004f3f184f Merge pull request #1455 from G-Ambatte/reduceWelcomeTextUsage
Make WelcomeText and ChangeLogText conditional
2021-07-30 17:50:26 -04:00
Trevor Buckner 99d2f6d48d avoid sending two copies of welcome text in the same brew 2021-07-30 17:47:11 -04:00
Trevor Buckner 11d1f5c00e Merge pull request #1453 from G-Ambatte/modifyTitleOfClonedBrew
Prepend 'CLONE:- ' to title of cloned brew
2021-07-30 17:30:26 -04:00
Trevor Buckner ebd28f41a2 replace :- with just - 2021-07-30 17:29:36 -04:00
Trevor Buckner 2397fcaa21 Merge pull request #1485 from naturalcrit/MustacheSyntaxUsesColons
Mustache syntax to use colons
2021-07-30 12:32:28 -04:00
Trevor Buckner 5b039b82a3 Update snippets 2021-07-30 12:31:30 -04:00
Trevor Buckner 264f5d5068 Merge pull request #1475 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.4
Bump mongoose from 5.13.3 to 5.13.4
2021-07-30 03:17:54 -04:00
Trevor Buckner eff5660f12 Merge pull request #1484 from naturalcrit/FixMustacheInjectConflicts
Fix conflicts with Mustache divs and injected style tags
2021-07-30 02:12:07 -04:00
Trevor Buckner 98915e158d Fix editor highlighting 2021-07-30 02:11:26 -04:00
Trevor Buckner 9be71a5159 Mustache syntax now uses : instead of =. Single words don't need quotes 2021-07-30 02:08:08 -04:00
Trevor Buckner 6b61bb05c0 Update markdown.js
- Fix "start" function for Divs and BlockInject, which were being generated mid-line (must start only after a newline)
- Fix Divs consuming part of Spans above them.
- Add % and # as valid characters for inline-styles
2021-07-30 01:27:05 -04:00
Trevor Buckner 2f663e0ea7 Merge pull request #1468 from G-Ambatte/fixSharePage-#1467
Fix issue 1467 - Source on Change Log doesn't work
2021-07-29 00:11:20 -04:00
Trevor Buckner 5d05af089b Merge pull request #1476 from naturalcrit/InjectMustacheStyle
Inject mustache style
2021-07-28 23:58:58 -04:00
Trevor Buckner e237cd8be4 Remove artificial spacing between mustache divs. 2021-07-28 23:55:56 -04:00
Trevor Buckner 8bd09e58cb Smartypants setting to show left and right quote marks. 2021-07-28 23:55:22 -04:00
Trevor Buckner 4e2a3cc5be Update image snippets to be pure markdown 2021-07-28 23:42:51 -04:00
Trevor Buckner d9c83379fe Add "inject style" syntax, for use with images, headers, etc. 2021-07-28 23:26:12 -04:00
Trevor Buckner d35769dceb Merge pull request #1459 from G-Ambatte/sortUserBrews
Add options for ordering brews on User page
2021-07-27 18:12:32 -04:00
Trevor Buckner a71dca1487 Merge pull request #1456 from G-Ambatte/cleanTemplate
Clean up template.js
2021-07-26 17:47:24 -04:00
Trevor Buckner 1a2da712ed Merge pull request #1452 from G-Ambatte/fixIssue1438
Fix for Issue #1438 - style data not cloning to `/new`
2021-07-25 17:05:36 -04:00
Trevor Buckner 36627bc188 code block style 2021-07-25 16:48:59 -04:00
Trevor Buckner fbf053ac2b Merge pull request #1450 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.62.2
Bump codemirror from 5.62.1 to 5.62.2
2021-07-22 00:40:56 -04:00
Trevor Buckner 42b0ea173d Make toc two-columns 2021-07-21 16:05:29 -04:00
Trevor Buckner 7c9defb85c Put theme in user page. 2021-07-21 15:09:37 -04:00
Trevor Buckner 6e5d183bf6 Merge pull request #1448 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.14.8
Bump @babel/preset-env from 7.14.7 to 7.14.8
2021-07-21 00:02:42 -04:00
Trevor Buckner 0ab00c24c5 Merge pull request #1447 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.62.1
Bump codemirror from 5.62.0 to 5.62.1
2021-07-20 23:54:20 -04:00
Trevor Buckner 84b2d86054 Merge pull request #1446 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.14.8
Bump @babel/core from 7.14.6 to 7.14.8
2021-07-20 23:44:27 -04:00
Trevor Buckner ba766254f8 typo 2021-07-20 23:39:34 -04:00
Trevor Buckner a02e36e13f Merge pull request #1449 from naturalcrit/DefinitionListsToMarkedExtension
Definition lists to marked extension
2021-07-20 23:34:19 -04:00
Trevor Buckner 8f34e8bb2d Change note block to div, restyle notes and descript boxes 2021-07-20 23:32:49 -04:00
Trevor Buckner 3ed4ceb7a3 Fix description box snippet 2021-07-20 19:50:23 -04:00
Trevor Buckner 76e4023b37 Add theme CSS file to print page 2021-07-20 15:44:42 -04:00
Trevor Buckner 7ff6d9e825 Fix TOC generation for level 3 entries not inside level 2 2021-07-20 15:40:32 -04:00
Trevor Buckner 64d133f8f6 Definition List to Markdown Extension. New syntax. 2021-07-19 20:04:25 -04:00
Trevor Buckner 324d0e265e Merge pull request #1443 from naturalcrit/dependabot/npm_and_yarn/eslint-7.31.0
Bump eslint from 7.30.0 to 7.31.0
2021-07-18 23:33:06 -04:00
Trevor Buckner cec4addcad Merge pull request #1442 from naturalcrit/dependabot/npm_and_yarn/googleapis-82.0.0
Bump googleapis from 81.0.0 to 82.0.0
2021-07-18 23:32:54 -04:00
Trevor Buckner 43605df266 Merge pull request #1441 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.3
Bump mongoose from 5.13.2 to 5.13.3
2021-07-18 23:32:44 -04:00
Trevor Buckner fcbbe46861 Merge pull request #1432 from naturalcrit/dependabot/npm_and_yarn/googleapis-81.0.0
Bump googleapis from 79.0.0 to 81.0.0
2021-07-13 22:46:41 -04:00
Trevor Buckner 4a398143e3 Merge pull request #1428 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.2
Bump mongoose from 5.13.0 to 5.13.2
2021-07-13 22:45:46 -04:00
Trevor Buckner bbaaf74302 Merge pull request #1434 from naturalcrit/SplitThemeCSSOut
Themes are now compiled into separate css files
2021-07-13 00:35:05 -04:00
Trevor Buckner d3dd3c3d5d Merge pull request #1427 from naturalcrit/dependabot/npm_and_yarn/eslint-7.30.0
Bump eslint from 7.29.0 to 7.30.0
2021-07-12 21:49:05 -04:00
Trevor Buckner 4f2ddfa020 Themes are now compiled into separate css files and can be hot-swapped in the renderer as needed 2021-07-12 19:37:10 -04:00
Trevor Buckner 428ec8412f Merge pull request #1433 from naturalcrit/moreV3Snippets
More v3 snippets
2021-07-11 16:59:13 -04:00
Trevor Buckner 50991dfe92 MustacheDivs to Marked.js extension 2021-07-11 00:33:47 -04:00
Trevor Buckner 63ba9f4fb9 Change {{ span to Marked.js extension 2021-07-10 19:01:27 -04:00
Trevor Buckner efd0fd1f4a Table of Contents CSS and snippet 2021-07-10 19:01:12 -04:00
Trevor Buckner 3948e17da2 Merge pull request #1424 from G-Ambatte/fixRecentNavItem
Fix crash caused by Recent Brews NavItem
2021-07-07 12:32:01 -04:00
Trevor Buckner ee67ba729a V & H spacing, wide block, image snippets 2021-07-01 23:43:01 -04:00
Trevor Buckner 8414961b15 Merge pull request #1419 from naturalcrit/dependabot/npm_and_yarn/googleapis-79.0.0
Bump googleapis from 78.0.0 to 79.0.0
2021-06-30 00:59:08 -04:00
Trevor Buckner f8de983e2b Merge pull request #1418 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.0
Bump mongoose from 5.12.15 to 5.13.0
2021-06-30 00:58:54 -04:00
Trevor Buckner 2661e2cfa0 Update all naturalcrit links to https 2021-06-28 20:58:00 -04:00
Trevor Buckner d4cb5c73aa Merge pull request #1417 from naturalcrit/2.13.1
up version to v2.13.1
2021-06-28 12:11:08 -04:00
Trevor Buckner 9a2d7d1a19 Merge pull request #1416 from G-Ambatte/fixGoogleBrews_v2_13
Attempt to fix issue with saving Google brews.
2021-06-28 12:10:43 -04:00
Trevor Buckner 017bccc937 replace trailing slash 2021-06-28 12:07:56 -04:00