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
G.Ambatte
b4ee62a1bd
Merge branch 'master' into experimentalHTMLSanitization
2024-05-11 08:58:21 +12: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
Víctor Losada Hernández
8365841b89
Merge branch 'master' of https://github.com/naturalcrit/homebrewery into fix-icon-fonts
2024-05-09 07:59:31 +02:00
Víctor Losada Hernández
e6bf8b59a1
fix further errors
2024-05-09 07:49:17 +02:00
Trevor Buckner
b4a4934c5c
Merge pull request #3405 from naturalcrit/EmojiSyntax
...
Emoji syntax
2024-05-08 15:55:01 -04:00
Trevor Buckner
a6b2dab9cc
Linting
2024-05-08 14:53:24 -04:00
Trevor Buckner
d692e88b96
Merge branch 'EmojiSyntax' of https://github.com/naturalcrit/homebrewery into EmojiSyntax
2024-05-08 14:24:19 -04:00
Trevor Buckner
62c9e081e6
typos
2024-05-08 14:24:15 -04:00
Trevor Buckner
5a52e76ff0
Merge branch 'master' into EmojiSyntax
2024-05-08 11:01:15 -04:00
Trevor Buckner
3b1f4a0d13
Add Tests for emoji markdown
2024-05-08 09:51:29 -04:00
G.Ambatte
cdad9af453
Merge branch 'master' into experimentalHTMLSanitization
2024-05-08 23:30:49 +12:00
Trevor Buckner
5fd92ee72d
Remove redundant font inclusion
2024-05-07 15:55:34 -04:00
Trevor Buckner
5bcd3a1b01
Clear up steps
2024-05-07 15:54:08 -04:00
Trevor Buckner
d49d9fd755
typo
2024-05-07 15:35:00 -04:00
Trevor Buckner
41d817823b
Don't autosuggest emojis inside injectors
2024-05-07 15:30:56 -04:00
Trevor Buckner
cfffb4961b
Rename files, add some instructions to markdown.js
2024-05-07 15:28:05 -04:00
Trevor Buckner
6bd2f4d98d
Add rest of Font-Awesome icons
2024-05-07 15:07:30 -04: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