f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-08-14 14:02:56 +00:00
Code Wiki Activity
5,148 Commits 124 Branches 40 Tags
e62e18521431d87d7bbf7c66327485173f3d06bb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner e62e185214 Lint a bunch of things 2024-05-21 17:32:17 -04:00
Trevor Buckner 0c38415372 Merge pull request #3482 from 5e-Cleric/clean-up-unused-constants-and-requires 
Clean up unused declarations
 2024-05-21 17:29:28 -04:00
Trevor Buckner 73f879aa63 Merge branch 'master' into clean-up-unused-constants-and-requires 2024-05-21 17:28:51 -04:00
Trevor Buckner f12de7d953 Undo Journal path change 2024-05-21 17:28:17 -04:00
Trevor Buckner 933ac41774 Merge pull request #3420 from Gazook89/RPG-Awesome-Redux 
RPG Awesome Redux
 2024-05-21 16:30:00 -04:00
Trevor Buckner 54b4d490f1 Adjust hyphenation 2024-05-21 16:21:24 -04:00
Trevor Buckner 193af61725 Merge branch 'master' into pr/3420 2024-05-21 14:50:02 -04: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
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
Trevor Buckner b8b1b9660f Merge pull request #3404 from MurdoMaclachlan/master 
Add proficiency bonus to monster statblocks
 2024-05-18 17:28:38 -04: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
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
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
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
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
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
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
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
Trevor Buckner aaaa8ed693 Merge pull request #3446 from naturalcrit/makeCurlyInjectorsAppendNotOverwrite 
Make Curly Injectors append properties, not overwrite
 2024-05-03 21:23:01 -04:00
Trevor Buckner 2418e42655 Align input texts for mustache tests 2024-05-03 17:10:12 -04:00
Trevor Buckner dce86580ce Added additional tests for injection 2024-05-03 17:02:12 -04:00
Trevor Buckner f6997871be Try to make tests work on both circleCI and windows 2024-05-03 15:01:21 -04:00
Trevor Buckner 660a586a7c Clarify comments 2024-05-03 15:01:04 -04:00
Trevor Buckner 193cde0925 Passes all tests 2024-05-03 14:31:34 -04:00
Trevor Buckner 1a33e6e631 Passing almost all tests 2024-05-03 12:48:19 -04:00
Trevor Buckner bb8ade435d Now passing many previously failing tests 2024-05-03 12:40:03 -04:00
Trevor Buckner 94905f8151 Back to passing all tests (not the "failing" tests yet) 2024-05-03 12:12:55 -04:00
Trevor Buckner 716e3d7143 Merge pull request #3428 from 5e-Cleric/paint-order-fix 
drop shadow filter to text stroke
 2024-05-01 17:21:15 -04:00
Trevor Buckner 9fb0f37718 Pass CSS props from curly spans/divs as an object for finer control 2024-04-30 23:52:19 -04:00
Trevor Buckner d2965e1122 Merge pull request #3444 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.3.3 
Bump mongoose from 8.3.2 to 8.3.3
 2024-04-30 14:09:57 -04:00
Trevor Buckner e7a03dc7d6 Merge pull request #3445 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.24.5 
Bump @babel/preset-env from 7.24.4 to 7.24.5
 2024-04-30 14:07:57 -04:00
Trevor Buckner a469b88fd2 Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-env-7.24.5 2024-04-30 14:05:44 -04:00
Trevor Buckner 45244c8e5d Merge pull request #3407 from Gazook89/errorPage.jsx-cleanup 
Convert errorPage.jsx to functional component.
 2024-04-30 13:43:20 -04:00
Trevor Buckner fad5817353 Merge branch 'master' into errorPage.jsx-cleanup 2024-04-30 13:41:10 -04:00
Trevor Buckner c0a8b79acc Small tweak 2024-04-30 13:40:39 -04:00
Trevor Buckner 06c3168868 Merge pull request #3429 from naturalcrit/dependabot/npm_and_yarn/multi-812b0dc3fc 
Bump formidable, superagent and supertest
 2024-04-25 10:45:55 -04:00
Trevor Buckner a296678d20 Merge pull request #3409 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.3.2 
Bump mongoose from 8.3.1 to 8.3.2
 2024-04-25 10:27:36 -04:00
Trevor Buckner f768990fb1 Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.3.2 2024-04-25 09:39:13 -04:00
Trevor Buckner 313543d0d1 Merge pull request #3424 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.23.0 
Bump react-router-dom from 6.22.3 to 6.23.0
 2024-04-25 09:39:03 -04:00
Trevor Buckner 1891d7c90a Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.3.2 2024-04-19 12:10:55 -04:00
Trevor Buckner 98d032913b Update pr-check.yml 2024-04-19 12:00:11 -04:00
Trevor Buckner 80bcf92fa3 Update pr-check.yml 2024-04-19 11:57:44 -04:00
Trevor Buckner 41d536b7ff Merge pull request #3418 from naturalcrit/calculuschild-patch-2 
Rename limit-pull-requests.yml to action.yml
 2024-04-19 11:50:14 -04:00
Trevor Buckner 1e5e3d5f41 Rename limit-pull-requests.yml to action.yml 2024-04-19 11:50:01 -04:00
Trevor Buckner 19961c7ec5 Update pr-check.yml 2024-04-19 11:48:30 -04:00
Trevor Buckner 08e273bfd6 Update pr-check.yml 2024-04-19 11:37:23 -04:00
Trevor Buckner 9f45456066 Delete .github/workflows/limit-pull-requests.yml 2024-04-19 11:34:26 -04:00
Trevor Buckner 6e69696b4a Update pr-check.yml 2024-04-19 11:34:06 -04:00
Trevor Buckner 8b6be1cab8 Create limit-pull-requests.yml 2024-04-19 11:33:55 -04:00
Trevor Buckner 93a490e881 Merge pull request #3413 from naturalcrit/calculuschild-patch-1 
Update pr-check.yml
 2024-04-19 11:24:28 -04:00
Trevor Buckner f23959bb05 Update pr-check.yml 2024-04-19 11:24:18 -04:00
Trevor Buckner 228041913e Create limit-pull-requests.yml 2024-04-19 11:15:27 -04:00
Trevor Buckner fc53989946 Create pr-check.yml 
For users with many open PRs, creates a warning message in the PR description when opening a new PR, encouraging users to complete existing PRs before opening new ones.
 2024-04-19 10:47:00 -04:00