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,343 Commits 124 Branches 40 Tags
807ab2a538475cff7b82344e55274451913c5198
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner 98ae938b3d Merge pull request #2730 from naturalcrit/RunJestTestsSequentially 
Run Tests sequentially
 2023-03-14 11:18:10 -04:00
Trevor Buckner 4ec0107348 Merge pull request #2732 from naturalcrit/Fix_Column-Fill-Auto_on_Legacy_MonsterBlocks 
Change monster block to column-fill : balance
 2023-03-13 23:27:58 -04:00
Trevor Buckner 8106b2b694 Up version to v3.7.2 2023-03-13 23:25:42 -04:00
Trevor Buckner c4d26e7ffe Change monster block to column-fill : balance 2023-03-13 23:16:34 -04:00
Trevor Buckner f148014a93 Make coverage command run in sequence too 2023-03-13 14:48:10 -04:00
Trevor Buckner 0a09cd9c67 Don't test in parallel, raise timeout 2023-03-13 14:34:48 -04:00
Trevor Buckner 3105ee1eac Run Tests sequentially 
One possible solution to tests timing out on CI

https://jestjs.io/docs/troubleshooting#tests-are-extremely-slow-on-docker-and-or-continuous-integration-ci-server
 2023-03-13 14:16:28 -04:00
Trevor Buckner 30e7c73805 Merge pull request #2717 from naturalcrit/dependabot/npm_and_yarn/jest-29.5.0 
Bump jest from 29.4.3 to 29.5.0
 2023-03-11 23:56:35 -05:00
Trevor Buckner e080bf1bde Update changelog.md 2023-03-09 16:17:09 -05:00
Trevor Buckner aa76252a55 Merge pull request #2722 from naturalcrit/v3.7.1 
Up version to v3.7.1
 2023-03-09 15:45:41 -05:00
Trevor Buckner 6f3292e994 Merge pull request #2721 from naturalcrit/FixBlurryCoverpageOutlines 
Change coverpage text-shadow to filter:drop-shadow
 2023-03-09 15:45:13 -05:00
Trevor Buckner eaa672c4c7 Change coverpage text-shadow to filter:drop-shadow 2023-03-09 15:35:35 -05:00
Trevor Buckner 93ff59f670 Up version to v3.7.1 2023-03-09 15:20:28 -05:00
Trevor Buckner c47fae6061 Merge pull request #2696 from MichielDeMey/feature/trim-google-apis 
[Draft] Trimming Google APIs
 2023-03-07 14:53:20 -05:00
Trevor Buckner 6ff0999d88 Merge branch 'master' into pr/2696 2023-03-07 14:49:37 -05:00
Trevor Buckner bfccf833b6 Fix variable name conflict bugs 2023-03-07 14:27:33 -05:00
Trevor Buckner b990af3fc3 Merge pull request #2710 from MichielDeMey/feature/new-google-drive-icon 
Updated Google Drive icon
 2023-03-06 16:06:04 -05:00
Trevor Buckner 91a31757e5 Merge branch 'master' into feature/new-google-drive-icon 2023-03-06 16:03:19 -05:00
Trevor Buckner c341bc5db6 Make icon slightly smaller 2023-03-06 16:02:54 -05:00
Trevor Buckner c88253901a Merge pull request #2127 from lucastucious/v3-fix-note-render 
[V3] Fix note render to pdf
 2023-03-06 14:12:06 -05:00
Trevor Buckner 164e0a4433 adjust values based on old original box-shadow sizes 
Some shadows need to be made bigger to interact with the border-image hanging over the top of the shadow. This just restores those sizes we had before first changing to filter:drop-shadow. See https://github.com/naturalcrit/homebrewery/pull/1577/files
 2023-03-06 14:09:59 -05:00
Trevor Buckner 97852c3c03 Merge branch 'master' into pr/2127 2023-03-06 12:54:13 -05:00
Trevor Buckner 4057d7bf84 Merge branch 'master' into pr/2696 2023-03-02 16:48:05 -05:00
Trevor Buckner ce2298ddd0 Properly comment line so // doesn't appear in page 2023-03-02 10:54:14 -05:00
Trevor Buckner cc89ad1c7d Merge pull request #2709 from naturalcrit/Re-remove-layers-from-Blank-Theme 
Remove last bits of @Layers. Sigh...
 2023-03-01 07:42:23 -05:00
Trevor Buckner ba11aef038 Remove last bits of @Layers. Sigh... 2023-03-01 07:42:06 -05:00
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