Commit Graph
100 Commits
Author SHA1 Message Date
Trevor Buckner 220316ec7e Merge branch 'master' into pr/1819 2021-12-09 22:30:23 -05:00
Trevor Buckner bbf6f7fb06 Merge pull request #1759 from G-Ambatte/fixCodeWrapping-#1736
Fix text wrapping in code blocks
2021-12-09 22:20:27 -05:00
Trevor Buckner 82fc581125 Change to overflow-wrap : break-word 2021-12-09 22:19:53 -05:00
Trevor Buckner 6be4fcefdb Merge branch 'master' into pr/1759 2021-12-09 22:16:56 -05:00
Trevor Buckner f6eab47ab8 Merge pull request #1758 from naturalcrit/dependabot/npm_and_yarn/express-async-handler-1.2.0
Bump express-async-handler from 1.1.4 to 1.2.0
2021-12-09 22:14:42 -05:00
Trevor Buckner a8f5f71b32 Send 500 error if Google doesn't send an error
Fixes crash where error did not contain the expected `response` field from Google.
2021-12-09 13:57:43 -05:00
Trevor Buckner dd93c4cdd4 Merge pull request #1841 from jeddai/metadata-document-block
Adding metadata block to brew text for Google brews
2021-12-07 23:19:29 -05:00
Trevor Buckner 902f91e25f Merge pull request #1880 from naturalcrit/v3.0.5
Up to Version 3.0.5
2021-12-07 23:02:01 -05:00
Trevor Buckner 12cb457c60 Up to Version 3.0.5 2021-12-07 23:01:42 -05:00
Trevor Buckner cb3cfd44ee Merge pull request #1849 from Gazook89/better-google-errors
Change conditions for Google error
2021-12-06 22:42:11 -05:00
Trevor Buckner 0a335cefbf Update newPage.jsx 2021-12-06 22:41:11 -05:00
Trevor Buckner fe9998c6e4 Update editPage.jsx 2021-12-06 22:40:42 -05:00
Trevor Buckner 634a98c2cb Update newPage.jsx 2021-12-06 22:39:48 -05:00
Trevor Buckner d8b7e299fd Update newPage.jsx 2021-12-06 22:39:12 -05:00
Trevor Buckner 53ad7ecd57 Update editPage.jsx 2021-12-06 22:37:55 -05:00
Trevor Buckner 69a3e283f8 Merge pull request #1874 from naturalcrit/BatchCodeMirrorHighlighting
Tell CodeMirror to batch custom highlights before updating the browser
2021-12-06 22:32:28 -05:00
Trevor Buckner 58bb33cdcc Merge pull request #1876 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.0.15
Bump mongoose from 6.0.14 to 6.0.15
2021-12-06 22:31:57 -05:00
Trevor Buckner 1bbacc974b lint 2021-12-06 22:31:25 -05:00
Trevor Buckner b6e29c8a61 Change to callback style 2021-12-06 22:30:58 -05:00
Trevor Buckner f56d576a1e Merge pull request #1875 from naturalcrit/dependabot/npm_and_yarn/eslint-8.4.1
Bump eslint from 8.4.0 to 8.4.1
2021-12-06 22:15:35 -05:00
Trevor Buckner 09f64e018e Tell CodeMirror to batch custom highlights before updating the browser 2021-12-06 16:23:18 -05:00
Trevor Buckner 3762c278c4 Merge pull request #1809 from Gazook89/page-numbers-via-JS
Page numbers via js
2021-12-06 15:51:58 -05:00
Trevor Buckner 8acd42fcbe Small cleanup. Reduce redundant code. 2021-12-06 15:36:41 -05:00
Trevor Buckner 23deef7a9a Merge branch 'master' into pr/1809 2021-12-06 14:57:55 -05:00
Trevor Buckner 782e8dc495 Merge pull request #1873 from naturalcrit/dependabot/npm_and_yarn/eslint-8.4.0
Bump eslint from 8.3.0 to 8.4.0
2021-12-06 11:47:12 -05:00
Trevor Buckner 65bac929ca Merge pull request #1719 from Gazook89/Hotkey-for-Lists
Hotkey for Lists
2021-12-03 15:24:02 -05:00
Trevor Buckner d4b26cc4c4 Merge branch 'master' into pr/1719 2021-12-03 15:16:19 -05:00
Trevor Buckner a88443563e Merge pull request #1707 from RKuerten/header-functions
Added heading shortcuts (H1 to H6)
2021-12-02 23:45:55 -05:00
Trevor Buckner 1865e56b04 lint 2021-12-02 23:44:48 -05:00
Trevor Buckner 4fefc1e4d2 Merge branch 'master' into pr/1707 2021-12-02 23:29:47 -05:00
Trevor Buckner 8092192210 Merge pull request #1645 from Gazook89/Hotkey-Mania
Add Hotkeys for Underline and makeDiv
2021-12-02 15:52:54 -05:00
Trevor Buckner a30e150ade Disable max lines to satisfy lint
Eventually we should move the hotkey scripts into a separate file. They are becoming a beast of their own.
2021-12-02 15:47:18 -05:00
Trevor Buckner 9da1bfc606 Finish Merge with Master 2021-12-02 12:18:22 -05:00
Trevor Buckner 28f29ac49e Merge branch 'master' into pr/1645 2021-12-02 12:17:41 -05:00
Trevor Buckner 97f079311d Merge pull request #1568 from Gazook89/Hotkey-for-Links
Hotkey for hyperlinks (`Ctrl`/`Cmd` + `K`)
2021-12-02 11:50:17 -05:00
Trevor Buckner 2586a871e1 Use capture groups, add default "alt text" if none selected
Also allow whitespace at end and start of selection, so you don't have to be perfect.
2021-12-02 11:45:10 -05:00
Trevor Buckner 76553d1e65 Merge branch 'master' into pr/1568 2021-12-01 16:56:10 -05:00
Trevor Buckner ce5058538d Merge pull request #1865 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.0.14
Bump mongoose from 6.0.13 to 6.0.14
2021-11-29 23:17:04 -05:00
Trevor Buckner b5b6eba5da Merge pull request #1864 from naturalcrit/dependabot/npm_and_yarn/googleapis-92.0.0
Bump googleapis from 91.0.0 to 92.0.0
2021-11-29 23:16:53 -05:00
Trevor Buckner 1bc68a9e85 Merge pull request #1847 from Gazook89/note-interparagraph-spacing
remove p + p padding in .note & .descriptive
2021-11-23 23:31:02 -05:00
Trevor Buckner be88a0fde8 Merge pull request #1831 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.16.4
Bump @babel/preset-env from 7.16.0 to 7.16.4
2021-11-22 00:30:15 -05:00
Trevor Buckner a1f9459ee9 Merge pull request #1854 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.27.1
Bump eslint-plugin-react from 7.27.0 to 7.27.1
2021-11-21 23:41:02 -05:00
Trevor Buckner 77089719c0 Merge pull request #1852 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.64.0
Bump codemirror from 5.63.3 to 5.64.0
2021-11-21 23:30:19 -05:00
Trevor Buckner 04d285164a Merge pull request #1853 from naturalcrit/dependabot/npm_and_yarn/eslint-8.3.0
Bump eslint from 8.2.0 to 8.3.0
2021-11-21 23:24:17 -05:00
Trevor Buckner 0d685acfca Merge pull request #1835 from naturalcrit/v3.0.4
Up version to v3.0.4
2021-11-17 01:13:40 -05:00
Trevor Buckner 6471ee0577 Merge pull request #1830 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.16.4
Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4
2021-11-17 01:13:02 -05:00
Trevor Buckner a890e25e3f Merge pull request #1832 from naturalcrit/dependabot/npm_and_yarn/cookie-parser-1.4.6
Bump cookie-parser from 1.4.5 to 1.4.6
2021-11-17 01:12:37 -05:00
Trevor Buckner acfd0a2a6b Merge pull request #1833 from jeddai/chrome-96-fix-v3
Chrome 96 Style Tweaks for v3 PHB Theme
2021-11-17 01:10:22 -05:00
Trevor Buckner c945984d88 Slight nudges. Comments that header line-height is just to fix bad font baseline 2021-11-17 01:09:52 -05:00
Trevor Buckner de8f15d726 Up version to v3.0.4 2021-11-17 00:43:31 -05:00
Trevor Buckner aa009f8854 Merge pull request #1829 from jeddai/chrome-96-fix
Chrome 96 Style Tweaks for Legacy PHB Theme
2021-11-17 00:18:45 -05:00
Trevor Buckner ebe76cbb0e Nudge values to line up with live site on Chrome 95 2021-11-17 00:14:15 -05:00
Trevor Buckner c8fab7f1d2 Merge pull request #1827 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.0.13
Bump mongoose from 6.0.12 to 6.0.13
2021-11-15 22:51:25 -05:00
Trevor Buckner 920c8846c8 Merge pull request #1821 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.27.0
Bump eslint-plugin-react from 7.26.1 to 7.27.0
2021-11-15 22:49:25 -05:00
Trevor Buckner 258dca8569 Merge pull request #1792 from jeddai/code-folding
Add code folding feature for all content within a single page
2021-11-14 21:35:46 -05:00
Trevor Buckner b67dc1621b More simplification to fold-code script 2021-11-13 20:57:33 -05:00
Trevor Buckner fb52618ce9 Merge pull request #1794 from G-Ambatte/fixViewCountOrdering-#1793
Fix UserPage ordering of Google Brews
2021-11-09 10:49:41 -05:00
Trevor Buckner f8a2ffa4fa Merge pull request #1811 from naturalcrit/dependabot/npm_and_yarn/eslint-8.2.0
Bump eslint from 8.1.0 to 8.2.0
2021-11-08 22:02:14 -05:00
Trevor Buckner ff521f64a6 Merge pull request #1812 from naturalcrit/dependabot/npm_and_yarn/googleapis-91.0.0
Bump googleapis from 89.0.0 to 91.0.0
2021-11-08 22:01:44 -05:00
Trevor Buckner 34bc242b76 Merge pull request #1802 from naturalcrit/revert-1777-experimentalAddMetadata-#820
Revert "Add `<meta>` tags to template"
2021-11-03 22:09:28 -04:00
Trevor Buckner f4529594a2 Revert "Add <meta> tags to template" 2021-11-03 22:07:58 -04:00
Trevor Buckner 3a4cf4f2dd Merge pull request #1777 from G-Ambatte/experimentalAddMetadata-#820
Add `<meta>` tags to template
2021-11-03 21:59:21 -04:00
Trevor Buckner fbcd4036f5 Merge pull request #1788 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.16.0
Bump @babel/preset-env from 7.15.8 to 7.16.0
2021-11-03 21:03:24 -04:00
Trevor Buckner 954fb6064e Merge pull request #1787 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.16.0
Bump @babel/plugin-transform-runtime from 7.15.8 to 7.16.0
2021-11-03 10:16:09 -04:00
Trevor Buckner dcb99fff80 Merge pull request #1786 from naturalcrit/dependabot/npm_and_yarn/babel/preset-react-7.16.0
Bump @babel/preset-react from 7.14.5 to 7.16.0
2021-11-02 23:45:42 -04:00
Trevor Buckner a851469ae1 Merge pull request #1785 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.16.0
Bump @babel/core from 7.15.8 to 7.16.0
2021-11-02 23:45:34 -04:00
Trevor Buckner 09ca2a4fd9 Merge pull request #1779 from naturalcrit/v3.0.3
Update Changelog to v3.0.3
2021-10-27 21:53:42 -04:00
Trevor Buckner a4b2fe2b91 Update Changelog 2021-10-27 21:52:52 -04:00
Trevor Buckner 8b219ba38a Merge pull request #1773 from naturalcrit/dependabot/npm_and_yarn/marked-3.0.8
Bump marked from 3.0.7 to 3.0.8
2021-10-27 21:41:22 -04:00
Trevor Buckner 8722791419 Merge pull request #1772 from naturalcrit/dependabot/npm_and_yarn/eslint-8.1.0
Bump eslint from 8.0.1 to 8.1.0
2021-10-26 23:11:45 -04:00
Trevor Buckner 55c175d9dd Merge pull request #1775 from G-Ambatte/fixDockerNodeConfig-#1767
[Docker] Shift to Alpine base image
2021-10-26 23:10:25 -04:00
Trevor Buckner 732021f5a5 Merge pull request #1769 from naturalcrit/FixStartingUndoOnNewPage
Fix starting undo on new page
2021-10-24 19:10:58 -04:00
Trevor Buckner 34293bcc1d Merge pull request #1763 from naturalcrit/keepHistoryOnTabSwitch
use CodeMirror Documents
2021-10-24 19:04:14 -04:00
Trevor Buckner ddb12ffbe2 Make sure initial tab loads with language for code highlighting 2021-10-24 18:03:10 -04:00
Trevor Buckner 47b99a24fb Clear out unneeded style when editor is hidden in Metadata panel 2021-10-24 16:46:46 -04:00
Trevor Buckner a4e0768105 Move Localstorage load to GetInitialState
Prevents the extra change to the CodeMirror document which was creating a starting "undo" history point that would blank out the page.
2021-10-24 16:42:39 -04:00
Trevor Buckner 11f7e3b8fc Merge pull request #1768 from G-Ambatte/fixDockerNodeConfig-#1767
Up Dockerfile Node version
2021-10-24 11:26:22 -04:00
Trevor Buckner 23799b8d41 Merge pull request #1765 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.0.12
Bump mongoose from 6.0.11 to 6.0.12
2021-10-21 23:47:14 -04:00
Trevor Buckner e1d7a363ef Merge pull request #1760 from G-Ambatte/fixDivider-#1674
Limit divider position
2021-10-20 10:55:28 -04:00
Trevor Buckner 63d659ff49 use CodeMirror Documents
Instead of re-building the whole editor box with every tab switch, we just swap in and out CodeMirror "documents".

Maintains undo history, scroll position, highlight coloring, etc.
2021-10-19 23:49:11 -04:00
Trevor Buckner b5ad75bcf2 Merge pull request #1761 from naturalcrit/dependabot/npm_and_yarn/googleapis-89.0.0
Bump googleapis from 88.2.0 to 89.0.0
2021-10-18 23:33:17 -04:00
Trevor Buckner e9b9c87188 Merge pull request #1701 from G-Ambatte/addEditorBar
Editor Toolbar - Undo and Redo.
2021-10-18 15:18:20 -04:00
Trevor Buckner aec8133046 Merge pull request #1755 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.0.11
Bump mongoose from 6.0.10 to 6.0.11
2021-10-14 23:06:52 -04:00
Trevor Buckner 44d4198f69 Merge pull request #1754 from naturalcrit/dependabot/npm_and_yarn/eslint-8.0.1
Bump eslint from 8.0.0 to 8.0.1
2021-10-14 00:46:14 -04:00
Trevor Buckner 432cce4ccf Merge pull request #1753 from naturalcrit/dependabot/npm_and_yarn/nanoid-3.1.30
Bump nanoid from 3.1.29 to 3.1.30
2021-10-14 00:45:59 -04:00
Trevor Buckner 7eb43b7c61 Merge pull request #1752 from naturalcrit/DropdownButtonComponent
Working dropdown component
2021-10-14 00:45:42 -04:00
Trevor Buckner feb8fcadd6 Animate dropdown 2021-10-14 00:40:51 -04:00
Trevor Buckner 872125515e Apply to Edit page 2021-10-14 00:03:22 -04:00
Trevor Buckner b9891d1c08 Merge pull request #1751 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.63.3
Bump codemirror from 5.63.1 to 5.63.3
2021-10-13 11:58:33 -04:00
Trevor Buckner a695540f60 Working dropdown component on the Share Page 2021-10-13 11:53:01 -04:00
Trevor Buckner 2b2869dc47 Merge pull request #1750 from naturalcrit/Make-V3-Welcome-use-all-V3-syntax
Make V3 Welcome page use all V3 syntax
2021-10-12 22:40:49 -04:00
Trevor Buckner 8244b59b57 Update welcome_msg_v3.md 2021-10-12 22:38:16 -04:00
Trevor Buckner e1a3d8c303 Merge pull request #1676 from Gazook89/FAQ-Page
Update the FAQ
2021-10-12 22:27:46 -04:00
Trevor Buckner 9add142edf Tweak v3 welcome to fit in page 2021-10-12 22:25:38 -04:00
Trevor Buckner 7cba892778 Merge pull request #1747 from naturalcrit/dependabot/npm_and_yarn/eslint-8.0.0
Bump eslint from 7.32.0 to 8.0.0
2021-10-11 14:52:12 -04:00
Trevor Buckner b65295b1df Merge pull request #1748 from naturalcrit/Update-CircleCi-to-Node16+Mongo4.4
Update Circleci config to node16 and mongo4.4
2021-10-11 13:10:25 -04:00
Trevor Buckner a31ad79eec 16.11 not available yet in circleci. Back to 16.10 2021-10-11 13:09:38 -04:00
Trevor Buckner 8fffdc83cf Update config.yml 2021-10-11 13:07:25 -04:00
Trevor Buckner 0a41f72d37 Update to Node v16 2021-10-11 12:44:05 -04:00
Trevor Buckner 7086524cf3 Merge pull request #1745 from G-Ambatte/updateWelcomePageLink-#1744
Update Unearthed Arcana links
2021-10-10 23:03:51 -04:00