David Bolack
c9d416fec0
Small User Brew theme changes.
...
Move the Static Theme shortcut to getBrewThemeWithCSS to drop an unneeded URL load.
Change the comment in the CSS to refer to the shareURL for the theme
instead of its name if it is a user theme.
2024-05-06 19:39:27 -05:00
David Bolack
3dde6a098c
Test code to reduce duplicate theme loading
...
This shorts out loading of 5ePHB and/or blank from getBrewThemeParent
2024-05-06 12:12:46 -05:00
David Bolack
ef25139ffe
Merge branch 'master' into brew_themes_user_selection
2024-05-06 12:04:38 -05:00
David Bolack
9d6076f642
Merge branch 'master' of github.com:naturalcrit/homebrewery
2024-05-06 11:59:20 -05:00
Trevor Buckner
dd82a1bebd
Merge pull request #3457 from 5e-Cleric/icons-for-share-dropdown
...
icon for edit link in sharepage
2024-05-06 07:54:41 -04:00
Víctor Losada Hernández
d3f1fde9d9
icon for edit link
2024-05-06 07:43:45 +02:00
Trevor Buckner
d83e7bce0a
Merge pull request #3456 from 5e-Cleric/icons-for-share-dropdown
...
Adding icons to the share dropdown
2024-05-05 21:43:40 -04:00
Trevor Buckner
8cd4a58304
Merge branch 'master' into icons-for-share-dropdown
2024-05-05 21:43:12 -04:00
Trevor Buckner
0ef683222d
Merge pull request #3447 from 5e-Cleric/link-to-edit-if-author
...
Add edit link to share page if user is author
2024-05-05 21:42:25 -04:00
Trevor Buckner
ebbf162318
Merge branch 'master' into link-to-edit-if-author
2024-05-05 21:25:43 -04:00
Víctor Losada Hernández
268d202562
initial commit
2024-05-06 00:32:38 +02:00
G.Ambatte
4e0ec75e58
Revert template.js changes for separate PR
2024-05-06 09:46:34 +12:00
G.Ambatte
1af989c4a3
Case insensitive matching
2024-05-06 07:27:22 +12:00
G.Ambatte
53480fdd5f
Merge branch 'master' into experimentalHTMLSanitization
2024-05-05 20:50:46 +12:00
G.Ambatte
ffa90c397c
Add script sanitization to template.js
2024-05-05 20:18:53 +12:00
Trevor Buckner
df3d1078f1
Add FontAwesome Solid to emoji list
2024-05-05 01:50:38 -04:00
Trevor Buckner
22bdb85dff
Convert dicefont and elderberry icon names to snake_case
2024-05-04 00:40:51 -04:00
Trevor Buckner
2f5081156d
Merge pull request #3438 from naturalcrit/dependabot/npm_and_yarn/react-dom-18.3.1
...
Bump react-dom from 18.2.0 to 18.3.1
2024-05-03 21:56:23 -04:00
dependabot[bot]
c3f153a5fa
Bump react-dom from 18.2.0 to 18.3.1
...
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom ) from 18.2.0 to 18.3.1.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v18.3.1/packages/react-dom )
---
updated-dependencies:
- dependency-name: react-dom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-04 01:54:01 +00:00
Trevor Buckner
5e0dda1bde
Merge pull request #3437 from naturalcrit/dependabot/npm_and_yarn/react-18.3.1
...
Bump react from 18.2.0 to 18.3.1
2024-05-03 21:52:58 -04:00
Trevor Buckner
b0379b0821
Merge branch 'master' into EmojiSyntax
2024-05-03 21:47:55 -04:00
dependabot[bot]
c506c9cee5
Bump react from 18.2.0 to 18.3.1
...
Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react ) from 18.2.0 to 18.3.1.
- [Release notes](https://github.com/facebook/react/releases )
- [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/react/commits/v18.3.1/packages/react )
---
updated-dependencies:
- dependency-name: react
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-04 01:47:47 +00:00
Trevor Buckner
9184593bc0
Merge pull request #3442 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.24.5
...
Bump @babel/core from 7.24.4 to 7.24.5
2024-05-03 21:46:46 -04:00
dependabot[bot]
1da70d54e8
Bump @babel/core from 7.24.4 to 7.24.5
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.24.4 to 7.24.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.24.5/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-04 01:45:56 +00:00
Trevor Buckner
55cdd016da
Merge pull request #3455 from naturalcrit/addMarkedEmojiPackage
...
Just installs the marked-emoji package
2024-05-03 21:44:53 -04:00
Trevor Buckner
10997898b9
Just installs the marked-emoji package
2024-05-03 21:43:53 -04:00
Trevor Buckner
76b66977e9
Update with master
2024-05-03 21:41:41 -04:00
Trevor Buckner
d695648d9b
Tweaks to Editor highlighting. Maybe still ugly.
2024-05-03 21:40:09 -04:00
Trevor Buckner
72160f5daf
missed one commit
2024-05-03 21:40:09 -04:00
Trevor Buckner
0751da42b6
Add emoji highlighting to editor
2024-05-03 21:40:08 -04:00
Trevor Buckner
babe1f30a2
Prevent autosuggest inside curly span/div properties
2024-05-03 21:40:08 -04:00
Trevor Buckner
cd35e91ea2
add elderberryInn to emoji syntax
2024-05-03 21:40:08 -04:00
Trevor Buckner
8d8a965241
Rename font-icons to elderberryInn
2024-05-03 21:40:08 -04:00
Trevor Buckner
2309887c92
Change diceFont to camelCase to match existing naming convention
2024-05-03 21:40:08 -04:00
Trevor Buckner
d36e6e5834
Hack to avoid conflict with emojis
2024-05-03 21:40:07 -04:00
Trevor Buckner
dd205a14bc
typo
2024-05-03 21:40:07 -04:00
Trevor Buckner
d854fe1202
Clean up redundant code
2024-05-03 21:40:07 -04:00
Trevor Buckner
58f487ac58
Sort alphabetically and numerically
...
i.e.,
"d2, d6, d8, d10, d12, d20", not "d10, d12, d2, d20, d6, d8"
2024-05-03 21:40:07 -04:00
Trevor Buckner
1761c506be
Exclude : from the autocomplete trigger
2024-05-03 21:40:07 -04:00
Trevor Buckner
9f19514b03
CodeMirror Dropdown working
2024-05-03 21:40:07 -04:00
Trevor Buckner
ade1056a02
Include Dicefont
2024-05-03 21:40:07 -04:00
Trevor Buckner
e5fecaf9b6
Include marked-emoji package
2024-05-03 21:40:06 -04:00
Trevor Buckner
5b8b0aa641
Merge pull request #3443 from naturalcrit/dependabot/npm_and_yarn/superagent-9.0.2
...
Bump superagent from 9.0.1 to 9.0.2
2024-05-03 21:35:29 -04:00
Trevor Buckner
b7bc5cbad7
Merge branch 'master' into dependabot/npm_and_yarn/superagent-9.0.2
2024-05-03 21:33:37 -04:00
Trevor Buckner
f2fc47a719
Merge pull request #3454 from naturalcrit/cleanUpMustacheTests
...
Just linting and spacing for mustache-syntax.tests.js
2024-05-03 21:32:57 -04:00
Trevor Buckner
a5f9ab7897
Merge branch 'master' into cleanUpMustacheTests
2024-05-03 21:32:40 -04:00
Trevor Buckner
39368c1a38
Merge branch 'master' into fix-icon-fonts
2024-05-03 21:31:31 -04:00
Trevor Buckner
d879cf3cbb
Merge pull request #3451 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.5.0
...
Bump eslint-plugin-jest from 28.2.0 to 28.5.0
2024-05-03 21:31:15 -04:00
Trevor Buckner
ae59c56ddd
Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-jest-28.5.0
2024-05-03 21:30:40 -04:00
Trevor Buckner
35431384bd
Merge pull request #3453 from naturalcrit/dependabot/npm_and_yarn/googleapis/drive-8.8.0
...
Bump @googleapis/drive from 8.7.0 to 8.8.0
2024-05-03 21:30:26 -04:00