David Bolack
54d2709d6a
Merge
2024-05-20 17:58:22 -05:00
David Bolack
916bd5f4d6
Merge branch 'master' into brew_themes_user_selection
2024-05-20 17:56:21 -05:00
David Bolack
511c9ffada
Merge branch 'master' into issue_2994_css_style
2024-05-20 14:51:19 -05:00
David Bolack
ea03538552
Merge branch 'master' of github.com:naturalcrit/homebrewery
2024-05-20 13:33:20 -05:00
dependabot[bot]
8fb9f3f823
Bump dompurify from 3.1.1 to 3.1.4
...
Bumps [dompurify](https://github.com/cure53/DOMPurify ) from 3.1.1 to 3.1.4.
- [Release notes](https://github.com/cure53/DOMPurify/releases )
- [Commits](https://github.com/cure53/DOMPurify/compare/3.1.1...3.1.4 )
---
updated-dependencies:
- dependency-name: dompurify
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-20 17:39:53 +00:00
dependabot[bot]
7af919afd3
Bump react-router-dom from 6.23.0 to 6.23.1
...
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom ) from 6.23.0 to 6.23.1.
- [Release notes](https://github.com/remix-run/react-router/releases )
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md )
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.23.1/packages/react-router-dom )
---
updated-dependencies:
- dependency-name: react-router-dom
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-20 17:39:49 +00:00
Trevor Buckner
5bbe4016d6
Merge pull request #3488 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.4.0
...
Bump mongoose from 8.3.3 to 8.4.0
2024-05-20 13:39:00 -04:00
dependabot[bot]
0f3312a5d7
Bump mongoose from 8.3.3 to 8.4.0
...
Bumps [mongoose](https://github.com/Automattic/mongoose ) from 8.3.3 to 8.4.0.
- [Release notes](https://github.com/Automattic/mongoose/releases )
- [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Automattic/mongoose/compare/8.3.3...8.4.0 )
---
updated-dependencies:
- dependency-name: mongoose
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-20 17:38:10 +00:00
Trevor Buckner
0bf432dd76
Merge pull request #3486 from naturalcrit/dependabot/npm_and_yarn/vitreum-9d55fd6
...
Bump vitreum from `49994da` to `9d55fd6`
2024-05-20 13:37:27 -04:00
dependabot[bot]
27b3da0144
Bump vitreum from 49994da to 9d55fd6
...
Bumps [vitreum](https://github.com/calculuschild/vitreum ) from `49994da` to `9d55fd6`.
- [Commits](49994da405...9d55fd6fb7support@github.com >
2024-05-20 03:13:40 +00:00
David Bolack
40c8b04a98
Merge branch 'master' into Issue_241
2024-05-19 11:48:10 -05:00
David Bolack
c0cc27a750
Change Jump hotkeys to M ( move ) bindings.
2024-05-19 11:12:19 -05:00
Trevor Buckner
b8b1b9660f
Merge pull request #3404 from MurdoMaclachlan/master
...
Add proficiency bonus to monster statblocks
2024-05-18 17:28:38 -04:00
David Bolack
9b0db15083
Add Jump To hotkeys
...
This binds CTRL/META-J to brewJump and SHIFT-CTRL/META-J to sourceJump.
2024-05-17 22:10:28 -05:00
David Bolack
c6f62142e1
Change the ID used for User Brews to the shareId for future-proofing.
2024-05-17 20:53:06 -05:00
Trevor Buckner
f40d851d49
Merge branch 'master' into master
2024-05-17 16:53:58 -04:00
Víctor Losada Hernández
b64c835706
Aparently it wasn't redundant as VSCode said
...
This reverts commit aef6605225
2024-05-17 22:38:54 +02:00
Víctor Losada Hernández
b7717171b3
Server and shared folders
2024-05-17 22:34:40 +02:00
Víctor Losada Hernández
92e27cda6c
"Removed unused imports of 'classnames' and 'create-react-class' from various JSX files. in the Client folder"
2024-05-17 22:31:55 +02:00
Víctor Losada Hernández
aef6605225
Remove redundant snippetBar import from editor.jsx
2024-05-17 22:28:01 +02:00
Gazook89
7c9cc25923
update editor ref's in edit, home, and new pages.
2024-05-16 23:29:30 -05:00
Gazook89
78ce8aa6e3
remove unused ref attributes
...
from editPage, homePage, newPage, and printPage, as well as splitPane. The refs were declared, but never used.
2024-05-16 23:25:22 -05:00
Gazook89
8ae22bdc27
fix refs in codeEditor.jsx
2024-05-16 23:15:54 -05:00
Gazook89
46c14ef23b
fix refs in editor.jsx
...
now has refs `editorWrapper` and `editor`-- the former includes the snippet bar and codemirror editor, and the latter includes only the codemirror editor.
2024-05-16 23:12:10 -05:00
Trevor Buckner
d3080c03a4
Merge pull request #3432 from 5e-Cleric/fix-icon-fonts
...
Fix icon fonts
2024-05-16 17:22:39 -04:00
Trevor Buckner
12eead3379
Small typos
2024-05-16 17:19:13 -04:00
Trevor Buckner
a2e065c5d8
Adjustments to match Emojis PR
2024-05-16 17:04:02 -04:00
Trevor Buckner
0d1a3d55cf
Merge branch 'master' into fix-icon-fonts
2024-05-16 16:53:54 -04:00
Gazook89
b748a597d2
some fixes post merge.
2024-05-15 21:25:45 -05:00
Gazook89
5fb0e123e3
install new dependencies from merging master
2024-05-15 20:50:52 -05:00
Gazook89
9a4a14fa97
add license, rename files for clarity, update references
2024-05-15 20:48:58 -05:00
Gazook89
0c76a546e4
Merge branch 'master' into RPG-Awesome-Redux
2024-05-15 20:19:00 -05:00
Trevor Buckner
fb299f898e
Merge pull request #3434 from G-Ambatte/experimentalHTMLSanitization
...
Add DOM Purify to BrewRenderer
2024-05-15 17:07:42 -04:00
David Bolack
69f01b282a
CSS Tweaks for Theme Selector
...
Add 5e-Cleric's suggestsions to acvoid the title overflowing over the preview.
2024-05-13 22:33:58 -05:00
David Bolack
66e39d9c65
Update Theme Selector display
...
For User/Brew Themes, display the first author instead of Brew/V3 in the first column.
2024-05-13 22:24:41 -05:00
David Bolack
8c5f4e0605
Brew Theme Fixes.
...
This adds the User Brew themes, where applicible, to the /new path.
This adds a semi-graceful failure to the metadata panel when a Brew Theme is declared as used but is not present.
More gracefully handles loading with themes not present.
2024-05-13 11:14:35 -05:00
David Bolack
ed210da4af
Merge branch 'master' into brew_themes_user_selection
2024-05-12 12:08:16 -05:00
David Bolack
afb5ccec81
Slight Rearrange of ToC theme names and menu
...
Reorders ToC inclusion options with slight relabel for clarity.
Changes assumptions on H4, H5, and H6 snippets to assume H1-H3 class should be explicitly stated.
change naming of addToToCH# to tocH#
more explicitly define .addToC to h1 to h3 changes for --TOC var.
2024-05-12 12:00:55 -05:00
David Bolack
c0beae6e46
Remove redundant class declaration for ToC
2024-05-12 11:49:30 -05:00
David Bolack
9c6ece3e7f
Merge branch 'master' into issue_2994_css_style
2024-05-12 11:37:51 -05:00
David Bolack
5494c02f00
Merge branch 'master' of github.com:naturalcrit/homebrewery
2024-05-12 10:23:14 -05:00
G.Ambatte
b4ee62a1bd
Merge branch 'master' into experimentalHTMLSanitization
2024-05-11 08:58:21 +12:00
David Bolack
b6c2f96b82
Change tag filtering for theme detection to require meta prefix
2024-05-10 01:40:01 -04:00
G.Ambatte
632efe8b9f
Add Share ID to lock notification
2024-05-10 08:17:09 +12:00
G.Ambatte
bf38f95d25
Pass ID to Lock Notification
2024-05-10 08:05:29 +12:00
G.Ambatte
f6daeb4acd
Update error message
2024-05-10 08:05:09 +12:00
G.Ambatte
10a7f34abb
Update lock message
2024-05-10 07:45:04 +12:00
G.Ambatte
3a054f1ae0
Merge branch 'master' into addLockNotification-#3326
2024-05-10 07:15:40 +12:00
Víctor Losada Hernández
25b4b3d906
Merge branch 'master' into master
2024-05-09 08:50:51 +02:00
Víctor Losada Hernández
f21d636846
changes as requested
2024-05-09 08:00:02 +02:00
