f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-08-14 14:02:56 +00:00
Code Wiki Activity
3,208 Commits 124 Branches 40 Tags
3d6842bf86362ab6ffea44062942f671f706087b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner 7ea3ef8474 Merge pull request #2662 from naturalcrit/CustomSnippetIcons 
Custom icons for snippets
 2023-02-04 11:10:29 -05:00
Trevor Buckner a0af588d75 Custom icons 2023-02-04 11:07:04 -05:00
Trevor Buckner 9b06380b9c Merge pull request #2656 from naturalcrit/SubSnippets 
Add a side menu for sub-snippets
 2023-02-02 15:49:10 -05:00
Trevor Buckner 5e38ff66da Add a side menu for sub-snippets 
Subsnippets can be added to snippets as an additional property "subsnippets" which is an array of more snippets.
 2023-02-02 15:29:12 -05:00
Trevor Buckner 85b3741df8 Merge pull request #2651 from 5e-Cleric/cloning-fix-2 
Thanks @5e-Cleric for this fix!
 2023-01-30 17:19:19 -05:00
Trevor Buckner 4260f5197c Update specs to expect a views prop from default brew 2023-01-30 17:15:33 -05:00
Trevor Buckner f628e1a5ae Use DEFAULT_BREW values instead of setting them here 2023-01-30 17:08:19 -05:00
Trevor Buckner 14bc7e45ab Merge pull request #2619 from 5e-Cleric/readme 
Readme update
 2023-01-30 14:44:19 -05:00
Trevor Buckner 4668d36a52 typo 2023-01-30 14:40:13 -05:00
Trevor Buckner 6226f3376a Merge pull request #2604 from naturalcrit/CSS-Layers 
Try @Layers to not need `.page` in user style
 2023-01-30 12:41:36 -05:00
Trevor Buckner ed8b0c51af Merge pull request #2653 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.32.2 
Bump eslint-plugin-react from 7.32.1 to 7.32.2
 2023-01-30 12:32:41 -05:00
Trevor Buckner f4326616b4 Merge pull request #2652 from naturalcrit/dependabot/npm_and_yarn/eslint-8.33.0 
Bump eslint from 8.32.0 to 8.33.0
 2023-01-30 11:44:28 -05:00
Trevor Buckner 625d3f7034 Add note about why we use !important on user page 2023-01-28 01:13:10 -05:00
Trevor Buckner 5bb61a7c3c Fix userpage 2023-01-27 17:09:52 -05:00
Trevor Buckner 3c551daf16 Fix print page 2023-01-27 15:16:16 -05:00
Trevor Buckner 0bf96cb9e2 Add layers to all current themes 2023-01-27 14:57:20 -05:00
Trevor Buckner bef4d9f41f Merge branch 'master' into CSS-Layers 2023-01-27 14:48:13 -05:00
Trevor Buckner 9ff0789387 Merge pull request #2622 from 5e-Cleric/previews 
Theme previews updated
 2023-01-27 14:45:47 -05:00
Trevor Buckner a457058041 Resize dropdown button 2023-01-27 14:45:31 -05:00
Trevor Buckner 6d40e63e96 Merge branch 'master' into pr/2622 2023-01-27 14:26:05 -05:00
Trevor Buckner 964342a13d Merge pull request #2646 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.8.0 
Bump react-router-dom from 6.7.0 to 6.8.0
 2023-01-27 14:04:35 -05:00
Trevor Buckner 9067cbdced Merge pull request #2644 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.9.0 
Bump mongoose from 6.8.4 to 6.9.0
 2023-01-27 14:04:25 -05:00
Trevor Buckner c9fd2c63af Merge pull request #2647 from naturalcrit/dependabot/npm_and_yarn/jest-29.4.1 
Bump jest from 29.4.0 to 29.4.1
 2023-01-27 14:04:16 -05:00
Trevor Buckner ec8126eb8a Merge pull request #2648 from naturalcrit/FixNodestoFont 
Update fonts.less path for Nodesto fonts
 2023-01-27 14:04:03 -05:00
Trevor Buckner 6aa1920061 Update fonts.less 2023-01-27 14:02:11 -05:00
Trevor Buckner 62d193ddd1 Merge pull request #2639 from naturalcrit/dependabot/npm_and_yarn/jest-29.4.0 
Bump jest from 29.3.1 to 29.4.0
 2023-01-25 11:38:09 -05:00
Trevor Buckner 70219f1bd4 Merge pull request #2628 from naturalcrit/v3.6.0 
Update Version to v3.6.0
 2023-01-23 16:02:07 -05:00
Trevor Buckner c8f9e5bcf2 Update Version to v3.6.0 2023-01-23 16:01:32 -05:00
Trevor Buckner 0a9a5909d1 Merge pull request #2589 from jeddai/client-server-version-mismatch-middleware 
adjust frontend error handling, add client/server mismatch middleware
 2023-01-23 15:40:48 -05:00
Trevor Buckner 91ad46b202 Merge pull request #2627 from naturalcrit/dependabot/npm_and_yarn/cookiejar-2.1.4 
Bump cookiejar from 2.1.3 to 2.1.4
 2023-01-23 14:59:58 -05:00
Trevor Buckner 752806c0ef Merge pull request #2616 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.7.0 
Bump react-router-dom from 6.6.1 to 6.7.0
 2023-01-23 14:59:41 -05:00
Trevor Buckner fe6097e0d9 Merge pull request #2607 from naturalcrit/dependabot/npm_and_yarn/eslint-8.32.0 
Bump eslint from 8.31.0 to 8.32.0
 2023-01-23 14:58:12 -05:00
Trevor Buckner 8dcbad97df Merge pull request #2623 from 5e-Cleric/Cloning-views-fix 
Cloning views fix
 2023-01-23 10:14:23 -05:00
Trevor Buckner 64b3955bc9 Update Dependencies 2023-01-23 10:13:59 -05:00
Trevor Buckner 6020657529 Ensure getBrew returns an object if undefined 2023-01-22 21:57:14 +01:00
Trevor Buckner a8c35f3967 Remove extra console log for getGoogleBrew 
App.js already logs the thrown error, so we were getting double logs (and Google errors are long....). This should make the logs a bit easier to sift through.
 2023-01-22 21:57:13 +01:00
Trevor Buckner 62fa8f511a Only fix stub if we actually found one. 2023-01-22 21:57:13 +01:00
Trevor Buckner 18cf202ac0 If no stub exists, start stub as {}, not undefined 
Recent changes to handle bad brew properties (tags as strings, no renderer, etc.) didn't account for the case where an old Google brew is first being stubbed; since no stub exists, there is no object to perform the corrections on, and we crash.
 2023-01-22 21:57:13 +01:00
Trevor Buckner 98d9018e13 Fix saving issue when tags do not exist 
Rare case where tags don't exist at all; gets confused in the step of converting tag strings to arrays
 2023-01-22 21:57:13 +01:00
Trevor Buckner a9e14f6165 Enable brew version mismatch checking on server 
Was commented out previously to allow users time to update client code so the proper error displays
 2023-01-22 21:57:13 +01:00
Trevor Buckner 1704ef6557 Merge pull request #2610 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.32.1 
Bump eslint-plugin-react from 7.31.11 to 7.32.1
 2023-01-22 12:30:28 -05:00
Trevor Buckner 637b3311d6 Merge pull request #2612 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.8.4 
Bump mongoose from 6.8.3 to 6.8.4
 2023-01-22 12:30:09 -05:00
Trevor Buckner 4b8c34bcbd Merge pull request #2608 from naturalcrit/dependabot/npm_and_yarn/marked-4.2.12 
Bump marked from 4.2.5 to 4.2.12
 2023-01-22 12:29:50 -05:00
Trevor Buckner c997908a49 Merge pull request #2621 from jeddai/adjust-coverage-thresholds 
lower coverage thresholds for api
 2023-01-21 11:11:31 -05:00
Trevor Buckner 128b299f25 Ensure getBrew returns an object if undefined 2023-01-21 17:11:28 +01:00
Trevor Buckner 692daa88fc Remove extra console log for getGoogleBrew 
App.js already logs the thrown error, so we were getting double logs (and Google errors are long....). This should make the logs a bit easier to sift through.
 2023-01-21 17:11:28 +01:00
Trevor Buckner bd6eb816f2 Only fix stub if we actually found one. 2023-01-21 17:11:28 +01:00
Trevor Buckner 2050028484 If no stub exists, start stub as {}, not undefined 
Recent changes to handle bad brew properties (tags as strings, no renderer, etc.) didn't account for the case where an old Google brew is first being stubbed; since no stub exists, there is no object to perform the corrections on, and we crash.
 2023-01-21 17:11:28 +01:00
Trevor Buckner 7e4018351d Fix saving issue when tags do not exist 
Rare case where tags don't exist at all; gets confused in the step of converting tag strings to arrays
 2023-01-21 17:11:28 +01:00
Trevor Buckner 01b03e8683 Enable brew version mismatch checking on server 
Was commented out previously to allow users time to update client code so the proper error displays
 2023-01-21 17:11:28 +01:00
Trevor Buckner ea04069fe5 Merge pull request #2618 from naturalcrit/FixGoogleBrewsDuplicatingOnStub 
Fix Google Drive brews duplicating
 2023-01-20 17:25:47 -05:00
Trevor Buckner 2c3a302c85 Merge branch 'master' into FixGoogleBrewsDuplicatingOnStub 2023-01-20 17:25:07 -05:00
Trevor Buckner 89d9bfe1f1 Merge pull request #2606 from G-Ambatte/addThemesToWatchList-#2605 
[LOCAL] Add Themes directory to watch list
 2023-01-20 17:21:15 -05:00
Trevor Buckner c9241e2162 Fix Google Drive brews duplicating 2023-01-20 17:19:02 -05:00
Trevor Buckner a22d59475e Try @Layers to not need .page in user style 2023-01-13 17:08:12 -05:00
Trevor Buckner da676c6ec1 Ensure getBrew returns an object if undefined 2023-01-12 13:33:55 -05:00
Trevor Buckner 901615d99e Remove extra console log for getGoogleBrew 
App.js already logs the thrown error, so we were getting double logs (and Google errors are long....). This should make the logs a bit easier to sift through.
 2023-01-10 21:08:21 -05:00
Trevor Buckner 6ed52f37cc Only fix stub if we actually found one. 2023-01-09 17:30:49 -05:00
Trevor Buckner 15e5a31767 If no stub exists, start stub as {}, not undefined 
Recent changes to handle bad brew properties (tags as strings, no renderer, etc.) didn't account for the case where an old Google brew is first being stubbed; since no stub exists, there is no object to perform the corrections on, and we crash.
 2023-01-09 14:53:35 -05:00
Trevor Buckner 8cbab4d4ce Fix saving issue when tags do not exist 
Rare case where tags don't exist at all; gets confused in the step of converting tag strings to arrays
 2023-01-09 14:12:57 -05:00
Trevor Buckner a9c28e84d0 Enable brew version mismatch checking on server 
Was commented out previously to allow users time to update client code so the proper error displays
 2023-01-09 10:30:07 -05:00
Trevor Buckner bafabb84b4 Merge pull request #2591 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.8.3 
Bump mongoose from 6.8.2 to 6.8.3
 2023-01-09 10:26:36 -05:00
Trevor Buckner 18f277182a Merge pull request #2588 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.20.12 
Bump @babel/core from 7.20.7 to 7.20.12
 2023-01-06 13:08:12 -05:00
Trevor Buckner 344a9d8334 Merge pull request #2548 from jeddai/api-tests 
Add api tests
 2023-01-06 13:07:54 -05:00
Trevor Buckner 2b1466c51b Merge pull request #2587 from naturalcrit/FixThemesOnPrint 
Fix Themes on /print
 2023-01-04 21:41:15 -05:00
Trevor Buckner 332bcde4b2 Themes weren't being picked up for rendering 2023-01-04 21:39:51 -05:00
Trevor Buckner db783179ce Merge pull request #2429 from G-Ambatte/fixThemesDefault 
Add default brew on load and before save
 2023-01-04 21:36:37 -05:00
Trevor Buckner c78d687387 Fix all brews being forced to V3 on load 2023-01-04 21:32:16 -05:00
Trevor Buckner b717059a39 Fix /new storing string "undefined" in Style tab 2023-01-04 20:58:29 -05:00
Trevor Buckner e02bde5eed Cleanup; added more fields to DEFAULT_BREW 2023-01-04 17:33:23 -05:00
Trevor Buckner e1765cad41 Merge branch 'fixThemesDefault' of https://github.com/G-Ambatte/homebrewery into pr/2429 2023-01-03 15:13:41 -05:00
Trevor Buckner 6dab5f836e Merge branch 'master' into pr/2429 2023-01-03 15:13:19 -05:00
Trevor Buckner 2b824839c3 Merge pull request #2581 from naturalcrit/dependabot/npm_and_yarn/eslint-8.31.0 
Bump eslint from 8.30.0 to 8.31.0
 2023-01-03 14:05:28 -05:00
Trevor Buckner 26f009a295 Merge pull request #2577 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.6.1 
Bump react-router-dom from 6.6.0 to 6.6.1
 2023-01-03 14:05:18 -05:00
Trevor Buckner 9b4c997b57 Merge pull request #2578 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.8.2 
Bump mongoose from 6.8.1 to 6.8.2
 2023-01-03 14:05:10 -05:00
Trevor Buckner 39143295b1 Merge pull request #2576 from naturalcrit/dependabot/npm_and_yarn/marked-4.2.5 
Bump marked from 4.2.4 to 4.2.5
 2023-01-03 14:05:01 -05:00
Trevor Buckner 6eaf2feb40 Log version mismatch errors 
To gauge how frequently they are occurring for future update.
 2023-01-03 12:47:17 -05:00
Trevor Buckner 4fe0f1a7af Comment out server-side brew version checking 
Requires client-side update to apply brew version correctly; temporarily disabling server-side checking for a few days until more users have updated their clients.
 2023-01-03 12:38:00 -05:00
Trevor Buckner 7aac377ce8 Merge pull request #2575 from jeddai/google-brew-version-comparison-fix 
add check for truthy version, and make sure the version exists when incrementing it
 2023-01-03 11:22:37 -05:00
Trevor Buckner c364856942 Merge branch 'master' into fixThemesDefault 2022-12-23 13:40:12 -05:00
Trevor Buckner 4e7a96b67c Merge pull request #2571 from naturalcrit/v3.5.0 
v3.5.0
 2022-12-23 13:25:00 -05:00
Trevor Buckner 39bfc818a6 Merge pull request #2572 from jeddai/new-props-authors-fix 
add elvis to fix invited authors editor
 2022-12-23 13:24:48 -05:00
Trevor Buckner 4f6ba7a388 v3.5.0 2022-12-23 12:07:31 -05:00
Trevor Buckner 0274fb214c Merge pull request #2566 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.8.1 
Bump mongoose from 6.8.0 to 6.8.1
 2022-12-23 01:57:27 -05:00
Trevor Buckner 15519f142d Merge pull request #2569 from naturalcrit/dependabot/npm_and_yarn/googleapis-110.0.0 
Bump googleapis from 109.0.1 to 110.0.0
 2022-12-23 01:53:09 -05:00
Trevor Buckner 6b258886a4 Merge pull request #2570 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.20.7 
Bump @babel/core from 7.20.5 to 7.20.7
 2022-12-23 01:52:49 -05:00
Trevor Buckner d23a88c997 Merge pull request #2568 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.6.0 
Bump react-router-dom from 6.4.5 to 6.6.0
 2022-12-23 01:52:42 -05:00
Trevor Buckner 096e17ab5a Merge pull request #2564 from naturalcrit/dependabot/npm_and_yarn/eslint-8.30.0 
Bump eslint from 8.29.0 to 8.30.0
 2022-12-23 01:52:32 -05:00
Trevor Buckner 816860dc4f Merge pull request #2561 from jeddai/add-ability-to-invite-authors 
Add ability to invite authors + version comparison check
 2022-12-22 17:03:31 -05:00
Trevor Buckner 02c0176070 Merge pull request #2509 from jeddai/disable-changes-from-non-authors 
Disable changes from non authors
 2022-12-12 12:15:23 -05:00
Trevor Buckner 86413b5767 Merge pull request #2560 from naturalcrit/fixGoogleToMongoTransfer 
Change findOneAndUpdate to FindOne and Save
 2022-12-12 10:22:49 -05:00
Trevor Buckner 747c976a14 typo 2022-12-12 10:19:49 -05:00
Trevor Buckner 326c28a11d Change findOneAndUpdate to FindOne and Save 
Setting an object property to `undefined` should tell Mongoose to remove that property (for example, remove the googleId from a brew). That doesn't seem to work with `findOneAndUpdate` however; the `undefined` property remains after the update.

Switching back to `save()` to make this work again.
 2022-12-12 09:59:04 -05:00
Trevor Buckner 263471bcbb Fix changelog typo 2022-12-10 18:03:16 -05:00
Trevor Buckner 9478454063 Merge pull request #2558 from naturalcrit/v3.4.2 
v3.4.2
 2022-12-10 14:18:16 -05:00
Trevor Buckner a9a9804517 v3.4.2 2022-12-10 14:15:09 -05:00
Trevor Buckner 0bde44ec2f Merge pull request #2470 from jeddai/remove-google-get-during-update 
update getBrew usages to not fetch google brew during updates
 2022-12-10 13:54:58 -05:00
Trevor Buckner 13ad179a1b Merge pull request #2523 from G-Ambatte/showGoogleAuthStatus-#2520 
Add link to instructions to refresh Google creds
 2022-12-10 13:34:17 -05:00
Trevor Buckner b72acd9e59 cleanup 2022-12-10 13:31:57 -05:00
Trevor Buckner 070184b309 Merge pull request #2553 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.4.5 
Bump react-router-dom from 6.4.4 to 6.4.5
 2022-12-07 22:49:39 -05:00