100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	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
Trevor Buckner	7bb1f16946	Always render currently-edited page first, so variables update across pages properly	2024-02-20 22:56:37 -05:00
Trevor Buckner	6870fd6d76	Add tests for cross-page behavior and fix related bugs	2024-02-20 22:31:33 -05:00
Trevor Buckner	9ad1d1f196	remove unused 'parseVarse' variable	2024-02-20 17:05:26 -05:00
Trevor Buckner	969cff61bf	Add one more test that was failing	2024-02-20 17:03:17 -05:00
Trevor Buckner	736f729457	Rename variables	2024-02-20 16:46:49 -05:00
Trevor Buckner	0050e1e294	Added another test for a broken case and fixed; Cleaned up more	2024-02-20 15:37:54 -05:00
Trevor Buckner	f2d1b61a7a	Remove unused variables	2024-02-20 00:04:29 -05:00
Trevor Buckner	1d1fa99b4b	Pass all tests	2024-02-19 23:57:19 -05:00
Trevor Buckner	bc21abd509	Fix matches inside of code blocks	2024-02-14 11:38:47 -05:00
Trevor Buckner	72744718cc	Adding some tests	2024-02-13 22:44:57 -05:00
Trevor Buckner	e85a62a05c	Disable default def behavior.	2024-02-13 09:35:55 -05:00
Trevor Buckner	3bda834ad3	remove console.log	2024-02-13 00:53:34 -05:00
Trevor Buckner	29f0a8e635	Fix code blocks and nested parens.	2024-02-13 00:23:58 -05:00
Trevor Buckner	c035404555	Add exponents via '^'	2024-02-12 11:58:56 -05:00
Trevor Buckner	74ddc71962	Add 'floor()' and 'ceil()' math functions.	2024-02-12 11:57:37 -05:00
Trevor Buckner	1491a1b4ff	Fix Math assignments	2024-02-12 11:54:28 -05:00
Trevor Buckner	ab54188ba4	Fix small typo	2024-02-09 02:15:53 -05:00
Trevor Buckner	e0b6b95295	Merge pull request #3290 from naturalcrit/PreprocessVars ... Simplify and clean Vars - Done in preprocessing step now	2024-02-09 02:04:02 -05:00
Trevor Buckner	c7cfade86f	Support () and round in math	2024-02-09 01:59:59 -05:00
Trevor Buckner	e4fa59aae8	Merge branch 'master' into PreprocessVars	2024-02-08 23:13:19 -05:00
Trevor Buckner	35227268cf	Move to preprocessor step	2024-02-08 23:12:06 -05:00
Trevor Buckner	c27f5d9efa	Merge pull request #3287 from naturalcrit/dependabot/npm_and_yarn/stylelint-config-recess-order-4.6.0 ... Bump stylelint-config-recess-order from 4.5.0 to 4.6.0	2024-02-08 10:53:40 -05:00
Trevor Buckner	ed2d539995	Merge pull request #3282 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-8.7.0 ... Bump @googleapis/drive from 8.6.0 to 8.7.0	2024-02-07 07:45:44 -05:00
Trevor Buckner	dd82f54549	Merge pull request #3283 from naturalcrit/dependabot/npm_and_yarn/marked-gfm-heading-id-3.1.3 ... Bump marked-gfm-heading-id from 3.1.2 to 3.1.3	2024-02-06 23:11:44 -05:00
Trevor Buckner	c176c38f30	Merge pull request #3280 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.22.0 ... Bump react-router-dom from 6.21.3 to 6.22.0	2024-02-06 22:58:10 -05:00
Trevor Buckner	09f2f96dff	Merge pull request #3285 from naturalcrit/dependabot/npm_and_yarn/stylelint-config-recess-order-4.5.0 ... Bump stylelint-config-recess-order from 4.4.0 to 4.5.0	2024-02-06 22:50:26 -05:00
Trevor Buckner	7177548c0e	Merge pull request #3276 from naturalcrit/dependabot/npm_and_yarn/marked-11.2.0 ... Bump marked from 11.1.1 to 11.2.0	2024-01-30 14:29:00 -05:00
Trevor Buckner	46140e92fd	Merge branch 'master' into pr/3129	2024-01-29 20:56:48 -05:00
Trevor Buckner	37c72d5125	Merge pull request #3267 from dbolacksn/clone_tags ... Clone a brew's tags when cloning a brew.	2024-01-26 15:00:50 -05:00
Trevor Buckner	602a476b59	Merge branch 'master' into pr/3267	2024-01-26 14:58:42 -05:00
Trevor Buckner	965397733d	Merge pull request #3268 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.23.9 ... Bump @babel/core from 7.23.7 to 7.23.9	2024-01-26 14:57:12 -05:00
Trevor Buckner	f10868db0b	Merge branch 'master' into dependabot/npm_and_yarn/babel/core-7.23.9	2024-01-26 14:30:38 -05:00
Trevor Buckner	d7a95d3cff	Merge pull request #3269 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.23.9 ... Bump @babel/preset-env from 7.23.8 to 7.23.9	2024-01-26 14:30:22 -05:00
Trevor Buckner	57a31f3b71	Merge pull request #3270 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.23.9 ... Bump @babel/plugin-transform-runtime from 7.23.7 to 7.23.9	2024-01-26 11:46:10 -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