100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Trevor Buckner	9f6bc10369	Merge pull request #3222 from naturalcrit/dependabot/npm_and_yarn/classnames-2.5.1 ... Bump classnames from 2.3.2 to 2.5.1	2024-03-27 10:07:46 -04:00
Trevor Buckner	f7c7d40195	Merge branch 'master' into dependabot/npm_and_yarn/classnames-2.5.1	2024-03-27 10:04:11 -04:00
Trevor Buckner	380e3fead3	Merge pull request #3367 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.24.3 ... Bump @babel/core from 7.24.0 to 7.24.3	2024-03-27 10:03:22 -04:00
Trevor Buckner	15367f9444	Merge pull request #3380 from naturalcrit/dependabot/npm_and_yarn/express-4.19.2 ... Bump express from 4.19.1 to 4.19.2	2024-03-27 09:59:34 -04:00
Trevor Buckner	90a710907e	Merge branch 'master' into dependabot/npm_and_yarn/express-4.19.2	2024-03-27 09:57:16 -04:00
Trevor Buckner	da6d06728c	Merge pull request #3346 from 5e-Cleric/scrollbar ... Custom scrollbar	2024-03-27 09:56:35 -04:00
Trevor Buckner	451ff3ffec	Merge branch 'master' into scrollbar	2024-03-27 09:54:57 -04:00
Trevor Buckner	61038f876d	Merge branch 'master' into dependabot/npm_and_yarn/express-4.19.2	2024-03-27 09:34:20 -04:00
Trevor Buckner	20e1c71eff	Merge pull request #3379 from G-Ambatte/fixDL+MustacheClash-#3378 ... Change Marked extension priority order	2024-03-27 09:34:05 -04:00
Trevor Buckner	d2d7f5b71e	Merge branch 'master' into fixDL+MustacheClash-#3378	2024-03-27 09:23:52 -04:00
Trevor Buckner	161efbb3c8	Merge pull request #3372 from naturalcrit/dependabot/npm_and_yarn/express-4.19.1 ... Bump express from 4.18.3 to 4.19.1	2024-03-27 09:23:06 -04:00
Trevor Buckner	831c635149	Merge branch 'master' into dependabot/npm_and_yarn/express-4.19.1	2024-03-25 14:51:30 -04:00
Trevor Buckner	d961e7695d	Merge pull request #3366 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.24.3 ... Bump @babel/plugin-transform-runtime from 7.24.0 to 7.24.3	2024-03-25 14:44:23 -04:00
Trevor Buckner	0396bedcd0	Merge pull request #3373 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.24.3 ... Bump @babel/preset-env from 7.24.1 to 7.24.3	2024-03-25 14:31:26 -04:00
Trevor Buckner	772b478682	Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-env-7.24.3	2024-03-22 11:43:07 -04:00
Trevor Buckner	dab8dd278d	Merge pull request #3376 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.2.3 ... Bump mongoose from 8.2.2 to 8.2.3	2024-03-22 11:42:57 -04:00
Trevor Buckner	a7f07ab9f5	Merge branch 'master' into dependabot/npm_and_yarn/express-4.19.1	2024-03-22 11:40:47 -04:00
Trevor Buckner	75080135af	Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.2.3	2024-03-22 11:40:36 -04:00
Trevor Buckner	7a9483c0d0	Merge pull request #3363 from naturalcrit/dependabot/npm_and_yarn/babel/preset-react-7.24.1 ... Bump @babel/preset-react from 7.23.3 to 7.24.1	2024-03-22 11:40:26 -04:00
Trevor Buckner	484c6bb8a7	Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-react-7.24.1	2024-03-22 11:23:23 -04:00
Trevor Buckner	125adfb198	Merge branch 'master' into dependabot/npm_and_yarn/express-4.19.1	2024-03-22 11:23:09 -04:00
Trevor Buckner	7de58740a2	Merge pull request #3375 from G-Ambatte/fixDefinitionListUndefinedTypeCrash ... Fix crash when match is undefined	2024-03-21 21:56:31 -04:00
Trevor Buckner	920c4cd7cb	Merge pull request #3361 from G-Ambatte/addDefinitionListTests ... Add definition list test: ensure inline has priority over multiline	2024-03-20 10:42:52 -04:00
Trevor Buckner	eddb513e72	Merge branch 'master' into addDefinitionListTests	2024-03-20 10:40:34 -04:00
Trevor Buckner	fea68ac71a	Merge pull request #3362 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.24.1 ... Bump @babel/preset-env from 7.24.0 to 7.24.1	2024-03-20 10:39:45 -04:00
Trevor Buckner	647afba2b0	Merge pull request #3359 from naturalcrit/Fix-Multiline-DL-Crash ... Fix crash for DL, disallow block tokens as DT, add test	2024-03-19 15:48:40 -04:00
Trevor Buckner	bd324a7e74	Fix crash for DL, disallow block tokens as DT, add test	2024-03-19 13:14:58 -04:00
Trevor Buckner	ac080c8323	Merge pull request #3358 from 5e-Cleric/fix-monster-dl ... Quickfix: Monster statblocks definition list missed blank line	2024-03-18 19:36:48 -04:00
Trevor Buckner	30ebf90371	Add Tests to circleci	2024-03-18 19:34:17 -04:00
Trevor Buckner	f9a7adbd72	Fix tests	2024-03-18 19:28:42 -04:00
Trevor Buckner	a34ed8ccb4	Merge pull request #3354 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.34.1 ... Bump eslint-plugin-react from 7.34.0 to 7.34.1	2024-03-18 17:37:47 -04:00
Trevor Buckner	d4d0546d61	Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-react-7.34.1	2024-03-18 17:34:16 -04:00
Trevor Buckner	e94c1d33d2	Merge pull request #3353 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.2.2 ... Bump mongoose from 8.2.1 to 8.2.2	2024-03-18 17:34:05 -04:00
Trevor Buckner	dd6388bf9f	Merge pull request #3327 from G-Ambatte/experimentalBrewLocking-#3326 ... Add administrative brew locking function	2024-03-18 17:33:54 -04:00
Trevor Buckner	8b8071a903	Merge branch 'master' into experimentalBrewLocking-#3326	2024-03-18 17:31:41 -04:00
Trevor Buckner	a851378a2f	Merge pull request #3357 from naturalcrit/v3.12.0 ... v3.12.0	2024-03-18 17:25:34 -04:00
Trevor Buckner	e3b2d33a5e	v3.12.0	2024-03-18 17:24:39 -04:00
Trevor Buckner	e4b7d0be64	Merge pull request #3356 from naturalcrit/Fix-Dicefont ... Fix dicefont	2024-03-18 16:55:32 -04:00
Trevor Buckner	7e48696fb5	lint	2024-03-18 16:55:08 -04:00
Trevor Buckner	b727c56e56	Fix Dicefont	2024-03-18 16:52:43 -04:00
Trevor Buckner	4606ad4c6e	Merge branch 'master' into scrollbar	2024-03-14 17:10:30 -04:00
Trevor Buckner	bf267436b0	Merge pull request #3348 from 5e-Cleric/fonts-fix ... Font fix, df to icon fonts, remove duplication	2024-03-14 17:07:30 -04:00
Trevor Buckner	2af44665e1	Merge branch 'master' into fonts-fix	2024-03-14 16:59:21 -04:00
Trevor Buckner	e412a379e3	Merge pull request #3129 from dbolacksn/Extended_DD ... Add Multi-line Dictionary Definition (<dd>) rows.	2024-03-14 00:05:30 -04:00
Trevor Buckner	f37da19649	lint	2024-03-14 00:03:28 -04:00
Trevor Buckner	d7756230fb	More tests. Split into two extensions ... Split into two extensions as single-line and multiline are different syntaxes. Simplified a lot of logic and probably cleaner as their own NPM packages (eventually).	2024-03-14 00:02:18 -04:00
Trevor Buckner	e36a638ae5	Add more tests	2024-03-09 16:41:05 -05:00
Trevor Buckner	005fb705fa	Merge pull request #3349 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.22.3 ... Bump react-router-dom from 6.22.2 to 6.22.3	2024-03-08 10:46:35 -05:00
Trevor Buckner	f6c0b0d6fc	Simplification of CSS	2024-03-07 23:46:10 -05:00
Trevor Buckner	d129fc14c1	Merge pull request #3291 from 5e-Cleric/nav-fixes ... Small navigation fixes	2024-03-06 15:39:45 -05:00
Trevor Buckner	58422569c9	Extra classes were needed for .recent and .save ... .save has special styling for the "on" button. .recent has special styling for the dividers between Edited and Viewed	2024-03-06 15:32:38 -05:00
Trevor Buckner	8e6f0a7dbb	Merge branch 'master' into nav-fixes	2024-03-06 13:24:32 -05:00
Trevor Buckner	a74b556188	Merge pull request #3278 from 5e-Cleric/type-fix-for-stylesheet-import-in-html ... Add type attribute to all stylesheet import link tags	2024-03-06 12:57:03 -05:00
Trevor Buckner	c871548877	Merge branch 'master' into type-fix-for-stylesheet-import-in-html	2024-03-06 12:53:04 -05:00
Trevor Buckner	190ecddc2a	Merge pull request #3345 from RKuerten/fixContentsSnippet ... Updated Table of Contents snippet	2024-03-06 12:45:38 -05:00
Trevor Buckner	0a24ac9f25	Merge pull request #3289 from 5e-Cleric/newFromLocal ... New Brew from Local file	2024-03-06 12:44:01 -05:00
Trevor Buckner	d8d580c277	Merge branch 'master' into newFromLocal	2024-03-06 12:43:34 -05:00
Trevor Buckner	be08887e50	Merge pull request #3286 from 5e-Cleric/PHB-vs-Blank-theme-management ... Phb vs Blank theme management	2024-03-06 12:33:26 -05:00
Trevor Buckner	5043313aca	Merge branch 'master' into PHB-vs-Blank-theme-management	2024-03-06 12:32:20 -05:00
Trevor Buckner	83d2a604e1	Clean up some spacing	2024-03-06 12:28:43 -05:00
Trevor Buckner	7e847cc139	Merge pull request #3332 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.24.0 ... Bump @babel/plugin-transform-runtime from 7.23.9 to 7.24.0	2024-03-06 11:25:06 -05:00
Trevor Buckner	24421ca4e7	Merge pull request #3331 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.24.0 ... Bump @babel/preset-env from 7.23.9 to 7.24.0	2024-03-06 11:03:34 -05:00
Trevor Buckner	f71c3da568	Merge pull request #3333 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.24.0 ... Bump @babel/core from 7.23.9 to 7.24.0	2024-03-05 12:39:36 -05:00
Trevor Buckner	776b6da79f	Merge pull request #3337 from naturalcrit/dependabot/npm_and_yarn/express-4.18.3 ... Bump express from 4.18.2 to 4.18.3	2024-03-05 12:35:10 -05:00
Trevor Buckner	ed6bca04f5	Merge pull request #3334 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.22.2 ... Bump react-router-dom from 6.22.1 to 6.22.2	2024-03-05 12:22:25 -05:00
Trevor Buckner	cc9ead20b3	Merge pull request #3342 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.34.0 ... Bump eslint-plugin-react from 7.33.2 to 7.34.0	2024-03-05 12:18:26 -05:00
Trevor Buckner	79c89bb621	Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-react-7.34.0	2024-03-05 12:14:59 -05:00
Trevor Buckner	7ecca16fd0	Merge pull request #3343 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.2.1 ... Bump mongoose from 8.2.0 to 8.2.1	2024-03-05 12:09:42 -05:00
Trevor Buckner	4dd8ad77bb	Merge pull request #3288 from 5e-Cleric/FA-upgrade ... FA to 6.5.1	2024-03-04 16:58:53 -05:00
Trevor Buckner	9f5a4fb44c	Merge branch 'master' into FA-upgrade	2024-03-04 16:57:59 -05:00
Trevor Buckner	3d7780958a	Merge branch 'Combine-Nav-Styling' of https://github.com/Gazook89/homebrewery into pr/3292	2024-03-01 01:31:06 -05:00
Trevor Buckner	59e87697ff	linting	2024-03-01 01:27:46 -05:00
Trevor Buckner	20c088b6de	Merge branch 'master' into Combine-Nav-Styling	2024-03-01 01:26:17 -05:00
Trevor Buckner	50f069e688	Fix some nesting of styles ... The values from nav.less were mistakenly nested inside each other which was adding too much specificity.	2024-03-01 01:24:50 -05:00
Trevor Buckner	148c243d9f	Merge pull request #3323 from dbolack-ab/fix_subsuper_Highlighting ... Fix syntax highlighting on sub and superscript	2024-02-29 18:28:03 -05:00
Trevor Buckner	16e4f66b99	Merge branch 'master' into fix_subsuper_Highlighting	2024-02-29 18:27:35 -05:00
Trevor Buckner	774b555a61	Rework to fix 5eCleric's tests	2024-02-29 17:17:38 -05:00
Trevor Buckner	1c7d2740f3	Merge branch 'master' into dependabot/npm_and_yarn/classnames-2.5.1	2024-02-27 15:30:35 -05:00
Trevor Buckner	3778b4c719	Merge pull request #3328 from naturalcrit/dependabot/npm_and_yarn/eslint-8.57.0 ... Bump eslint from 8.56.0 to 8.57.0	2024-02-27 10:39:12 -05:00
Trevor Buckner	3e258332c1	Merge pull request #3330 from RKuerten/removeBGattach ... Remove background-attachment property from .monster.frame	2024-02-27 10:38:53 -05:00
Trevor Buckner	ba1430c377	Merge pull request #3320 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.2.0 ... Bump mongoose from 8.1.3 to 8.2.0	2024-02-22 23:08:17 -05:00
Trevor Buckner	94d9e1b08e	Merge pull request #3316 from G-Ambatte/fixSantizeScriptTags-#3315 ... Fix sanitizeScriptTags when content is null	2024-02-22 00:20:35 -05:00
Trevor Buckner	4feeaee7e7	Merge pull request #3307 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-27.9.0 ... Bump eslint-plugin-jest from 27.6.3 to 27.9.0	2024-02-21 22:02:52 -05:00
Trevor Buckner	5f5185c619	Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-27.9.0	2024-02-21 21:53:14 -05:00
Trevor Buckner	3e76307303	Merge pull request #3296 from 5e-Cleric/lang-fix-on-print ... Fix lang on print	2024-02-21 21:52:59 -05:00
Trevor Buckner	fe3a5f4def	Merge branch 'master' into lang-fix-on-print	2024-02-21 21:52:03 -05:00
Trevor Buckner	5d752f3355	Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-27.9.0	2024-02-21 21:49:43 -05:00
Trevor Buckner	8f400236a7	Merge pull request #3314 from naturalcrit/ForceVarMathTo$ ... Variable math requires `$` prefix	2024-02-21 21:42:36 -05:00
Trevor Buckner	8779ee3325	Variable math requires $ prefix	2024-02-21 21:42:03 -05:00
Trevor Buckner	0e48f325f2	Merge pull request #3311 from naturalcrit/v3.11.0 ... Up to v3.11.0	2024-02-21 17:30:44 -05:00
Trevor Buckner	7e38271ac6	Up to v3.11.0	2024-02-21 17:30:15 -05:00
Trevor Buckner	4866eacd5d	Merge pull request #3306 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.22.1 ... Bump react-router-dom from 6.22.0 to 6.22.1	2024-02-20 23:51:32 -05:00
Trevor Buckner	1386020bbb	Merge pull request #3273 from 5e-Cleric/brew-author-comma-fix ... brew fix commas	2024-02-20 23:25:23 -05:00
Trevor Buckner	6b7af58e6c	Change span to Fragment; linting	2024-02-20 23:24:43 -05:00
Trevor Buckner	d5230757b1	Merge pull request #3305 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.1.3 ... Bump mongoose from 8.1.1 to 8.1.3	2024-02-20 23:07:27 -05:00
Trevor Buckner	06825468b4	Merge pull request #3299 from 5e-Cleric/update-popup ... popup update 3.11	2024-02-20 23:07:05 -05:00
Trevor Buckner	faab60f271	Merge branch 'master' into update-popup	2024-02-20 23:06:33 -05:00
Trevor Buckner	53f1e53fcb	Merge pull request #3199 from naturalcrit/GlobalReflinks ... Yet another Brew Variables PR	2024-02-20 23:03:53 -05:00
Trevor Buckner	df447d3d4d	typo	2024-02-20 23:01:49 -05:00
Trevor Buckner	e3bf913a80	lint	2024-02-20 23:00:57 -05:00