f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-09-23 05:22:58 +00:00
Code Wiki Activity
1,096 Commits 125 Branches 40 Tags
3c2feeb2aa6aad0cff3bc2eeb155e1d752013e73
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Trevor Buckner dea683da7c up version to v2.13.1 2021-06-28 11:59:59 -04:00
Trevor Buckner 496ab26972 Use let instead of const 2021-06-28 11:50:12 -04:00
Trevor Buckner 63ea5a3e5f up version to 2.13.0 2021-06-26 12:16:27 -04:00
Trevor Buckner 33f5e8838b Revert react-frame-component to 4.1.3 
5.0.0 has issues with the iFrame not mounting if you refresh the page.
 2021-06-25 23:59:53 -04:00
Trevor Buckner 3660f3827f Merge pull request #1408 from G-Ambatte/addShareDropDown 
Add dropdown to `/share` for `source` to unify options:
 2021-06-25 23:30:25 -04:00
Trevor Buckner ac4cce1f9b update more dependencies 2021-06-25 23:04:27 -04:00
Trevor Buckner 532d2428b7 dependency updates 2021-06-25 22:45:37 -04:00
Trevor Buckner 599c69c9bb Merge pull request #1410 from G-Ambatte/fixStyleInPrintFromNew 
Style data not applied at Print from New Page
 2021-06-25 00:55:20 -04:00
Trevor Buckner 7843691c4b add "page" class to print page 
With the style panel we added a `page` css class alongside the `phb` and `phb3` classes so users can write CSS that targets all pages no matter the base CSS loaded. This wasn't applied to the print page.

Funnily enough, the rest of the site uses `.page` just to display the website, and I didn't realize there was a conflict until now because otherwise, the brew is usually hidden in an iFrame.
 2021-06-25 00:53:25 -04:00
Trevor Buckner d9effacb20 Merge branch 'master' into pr/1410 2021-06-25 00:37:53 -04:00
Trevor Buckner 3efb0bf189 Merge branch 'master' into pr/1408 2021-06-25 00:18:27 -04:00
Trevor Buckner 00eb927538 Merge pull request #1401 from G-Ambatte/addStyleToLocalStorage 
Add local storage key for Brew Style data
 2021-06-25 00:17:11 -04:00
Trevor Buckner 0616ce62eb Rearrange so loading from one doesn't override the other 2021-06-25 00:15:49 -04:00
Trevor Buckner a171de32d8 Merge branch 'master' into pr/1401 2021-06-25 00:03:49 -04:00
Trevor Buckner cf7680bc86 Merge pull request #1397 from G-Ambatte/splitCSSatNewSave 
Split codefenced CSS from in New Brews from Content to Style tab
 2021-06-24 23:35:26 -04:00
Trevor Buckner e07bb1b3c2 Don't save style tab if user never put anything in it 2021-06-24 23:29:01 -04:00
Trevor Buckner d61fda9cff Fix regression with saving. 2021-06-20 16:05:36 -04:00
Trevor Buckner 6ecf546baf Fix github link in Edit Page error popup. 2021-06-20 15:04:23 -04:00
Trevor Buckner ea8aa84009 Merge pull request #1392 from naturalcrit/dependabot/npm_and_yarn/marked-2.1.1 
Bump marked from 2.0.6 to 2.1.1
 2021-06-20 14:34:51 -04:00
Trevor Buckner 353f1ca42c Merge pull request #1370 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.24.0 
Bump eslint-plugin-react from 7.23.2 to 7.24.0
 2021-06-20 14:34:29 -04:00
Trevor Buckner 20053ad548 Merge pull request #1393 from G-Ambatte/updateSourcePage 
Incorporate Brew.Style into Source + Download pages
 2021-06-20 14:33:29 -04:00
Trevor Buckner 9b97e0dd87 redundant variable 2021-06-20 14:32:23 -04:00
Trevor Buckner 8e304fa483 tab 2021-06-20 14:30:00 -04:00
Trevor Buckner 0f5e2e5a60 Merge pull request #1353 from G-Ambatte/fixRedditLink 
Fix 'Share to Reddit' link for Google brews
 2021-06-20 14:21:28 -04:00
Trevor Buckner f5bd7db388 Merge branch 'master' into pr/1353 2021-06-20 14:19:51 -04:00
Trevor Buckner 70832be810 Fix brews failing to sanitize on user page 2021-06-20 13:53:26 -04:00
Trevor Buckner 9d80f21ae7 Fix empty Google Brews crashing user page 2021-06-11 13:46:03 -04:00
Trevor Buckner 4d5653854a fix version number 2021-06-10 15:48:29 -04:00
Trevor Buckner 70cc8577e8 Fixing Heroku to work with NPM 7 2021-06-10 15:31:26 -04:00
Trevor Buckner f80d5e6b52 Fix sanitizing brews in user page, hide own G brews on other profiles 2021-06-10 14:22:12 -04:00
Trevor Buckner 19456e8be0 Merge pull request #1384 from naturalcrit/StylePanel 
Style panel
 2021-06-10 10:41:19 -04:00
Trevor Buckner c98cedc20f Merge branch 'master' into StylePanel 2021-06-10 10:39:39 -04:00
Trevor Buckner 2b1063c34d v2.12.0 bump version number 2021-06-10 10:38:03 -04:00
Trevor Buckner fc8be9c8fb Babel to support ES6 Javascript in older browsers 2021-06-10 00:09:29 -04:00
Trevor Buckner 51aba937f5 Fix CSS highlighting 2021-06-07 11:51:02 -04:00
Trevor Buckner 9363a15daa Merge pull request #1376 from naturalcrit/StylePanel 
Separate "style" and "metadata" panels
 2021-06-05 16:09:37 -04:00
Trevor Buckner 1ef5bfed94 Remove default text 2021-06-05 16:09:23 -04:00
Trevor Buckner e67fadef02 Separate "style" and "metadata" panels 2021-06-05 15:58:31 -04:00
Trevor Buckner 99825d10c4 Merge pull request #1373 from earlng/contribution 
Update Dockerfile
 2021-06-03 13:31:49 -04:00
Trevor Buckner a7b52f9a96 Merge pull request #1375 from naturalcrit/dependabot/npm_and_yarn/googleapis-75.0.0 
Bump googleapis from 74.2.0 to 75.0.0
 2021-06-03 13:30:32 -04:00
Trevor Buckner 4504a25272 Merge pull request #1368 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.12.12 
Bump mongoose from 5.12.11 to 5.12.12
 2021-06-01 23:47:44 -04:00
Trevor Buckner aefc4698ab Merge pull request #1369 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.14.4 
Bump @babel/preset-env from 7.14.2 to 7.14.4
 2021-06-01 23:47:36 -04:00
Trevor Buckner 28af7353ea Merge pull request #1372 from naturalcrit/dependabot/npm_and_yarn/pico-check-2.1.3 
Bump pico-check from 2.0.3 to 2.1.3
 2021-06-01 23:47:17 -04:00