f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-09-23 14:02:58 +00:00
Code Wiki Activity
3,305 Commits 125 Branches 40 Tags
bbcf415a304363cd345bb243ecef5a2b8f1eb3de
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner 240d283536 Merge pull request #2707 from naturalcrit/v3.7.0 
Update changelog.md
 2023-02-28 22:50:35 -05:00
Trevor Buckner 9a60fe4129 Update changelog.md 2023-02-28 22:50:02 -05:00
Trevor Buckner 6af98cd842 Merge pull request #2706 from naturalcrit/v3.7.0 
V3.7.0
 2023-02-28 22:36:10 -05:00
Trevor Buckner b2f64d1094 Update changelog.md 2023-02-28 22:35:46 -05:00
Trevor Buckner 820582067e Merge branch 'master' into v3.7.0 2023-02-28 22:33:35 -05:00
Trevor Buckner dae1106e50 Tweak icons 2023-02-28 22:33:15 -05:00
Trevor Buckner 239cc4d99e up version to 3.7.0 2023-02-28 22:25:20 -05:00
Trevor Buckner 48cd8bb6f7 Merge pull request #2694 from MichielDeMey/patch-1 
Use secure protocol for Homebrewery mug image
 2023-02-28 21:53:22 -05:00
Trevor Buckner 480d7d2b5e Merge pull request #2700 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.8.2 
Bump react-router-dom from 6.8.1 to 6.8.2
 2023-02-28 16:56:32 -05:00
Trevor Buckner 9ea80c0d31 Merge pull request #2698 from naturalcrit/dependabot/npm_and_yarn/eslint-8.35.0 
Bump eslint from 8.34.0 to 8.35.0
 2023-02-28 16:56:18 -05:00
Trevor Buckner bd151efd51 Merge pull request #2705 from naturalcrit/DisableLayersFromCoreCSS 
Disable @layers on core CSS due to crashing ios
 2023-02-28 16:56:08 -05:00
Trevor Buckner 0ac1d1e87a Disable @layers on core CSS due to crashing ios 2023-02-28 16:54:59 -05:00
Trevor Buckner a626f394df Merge pull request #2695 from MichielDeMey/patch-2 
Fixed typo in Jest's modulePaths
 2023-02-28 16:33:46 -05:00
Trevor Buckner afa3fb434e Merge pull request #2703 from naturalcrit/Mark-snippets-as-experimental 
Add "beta" badge on snippets marked "experimetal"
 2023-02-28 16:31:39 -05:00
Trevor Buckner 7117d3caed Add "beta" badge on snippets marked "experimetal" 2023-02-28 16:26:23 -05:00
Trevor Buckner 3461c47a63 Merge pull request #2649 from 5e-Cleric/cover-snippet 
Cover snippet
 2023-02-28 14:08:22 -05:00
Trevor Buckner 4f715a316b Tweak CSS and snippet 2023-02-28 13:17:25 -05:00
Trevor Buckner 7a316060dd Change footnote font 2023-02-28 13:15:30 -05:00
Trevor Buckner a96f9e2b76 Update Nodesto Font to be slightly more narrow 2023-02-28 13:14:34 -05:00
Trevor Buckner 2e7c8c0cab Remove @layer 2023-02-22 15:34:05 -05:00
Trevor Buckner ed85e4eb0a Merge branch 'master' into cover-snippet 2023-02-22 15:06:49 -05:00
Trevor Buckner 91a2ce211d Merge branch 'cover-snippet' of https://github.com/5e-Cleric/homebrewery into pr/2649 2023-02-22 15:05:25 -05:00
Trevor Buckner 6e859aec1c Merge branch 'master' into pr/2649 2023-02-22 14:57:34 -05:00
Trevor Buckner 4d7e273f7d Merge pull request #2373 from naturalcrit/WatercolorImageMask 
Watercolor image mask
 2023-02-22 14:51:48 -05:00
Trevor Buckner c3d53cfc10 Remove old comments 2023-02-22 14:51:16 -05:00
Trevor Buckner 90d5ac4603 Implement scaling, but not added to snippet 2023-02-22 14:49:11 -05:00
Trevor Buckner 096b3d00fc Fix corner snippet reversed Y position 2023-02-22 14:48:24 -05:00
Trevor Buckner 2a75c702b9 Merge branch 'master' into WatercolorImageMask 2023-02-22 13:06:20 -05:00
Trevor Buckner c4719f0e0f Merge pull request #2682 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.21.0 
Bump @babel/core from 7.20.12 to 7.21.0
 2023-02-22 10:04:54 -05:00
Trevor Buckner fe6223c892 Merge pull request #2685 from naturalcrit/dependabot/npm_and_yarn/body-parser-1.20.2 
Bump body-parser from 1.20.1 to 1.20.2
 2023-02-22 10:03:27 -05:00
Trevor Buckner 66c80c3891 Merge pull request #2684 from naturalcrit/undoLayers 
Disable @layers for now
 2023-02-21 15:36:39 -05:00
Trevor Buckner 767f03fba0 Disable @layers for now 
@Layers have too many conflicts with custom CSS styling. Delay until V4 renderer.
 2023-02-21 15:36:01 -05:00
Trevor Buckner 8b3bef02e8 Merge pull request #2676 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.9.2 
Bump mongoose from 6.9.1 to 6.9.2
 2023-02-21 09:39:54 -05:00
Trevor Buckner 3a6e4ec385 Merge pull request #2683 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.21.0 
Bump @babel/plugin-transform-runtime from 7.19.6 to 7.21.0
 2023-02-21 09:39:20 -05:00
Trevor Buckner fe5e91c377 Merge pull request #2678 from naturalcrit/v3.6.1 
Up version to 3.6.1
 2023-02-18 13:57:00 -05:00
Trevor Buckner 512ef78e9e Up version to 3.6.1 2023-02-18 13:56:41 -05:00
Trevor Buckner 4fca81fd3f Merge pull request #2675 from G-Ambatte/fixAuthorDeletion-#2674 
Fix author deletion #2674
 2023-02-18 13:48:49 -05:00
Trevor Buckner 6a8a2f080c Lint 2023-02-18 13:48:32 -05:00
Trevor Buckner 298a10bc42 Clean up tests 2023-02-18 13:48:02 -05:00
Trevor Buckner b6a95a2c01 Merge pull request #2677 from naturalcrit/FixDividerBarDots 
Override FontAwesome conflict due to @layers
 2023-02-18 13:30:32 -05:00
Trevor Buckner b09a4ea5fa Override FontAwesome conflict due to @layers 2023-02-18 13:30:06 -05:00
Trevor Buckner 9e2aec18ad Get Corners fully working with x/y offset and rotate 2023-02-16 23:00:17 -05:00
Trevor Buckner d9f5e9d635 Merge pull request #2673 from naturalcrit/dependabot/npm_and_yarn/jest-29.4.3 
Bump jest from 29.4.1 to 29.4.3
 2023-02-16 15:19:49 -05:00
Trevor Buckner 1ce3e399a8 Merge pull request #2670 from naturalcrit/dependabot/npm_and_yarn/eslint-8.34.0 
Bump eslint from 8.33.0 to 8.34.0
 2023-02-16 15:19:26 -05:00
Trevor Buckner 4a12ccf2b6 Merge pull request #2669 from naturalcrit/dependabot/npm_and_yarn/googleapis-111.0.0 
Bump googleapis from 110.0.0 to 111.0.0
 2023-02-16 15:19:14 -05:00
Trevor Buckner da83e1a252 Merge pull request #2666 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.8.1 
Bump react-router-dom from 6.8.0 to 6.8.1
 2023-02-16 15:18:31 -05:00
Trevor Buckner a971dd4713 Merge pull request #2665 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.9.1 
Bump mongoose from 6.9.0 to 6.9.1
 2023-02-16 15:18:19 -05:00
Trevor Buckner 0355b52021 Custom icons for image masks in general 2023-02-07 15:36:52 -05:00
Trevor Buckner c430e5a92b lint 2023-02-07 10:37:33 -05:00
Trevor Buckner 2ac09130a6 Remove switch statement 2023-02-07 10:36:51 -05:00
Trevor Buckner 63346cfd7a Add subsnippets for edge masks 2023-02-07 10:31:29 -05:00
Trevor Buckner 2ea639000b Update Corner snippets to use correct corner 2023-02-07 10:21:29 -05:00
Trevor Buckner 051fdbbc60 Fix snippet hover highlight not full button width 2023-02-07 10:20:43 -05:00
Trevor Buckner d02fcc9252 Update custom position icons 2023-02-07 09:56:03 -05:00
Trevor Buckner 33c8291a55 Merge branch 'master' into WatercolorImageMask 2023-02-06 16:25:13 -05:00
Trevor Buckner 270b20aaaf Add position options to corner snippets 2023-02-06 16:25:02 -05:00
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 6f70994a77 Merge branch 'master' into WatercolorImageMask 2023-02-02 15:49:32 -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 5eb1d58059 Add rotation to corners snippet 2023-02-02 11:49:25 -05:00
Trevor Buckner 096e281a6c Rework Corner snippet and CSS to allow free rotation 2023-02-02 11:48:30 -05:00
Trevor Buckner 73f141613e Change classname from imageMask to imageMaskEdge 2023-01-31 17:03:12 -05:00
Trevor Buckner aee240cf9b remove original text background 2023-01-31 16:00:43 -05:00
Trevor Buckner 7af2e8810a Fix snippet more, add link to imgur image 2023-01-31 16:00:31 -05:00
Trevor Buckner 24031fbfa0 Clarify snippet instructions 2023-01-31 13:33:19 -05:00
Trevor Buckner b93e9ec95e Comment out Corners snippet for later PR 2023-01-31 13:32:10 -05:00
Trevor Buckner 347d132cde Keep fixing merge 2023-01-31 13:24:29 -05:00
Trevor Buckner 98c7ef9d12 Merge branch 'master' into WatercolorImageMask 2023-01-31 13:18:20 -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