David Bolack
77450ed334
Merge branch 'master' into Issue_241_Part_II
2024-05-20 20:03:23 -05:00
David Bolack
835ca0de32
WIP
2024-05-20 16:21:02 -05: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...9d55fd6fb7 )
---
updated-dependencies:
- dependency-name: vitreum
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-20 03:13:40 +00:00
David Bolack
bacdd65025
Add a CR.
2024-05-19 11:52:16 -05:00
David Bolack
07f2e8ba4f
Merge branch 'master' into Issue_241_Part_II
2024-05-19 11:20:09 -05:00
David Bolack
86887b536e
Update Jump keys to match parent PR and shift live scrolling to scroll-lock.
...
Needs non-PC testing.
2024-05-19 11:16:50 -05:00
David Bolack
b7dc47fe9e
Add a Live Scroll lock/unlock below Brew/Source Jump buttons.
...
The button displays the *next* state of the toggle. IE, if the current state is locked ( Live scrolling is active ) the icon is unlock with a corresponding mouse-over.
It may be desirable to invert this.
2024-05-18 22:17:29 -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
8ece54701d
Add live scrolling to keep the preview in sync with editor position.
...
This catchs CTRL-HOME, CTRL-END, and mouseclicks.
It tests for changes on arrow keys and enter.
Not sure if it's the best way to do this, but it works quickly on a large, crappy brew.
2024-05-18 01:44:42 -05: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
Trevor Buckner
f40d851d49
Merge branch 'master' into master
2024-05-17 16:53:58 -04: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
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
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
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