cdad9af453
Merge branch 'master' into experimentalHTMLSanitization
2024-05-08 23:30:49 +12:00
07ca134d98
Merge pull request #1 from Gazook89/dropdownTextures-User-Themes
...
Add dropdownTexture for user theme options
2024-05-07 16:39:13 -05:00
dde8e28d07
Merge branch 'brew_themes_user_selection' into dropdownTextures-User-Themes
2024-05-07 16:38:56 -05:00
5fd92ee72d
Remove redundant font inclusion
2024-05-07 15:55:34 -04:00
5bcd3a1b01
Clear up steps
2024-05-07 15:54:08 -04:00
d49d9fd755
typo
2024-05-07 15:35:00 -04:00
41d817823b
Don't autosuggest emojis inside injectors
2024-05-07 15:30:56 -04:00
cfffb4961b
Rename files, add some instructions to markdown.js
2024-05-07 15:28:05 -04:00
6bd2f4d98d
Add rest of Font-Awesome icons
2024-05-07 15:07:30 -04:00
872ee339da
Clean up console logs
...
Eliminate erroronous theme pulldown texture load.
2024-05-07 12:13:57 -05:00
295fea7581
Add dropdownTexture for user theme options
...
If a user theme document has a thumbnail, this will include that thumbnail as a dropdown texture in the options.
2024-05-07 11:00:20 -05:00
f9f2e604c0
linting and remove async conflict
2024-05-07 10:14:46 +02:00
f936b8b12b
Update User brew endpoint tests
2024-05-06 20:28:46 -05:00
9f04c34b06
Missed $
2024-05-06 20:07:33 -05:00
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
40ac8b1909
Merge branch 'master' of https://github.com/naturalcrit/homebrewery into experimental-development
2024-05-07 00:12:26 +02:00
f1a2037bca
page is sometimes a string??
2024-05-06 23:40:31 +02:00
ded78c6639
better error handling in jsx
2024-05-06 23:32:18 +02:00
51fcb59f09
debugging 500 errir catching
2024-05-06 23:26:02 +02:00
e75c556443
use $text instead
2024-05-06 22:59:09 +02:00
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
ef25139ffe
Merge branch 'master' into brew_themes_user_selection
2024-05-06 12:04:38 -05:00
9d6076f642
Merge branch 'master' of github.com:naturalcrit/homebrewery
2024-05-06 11:59:20 -05:00
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
752b2caaf4
Merge branch 'master' of https://github.com/naturalcrit/homebrewery into experimental-development
2024-05-06 13:45:06 +02:00
d3f1fde9d9
icon for edit link
2024-05-06 07:43:45 +02:00
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
8cd4a58304
Merge branch 'master' into icons-for-share-dropdown
2024-05-05 21:43:12 -04:00
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
ebbf162318
Merge branch 'master' into link-to-edit-if-author
2024-05-05 21:25:43 -04:00
268d202562
initial commit
2024-05-06 00:32:38 +02:00
4e0ec75e58
Revert template.js changes for separate PR
2024-05-06 09:46:34 +12:00
1af989c4a3
Case insensitive matching
2024-05-06 07:27:22 +12:00
53480fdd5f
Merge branch 'master' into experimentalHTMLSanitization
2024-05-05 20:50:46 +12:00
ffa90c397c
Add script sanitization to template.js
2024-05-05 20:18:53 +12:00
df3d1078f1
Add FontAwesome Solid to emoji list
2024-05-05 01:50:38 -04:00
22bdb85dff
Convert dicefont and elderberry icon names to snake_case
2024-05-04 00:40:51 -04:00
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
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
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
b0379b0821
Merge branch 'master' into EmojiSyntax
2024-05-03 21:47:55 -04:00
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
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
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
55cdd016da
Merge pull request #3455 from naturalcrit/addMarkedEmojiPackage
...
Just installs the marked-emoji package
2024-05-03 21:44:53 -04:00
10997898b9
Just installs the marked-emoji package
2024-05-03 21:43:53 -04:00
76b66977e9
Update with master
2024-05-03 21:41:41 -04:00
d695648d9b
Tweaks to Editor highlighting. Maybe still ugly.
2024-05-03 21:40:09 -04:00
72160f5daf
missed one commit
2024-05-03 21:40:09 -04:00
0751da42b6
Add emoji highlighting to editor
2024-05-03 21:40:08 -04:00
G.Ambatte