f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-08-15 05:12:57 +00:00
Code Wiki Activity
4,559 Commits 112 Branches 40 Tags
2c691d84f25832d97e8c42b9e48668f9b617dfa1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner 6184d64f89 Merge branch 'master' into pr/3263 2024-01-25 16:43:21 -05:00
Trevor Buckner da11089fff Merge pull request #3265 from 5e-Cleric/brewItem-update 
Easy enough. Thanks @5e-Cleric ! 🎉
 2024-01-25 16:36:46 -05:00
Trevor Buckner 0243d138ff Merge branch 'master' into pr/3265 2024-01-25 16:30:43 -05:00
Trevor Buckner 4c8a5baee5 Merge pull request #3264 from 5e-Cleric/admin-fix 
Thanks @5e-Cleric ! ⭐ 💯 🔥
 2024-01-25 16:29:37 -05:00
Trevor Buckner e5acbfed3a Linting and small tweaks 2024-01-25 16:27:10 -05:00
Trevor Buckner b503b8fc9b Merge branch 'master' into pr/3264 2024-01-25 14:35:23 -05:00
Trevor Buckner 3243e4d56c Merge pull request #3266 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.1.1 
Bump mongoose from 8.1.0 to 8.1.1
 2024-01-25 14:33:46 -05:00
Trevor Buckner 31c7fd12b9 Merge pull request #3241 from naturalcrit/dependabot/npm_and_yarn/marked-11.1.1 
Bump marked from 5.1.1 to 11.1.1
 2024-01-22 19:29:55 -05:00
Trevor Buckner 7b8aaa408d Merge branch 'master' into dependabot/npm_and_yarn/marked-11.1.1 2024-01-22 18:03:57 -05:00
Trevor Buckner 1c65ee150b relocate renderer.link 2024-01-22 17:56:40 -05:00
Trevor Buckner b0cfeaa782 Allow Babel to transpile Marked 
Marked now only supports ES6. Needs to be transpiled by us to support older browsers.
 2024-01-22 17:45:00 -05:00
Trevor Buckner eaf3c7978d Merge pull request #3256 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.21.3 
Bump react-router-dom from 6.21.2 to 6.21.3
 2024-01-18 23:58:23 -05:00
Trevor Buckner 099ea08bd4 Merge pull request #3255 from naturalcrit/MoreSpecificSaveErrorPopups 
Add error popups for "Out of Google Drive Storage" and "Not logged in to edit"
 2024-01-18 17:25:04 -05:00
Trevor Buckner b0ea34cc3f Add custom error messages. 2024-01-18 17:20:31 -05:00
Trevor Buckner a241813b8d Merge pull request #3118 from G-Ambatte/separateApiErrors-#2975 
Identify API errors and send error response
 2024-01-18 15:36:10 -05:00
Trevor Buckner de27437148 Merge branch 'master' into separateApiErrors-#2975 2024-01-18 15:32:16 -05:00
Trevor Buckner a2acf3be0e Merge pull request #3244 from Gazook89/theme-selector-styling 
Theme Selector Z-index issue
 2024-01-17 17:21:32 -05:00
Trevor Buckner 844a3c19ec Merge branch 'master' into theme-selector-styling 2024-01-17 17:21:21 -05:00
Trevor Buckner 877c2e365f Merge pull request #3245 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-27.6.3 
Bump eslint-plugin-jest from 27.6.2 to 27.6.3
 2024-01-17 17:20:24 -05:00
Trevor Buckner 81c7950ad1 Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-27.6.3 2024-01-17 14:28:43 -05:00
Trevor Buckner 7b8e3da90a Merge pull request #3250 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.1.0 
Bump mongoose from 8.0.4 to 8.1.0
 2024-01-17 14:28:26 -05:00
Trevor Buckner eef3d7738e Merge branch 'master' into separateApiErrors-#2975 2024-01-17 14:11:13 -05:00
Trevor Buckner 5ab89b2583 Merge pull request #3251 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-8.6.0 
Bump @googleapis/drive from 8.5.0 to 8.6.0
 2024-01-17 14:09:42 -05:00
Trevor Buckner c4defb7b3f Merge pull request #3246 from naturalcrit/dependabot/npm_and_yarn/supertest-6.3.4 
Bump supertest from 6.3.3 to 6.3.4
 2024-01-15 21:13:35 -05:00
Trevor Buckner 2fd2ccfe14 Tweak Font snippets to have ABC 2024-01-12 11:59:16 -05:00
Trevor Buckner 69308cfd8b Merge pull request #3242 from naturalcrit/stylelint-Snippetbar.less 
Lint snippetbar.less
 2024-01-12 11:58:39 -05:00
Trevor Buckner ccc1895304 Lint snippetbar.less 2024-01-12 11:57:34 -05:00
Trevor Buckner 05a0d80c1b Merge pull request #3203 from 5e-Cleric/font-snippets 
fonts as snippets
 2024-01-12 11:48:26 -05:00
Trevor Buckner 2ea65de0c0 Merge branch 'master' into pr/3203 2024-01-12 11:45:55 -05:00
Trevor Buckner 742798ad79 Fixing merge issues 2024-01-12 11:41:08 -05:00
Trevor Buckner f088fc49f3 Start fixing merge conflicts 2024-01-12 11:37:34 -05:00
Trevor Buckner b837ac5d6b Merge pull request #3240 from naturalcrit/dependabot/npm_and_yarn/marked-smartypants-lite-1.0.2 
Bump marked-smartypants-lite from 1.0.1 to 1.0.2
 2024-01-11 23:03:26 -05:00
Trevor Buckner 64af24f0f4 Merge pull request #3239 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.21.2 
Bump react-router-dom from 6.21.1 to 6.21.2
 2024-01-11 23:03:13 -05:00
Trevor Buckner f1d26cc0c0 Merge pull request #3237 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-27.6.2 
Bump eslint-plugin-jest from 27.6.1 to 27.6.2
 2024-01-11 12:14:00 -05:00
Trevor Buckner 2ed8614642 Merge pull request #3195 from naturalcrit/dependabot/npm_and_yarn/eslint-8.56.0 
Bump eslint from 8.55.0 to 8.56.0
 2024-01-10 15:10:12 -05:00
Trevor Buckner 9834fcb97f Merge pull request #3200 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.21.1 
Bump react-router-dom from 6.21.0 to 6.21.1
 2024-01-10 15:09:58 -05:00
Trevor Buckner 347393520d Merge pull request #3172 from 5e-Cleric/Elderberry-icon-font 
Eldeberry Inn Icon font to HB
 2024-01-10 14:59:57 -05:00
Trevor Buckner 4dfe1a0914 Merge pull request #3202 from Gazook89/theme-selector-styling 
Improve Theme selector styling
 2024-01-10 14:12:01 -05:00
Trevor Buckner 1a1acec2f3 Merge branch 'master' into theme-selector-styling 2024-01-10 14:11:40 -05:00
Trevor Buckner 84a0c43745 Merge pull request #3221 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.23.7 
Bump @babel/plugin-transform-runtime from 7.23.6 to 7.23.7
 2024-01-10 11:33:35 -05:00
Trevor Buckner baed640a3d Merge pull request #3233 from naturalcrit/FixPageDeletion 
Fix Page Deletion issue
 2024-01-10 11:32:17 -05:00
Trevor Buckner 7d6851572f Merge pull request #3193 from G-Ambatte/fixMustacheBlocks 
MustacheDivs do not account for prefixed spaces when generating text
 2024-01-09 22:36:49 -05:00
Trevor Buckner 3e2ec7cd36 Merge pull request #3235 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.0.4 
Bump mongoose from 8.0.3 to 8.0.4
 2024-01-09 22:34:24 -05:00
Trevor Buckner 8fc2737670 Merge pull request #3215 from 5e-Cleric/Darkbrewery-color-fix 
Color simplification and Darkbrewery snippet color fix
 2024-01-09 22:21:33 -05:00
Trevor Buckner 62948b2838 Merge pull request #3213 from naturalcrit/dependabot/npm_and_yarn/moment-2.30.1 
Bump moment from 2.29.4 to 2.30.1
 2024-01-09 22:20:38 -05:00
Trevor Buckner 3dfb3a9738 Merge pull request #3230 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.23.8 
Bump @babel/preset-env from 7.23.7 to 7.23.8
 2024-01-09 22:20:00 -05:00
Trevor Buckner 42c1bece65 Also edit currently selected page 2024-01-09 22:19:09 -05:00
Trevor Buckner 448c12cc91 Truncate extra pages when page count is edited. 2024-01-09 17:10:03 -05:00
Trevor Buckner 56c82f8793 Merge pull request #3204 from 5e-Cleric/fix-page-size-override 
quick fix page size override
 2024-01-09 16:52:09 -05:00
Trevor Buckner eb669e6eca Merge pull request #3223 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.23.7 
Bump @babel/preset-env from 7.23.6 to 7.23.7
 2024-01-05 23:16:42 -05:00
Trevor Buckner 17355012fb Merge pull request #3225 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-27.6.1 
Bump eslint-plugin-jest from 27.6.0 to 27.6.1
 2024-01-05 23:16:37 -05:00
Trevor Buckner eae593ce90 Merge pull request #3228 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-8.5.0 
Bump @googleapis/drive from 8.4.0 to 8.5.0
 2024-01-05 23:16:31 -05:00
Trevor Buckner 7a8a6480de Merge pull request #3220 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.23.7 
Bump @babel/core from 7.23.6 to 7.23.7
 2024-01-05 23:16:24 -05:00
Trevor Buckner 985a9843f2 Merge pull request #3191 from 5e-Cleric/Navigator-node-error-fix 
Navigator Node Error Fix
 2023-12-16 10:55:10 -05:00
Trevor Buckner 636f10cb41 stylelint 2023-12-14 16:57:26 -05:00
Trevor Buckner d6eaa812b1 Merge pull request #3066 from 5e-Cleric/single-quote-inline-style 
Single Quote in in-line styles
 2023-12-14 16:47:18 -05:00
Trevor Buckner 507f170720 Merge branch 'master' into pr/3066 2023-12-14 16:45:57 -05:00
Trevor Buckner faaf4207b4 Merge pull request #3187 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.21.0 
Bump react-router-dom from 6.20.1 to 6.21.0
 2023-12-14 16:24:49 -05:00
Trevor Buckner 688377ce0b Fix failing Markdown tests 2023-12-14 16:24:23 -05:00
Trevor Buckner 8cf57dbc72 Merge branch 'master' into pr/3066 2023-12-14 15:01:28 -05:00
Trevor Buckner 12012a2a5b Merge pull request #3131 from dbolack-ab/Issue_1488 
Add arbitrary tag attribute assignment in mustaches
 2023-12-14 14:53:50 -05:00
Trevor Buckner 9b59f47536 Simplify Attributes parsing logic 2023-12-14 13:58:38 -05:00
Trevor Buckner 90b4e47861 Fix ' ' removed from processStyleTags regex 
Removes the case of "empty properties" that needed `.trim()`
 2023-12-14 13:47:36 -05:00
Trevor Buckner ef00231c5b Move tests to the correct section 2023-12-14 13:46:44 -05:00
Trevor Buckner c39653bc69 Merge branch 'master' into pr/3131 2023-12-14 12:24:48 -05:00
Trevor Buckner 83faa86063 Merge pull request #3189 from naturalcrit/FixMarkdownTests 
Make a lot of Markdown tests pass
 2023-12-14 12:22:11 -05:00
Trevor Buckner af20d0b1c2 Make a lot of Markdown tests pass 2023-12-14 12:20:50 -05:00
Trevor Buckner 3784e0f583 Merge branch 'master' into pr/3131 2023-12-13 16:55:19 -05:00
Trevor Buckner df33713f82 Merge branch 'master' into pr/3066 2023-12-13 16:46:35 -05:00
Trevor Buckner c4ba6381f2 Merge pull request #3180 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.23.6 
Bump @babel/core from 7.23.5 to 7.23.6
 2023-12-13 16:39:57 -05:00
Trevor Buckner 547daf6499 Merge pull request #3179 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.23.6 
Bump @babel/preset-env from 7.23.5 to 7.23.6
 2023-12-13 16:39:49 -05:00
Trevor Buckner 481bab9463 Merge pull request #3181 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.23.6 
Bump @babel/plugin-transform-runtime from 7.23.4 to 7.23.6
 2023-12-13 15:50:23 -05:00
Trevor Buckner 74c4f4fe52 Merge pull request #3078 from 5e-Cleric/clear-invalid-or-unused-css 
Clear invalid CSS from 5ePHB/style.less
 2023-12-11 16:39:57 -05:00
Trevor Buckner 7c9513f377 Lint 2023-12-11 16:29:16 -05:00
Trevor Buckner f5f6137a4d Lint 2023-12-11 15:48:58 -05:00
Trevor Buckner 0775f9ee1b Restore padding to code blocks 2023-12-11 15:45:39 -05:00
Trevor Buckner 75ed555de1 Merge branch 'master' into pr/3078 2023-12-11 15:13:39 -05:00
Trevor Buckner e7d0741139 Merge pull request #3178 from naturalcrit/lintBlankTheme 
Lint Blank style.less to match PHB format
 2023-12-11 15:13:07 -05:00
Trevor Buckner c69de1036f Lint Blank style.less to match PHB format 2023-12-11 15:12:40 -05:00
Trevor Buckner 7d115c970a Merge pull request #3176 from naturalcrit/dependabot/npm_and_yarn/marked-extended-tables-1.0.8 
Bump marked-extended-tables from 1.0.7 to 1.0.8
 2023-12-11 14:12:30 -05:00
Trevor Buckner 852aa8d289 Merge pull request #3174 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.0.3 
Bump mongoose from 8.0.2 to 8.0.3
 2023-12-11 14:12:22 -05:00
Trevor Buckner 5bfd0dd537 Merge pull request #3074 from G-Ambatte/addCreditsSnippet-#283 
Add basic Homebrewery credits snippet
 2023-12-07 22:33:41 -05:00
Trevor Buckner 05e56221f4 Small tweaks 2023-12-07 22:32:33 -05:00
Trevor Buckner e99aad15c1 Merge pull request #3116 from G-Ambatte/fixFFPrinting-#3115 
Fix Firefox printing
 2023-12-05 11:49:50 -05:00
Trevor Buckner c57b011215 Merge branch 'master' into fixFFPrinting-#3115 2023-12-05 11:40:32 -05:00
Trevor Buckner 5942bfece1 Merge pull request #3133 from dbolack-ab/Issue_2171 
Add subscript and subscript markdown tokens
 2023-12-04 22:23:28 -05:00
Trevor Buckner 2dc874daba Adjust hotkeys to match other changes 2023-12-04 22:21:58 -05:00
Trevor Buckner 38fa428fde Change to 1 and 2 ^'s . Slight cleanup 2023-12-04 22:11:05 -05:00
Trevor Buckner 6bf51cd94a Allow both sub and super highlighting on same line 2023-12-04 21:56:08 -05:00
Trevor Buckner ddef21cd7e Give editor highlighting sub/superscript alignment 2023-12-04 21:54:44 -05:00
Trevor Buckner bf30cadb68 Add default page size to brewRenderer.less 
Add default brew page size to brewRenderer.less, so all pages have a fallback size when switching between themes and renderers. Avoids losing the scroll position on a page caused by out-of-view pages losing their size, especially on long brews where recalculating page layout can take a half second.
 2023-12-04 21:13:26 -05:00
Trevor Buckner abe3a7e7c7 Merge pull request #3154 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.23.4 
Bump @babel/plugin-transform-runtime from 7.23.3 to 7.23.4
 2023-12-04 17:10:16 -05:00
Trevor Buckner a5313deb78 Merge pull request #3157 from naturalcrit/dependabot/npm_and_yarn/fs-extra-11.2.0 
Bump fs-extra from 11.1.1 to 11.2.0
 2023-12-04 17:09:53 -05:00
Trevor Buckner 5dd486866f Merge pull request #3151 from naturalcrit/dependabot/npm_and_yarn/stylelint-config-recess-order-4.4.0 
Bump stylelint-config-recess-order from 4.3.0 to 4.4.0
 2023-12-04 17:09:43 -05:00
Trevor Buckner ada642e56e Merge pull request #3158 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.0.2 
Bump mongoose from 8.0.0 to 8.0.2
 2023-12-04 17:09:02 -05:00
Trevor Buckner 881fcc9cba Merge pull request #3161 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.23.5 
Bump @babel/core from 7.23.3 to 7.23.5
 2023-12-04 17:08:44 -05:00
Trevor Buckner a809e920fc Merge pull request #3160 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.23.5 
Bump @babel/preset-env from 7.23.3 to 7.23.5
 2023-12-04 17:08:38 -05:00
Trevor Buckner 36f3eb4da1 Merge pull request #3162 from naturalcrit/dependabot/npm_and_yarn/marked-gfm-heading-id-3.1.2 
Bump marked-gfm-heading-id from 3.1.1 to 3.1.2
 2023-12-04 17:08:31 -05:00
Trevor Buckner 57772065e0 Merge pull request #3170 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.20.1 
Bump react-router-dom from 6.18.0 to 6.20.1
 2023-12-04 17:08:23 -05:00
Trevor Buckner f10be94190 Merge pull request #3169 from naturalcrit/dependabot/npm_and_yarn/eslint-8.55.0 
Bump eslint from 8.53.0 to 8.55.0
 2023-12-04 17:08:15 -05:00