Commit Graph
100 Commits
Author SHA1 Message Date
Trevor Buckner 51936a1b99 Merge pull request #3936 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.8.4
Bump mongoose from 8.8.3 to 8.8.4
2024-12-09 13:44:42 -05:00
Trevor Buckner 6136b78395 Merge pull request #3943 from naturalcrit/Fix_#2954
Get Google Brews with user auth if owner
2024-12-09 13:44:01 -05:00
Trevor Buckner c7d94b0779 Small cleanup 2024-12-08 23:59:27 -05:00
Trevor Buckner 9758797e2b If user is owner, fetch Google Brew with user auth
Fixes the case where a user can see a Google Brew under their account (`listBrew()` uses their personal auth) but can't actually delete it (`getBrew()`  only uses the serviceAccount). Occurs if a Google brew has lost its permissions somehow (set to "restricted", etc.) such that serviceAccount can no longer interact with it.
2024-12-08 23:42:14 -05:00
Trevor Buckner 74a7983757 Refactor and clean up "getBrew()"
Some redundant logic and sprawling formatting
2024-12-08 23:39:26 -05:00
Trevor Buckner 33f8f6bf38 Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.8.4 2024-12-07 21:32:53 -05:00
Trevor Buckner a62d2bd457 Merge pull request #3937 from naturalcrit/dependabot/npm_and_yarn/express-4.21.2
Bump express from 4.21.1 to 4.21.2
2024-12-06 16:30:42 -05:00
Trevor Buckner 406f5d4e14 Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.8.4 2024-12-06 16:29:02 -05:00
Trevor Buckner ed404d3906 Merge pull request #3935 from naturalcrit/dependabot/npm_and_yarn/babel/preset-react-7.26.3
Bump @babel/preset-react from 7.25.9 to 7.26.3
2024-12-06 16:28:35 -05:00
Trevor Buckner 136a6d4024 Merge pull request #3930 from naturalcrit/dependabot/npm_and_yarn/globals-15.13.0
Bump globals from 15.12.0 to 15.13.0
2024-12-03 20:43:13 -05:00
Trevor Buckner 737e27f062 Merge pull request #3934 from 5e-Cleric/fix-buttons
Fix Vault styles
2024-12-03 20:42:54 -05:00
Trevor Buckner 16184f1b8d Merge pull request #3916 from naturalcrit/dependabot/npm_and_yarn/nanoid-5.0.9
Bump nanoid from 5.0.8 to 5.0.9
2024-12-02 17:21:22 -05:00
Trevor Buckner 20dba6b7b3 Merge pull request #3929 from naturalcrit/dependabot/npm_and_yarn/eslint-9.16.0
Bump eslint from 9.15.0 to 9.16.0
2024-12-02 17:15:55 -05:00
Trevor Buckner d179c18c35 Merge pull request #3928 from naturalcrit/dependabot/npm_and_yarn/dompurify-3.2.2
Bump dompurify from 3.2.1 to 3.2.2
2024-12-02 17:03:16 -05:00
Trevor Buckner 6c2721d49f Merge pull request #3924 from naturalcrit/dependabot/npm_and_yarn/stylelint-16.11.0
Bump stylelint from 16.10.0 to 16.11.0
2024-12-02 12:26:19 -05:00
Trevor Buckner 029d61b6ad Merge branch 'master' into dependabot/npm_and_yarn/stylelint-16.11.0 2024-12-02 12:25:48 -05:00
Trevor Buckner f58040e9a4 Merge pull request #3931 from G-Ambatte/tagsToArrayOnLoad-#3927
Convert any `tags` strings to arrays
2024-12-02 12:25:05 -05:00
Trevor Buckner 9f9948f531 Add comment 2024-12-02 12:23:54 -05:00
Trevor Buckner bea74c3b46 Merge pull request #3926 from dbolack-ab/Issue_3919
Implement Gazook89's suggested fix for missing Page Shadows
2024-12-01 20:57:57 -05:00
Trevor Buckner d18005fad4 Merge pull request #3915 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.8.3
Bump mongoose from 8.8.2 to 8.8.3
2024-11-30 12:39:20 -05:00
Trevor Buckner 86402cdbc8 Merge pull request #3920 from 5e-Cleric/changelog-v3.17.0
v3.16.1 FaQ fix
2024-11-30 12:38:46 -05:00
Trevor Buckner e28b4e8c20 Merge pull request #3921 from 5e-Cleric/add-vault-to-more-navs
add vault navitem to share and edit pages
2024-11-27 17:50:12 -05:00
Trevor Buckner e711a1c207 Merge pull request #3917 from naturalcrit/v3.16.1
Version 3.16.1
2024-11-27 16:28:20 -05:00
Trevor Buckner add088c2a9 Up version to 3.16.1 2024-11-27 16:26:26 -05:00
Trevor Buckner 6d8415bfeb Merge pull request #3911 from dbolack-ab/autoESM
Fix regression in emoji auto-complete due to ESM update
2024-11-25 12:11:38 -05:00
Trevor Buckner 66f71972eb Merge pull request #3860 from naturalcrit/dependabot/npm_and_yarn/nanoid-5.0.8
Bump nanoid from 3.3.4 to 5.0.8
2024-11-21 13:36:36 -05:00
Trevor Buckner ebe8e1067c Move babel config to separate file
Jest struggles to read all babel configurations if directly inside package.json.

This now allows us to install nanoid 5 and pass all tests with it.
2024-11-21 13:33:32 -05:00
Trevor Buckner b58563cb42 Merge pull request #3897 from naturalcrit/dependabot/npm_and_yarn/eslint-9.15.0
Bump eslint from 9.14.0 to 9.15.0
2024-11-21 11:37:22 -05:00
Trevor Buckner e7daad592c Merge pull request #3859 from naturalcrit/dependabot/npm_and_yarn/elliptic-6.6.0
Bump elliptic from 6.5.7 to 6.6.0
2024-11-21 11:30:40 -05:00
Trevor Buckner 992359e239 Merge branch 'master' into dependabot/npm_and_yarn/elliptic-6.6.0 2024-11-21 11:27:47 -05:00
Trevor Buckner b2546f3458 Merge pull request #3903 from naturalcrit/dependabot/npm_and_yarn/dompurify-3.2.1
Bump dompurify from 3.2.0 to 3.2.1
2024-11-21 11:27:32 -05:00
Trevor Buckner 7cd3c69fbd Merge pull request #3898 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.8.2
Bump mongoose from 8.8.1 to 8.8.2
2024-11-21 11:23:50 -05:00
Trevor Buckner 9b1507d4f5 Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.8.2 2024-11-21 11:21:55 -05:00
Trevor Buckner 2e49bf4fa8 Merge pull request #3902 from naturalcrit/updateToES6Modules
Upgrade server-side code to ESM (import vs require)
2024-11-21 11:21:21 -05:00
Trevor Buckner e5624434d6 Update buildAdmin.js 2024-11-20 17:04:23 -05:00
Trevor Buckner 1850173f87 Remove unused dependency 2024-11-20 16:22:48 -05:00
Trevor Buckner fb9148ada5 Site runs and all tests pass 2024-11-20 16:21:35 -05:00
Trevor Buckner b7c49218ae Merge pull request #3735 from Gazook89/Functional-Tag-Editor
TagInput - Functional component for tag-like inputs
2024-11-13 13:58:42 -05:00
Trevor Buckner f4d4334a75 Merge branch 'master' into Functional-Tag-Editor 2024-11-13 13:52:01 -05:00
Trevor Buckner 9f693547f7 Merge pull request #3889 from naturalcrit/dependabot/npm_and_yarn/express-static-gzip-2.2.0
Bump express-static-gzip from 2.1.8 to 2.2.0
2024-11-12 13:27:28 -05:00
Trevor Buckner a69dd998f5 Merge branch 'master' into dependabot/npm_and_yarn/express-static-gzip-2.2.0 2024-11-12 13:16:34 -05:00
Trevor Buckner f141515446 Merge pull request #3888 from naturalcrit/dependabot/npm_and_yarn/marked-emoji-1.4.3
Bump marked-emoji from 1.4.2 to 1.4.3
2024-11-12 13:16:23 -05:00
Trevor Buckner dd8692d82b Merge pull request #3887 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.8.1
Bump mongoose from 8.7.3 to 8.8.1
2024-11-12 13:14:11 -05:00
Trevor Buckner 0437635861 Merge pull request #3892 from naturalcrit/dependabot/npm_and_yarn/dompurify-3.2.0
Bump dompurify from 3.1.7 to 3.2.0
2024-11-12 00:35:00 -05:00
Trevor Buckner a5f12ca0b4 Merge branch 'master' into dependabot/npm_and_yarn/dompurify-3.2.0 2024-11-12 00:27:07 -05:00
Trevor Buckner 07e0a7c1b5 Merge pull request #3820 from G-Ambatte/addAdminFixScriptTool-#3801
Add script fix tool to Admin page #3801
2024-11-12 00:21:05 -05:00
Trevor Buckner 2e9c7b1d9b Shorten label 2024-11-12 00:20:37 -05:00
Trevor Buckner 0ddc3ae5b9 Merge branch 'master' into addAdminFixScriptTool-#3801 2024-11-12 00:16:07 -05:00
Trevor Buckner 8c6c8f861d Automatically re-check for scripts
Adding a separate `keepText` field for the `updateBrew()` API might be a bandaid for something that should be looked at more deeply as a separate refactor, considering `updateBrew()` is configured to just return the stub and not the whole document.

For now, re-scanning for script tags after updating can be as simple as just re-looking up the brew.
2024-11-12 00:08:56 -05:00
Trevor Buckner e006826e3e Merge pull request #3891 from dbolack-ab/Issue_3718
Fix Issue 3718 by bounds checking prerender.
2024-11-11 22:04:36 -05:00
Trevor Buckner ccc37fc0d5 Merge pull request #3873 from naturalcrit/dependabot/npm_and_yarn/globals-15.12.0
Bump globals from 15.11.0 to 15.12.0
2024-11-10 01:15:53 -05:00
Trevor Buckner 2aec54748a Merge pull request #3871 from naturalcrit/dependabot/npm_and_yarn/eslint-9.14.0
Bump eslint from 9.13.0 to 9.14.0
2024-11-10 01:13:42 -05:00
Trevor Buckner 52ae343309 Merge pull request #3881 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-jest-28.9.0
Bump eslint-plugin-jest from 28.8.3 to 28.9.0
2024-11-10 01:10:26 -05:00
Trevor Buckner 69e827a663 Merge pull request #3882 from naturalcrit/dependabot/npm_and_yarn/react-router-dom-6.28.0
Bump react-router-dom from 6.27.0 to 6.28.0
2024-11-10 01:06:58 -05:00
Trevor Buckner d1d73023a2 Merge branch 'master' into dependabot/npm_and_yarn/react-router-dom-6.28.0 2024-11-10 00:55:34 -05:00
Trevor Buckner f4af19ed81 Merge pull request #3885 from Gazook89/Fix-dialog.jsx
Fix Dialog.jsx to prevent crashes
2024-11-10 00:06:39 -05:00
Trevor Buckner d0cf6eebbb Merge pull request #3869 from 5e-Cleric/fix-splitpane-overflowing-page
Fix-splitpane-overflowing-page
2024-11-05 16:43:59 -05:00
Trevor Buckner 0ba838f5ae Merge pull request #3880 from Gazook89/fix-memoization
Fix Memoization
2024-11-05 13:51:48 -05:00
Trevor Buckner b868ba9406 Merge pull request #3799 from Gazook89/View-Modes
View Modes - Single / Facing Pages / "Flow" arrangements
2024-11-04 16:05:53 -05:00
Trevor Buckner f63d2de8f4 Refactor toolbar view options (#2)
* Refactor toolbar view options

* Remove a couple more unused states
2024-11-01 22:19:48 -05:00
Trevor Buckner c7c8dafb18 Merge pull request #3816 from G-Ambatte/refactorVersionHistory
Refactor version history to use custom store wrapper
2024-10-29 17:10:22 -04:00
Trevor Buckner 8a8bf883e6 Merge pull request #3548 from G-Ambatte/fixLinks-#3547
Improve HTML sanitization
2024-10-29 14:20:50 -04:00
Trevor Buckner 17539cb80b Merge branch 'master' into fixLinks-#3547 2024-10-29 14:15:02 -04:00
Trevor Buckner bb057ba057 Merge pull request #3861 from 5e-Cleric/vault-styles-quickfix
Vault styles quickfix
2024-10-29 14:01:57 -04:00
Trevor Buckner 99ad865311 Merge branch 'master' into vault-styles-quickfix 2024-10-29 13:45:30 -04:00
Trevor Buckner ca90e1804a Merge branch 'master' into dependabot/npm_and_yarn/elliptic-6.6.0 2024-10-28 23:26:39 -04:00
Trevor Buckner e7c0cdae3d Merge pull request #3858 from naturalcrit/dependabot/npm_and_yarn/mongoose-8.7.3
Bump mongoose from 8.7.2 to 8.7.3
2024-10-28 23:26:25 -04:00
Trevor Buckner 56d024a2e6 Merge branch 'master' into dependabot/npm_and_yarn/mongoose-8.7.3 2024-10-28 23:25:45 -04:00
Trevor Buckner f6ed348824 Merge pull request #3857 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.26.0
Bump @babel/preset-env from 7.25.9 to 7.26.0
2024-10-28 23:25:34 -04:00
Trevor Buckner a4406d953a Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-env-7.26.0 2024-10-28 23:25:05 -04:00
Trevor Buckner 1a41252d70 Merge pull request #3856 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.26.0
Bump @babel/core from 7.25.9 to 7.26.0
2024-10-28 23:24:54 -04:00
Trevor Buckner 97371be26a Merge branch 'master' into dependabot/npm_and_yarn/babel/core-7.26.0 2024-10-28 23:23:08 -04:00
Trevor Buckner 994fbd197a Merge pull request #3855 from 5e-Cleric/refactor-splitpane
Refactor splitpane as a functional component
2024-10-28 15:00:39 -04:00
Trevor Buckner 26afb67f61 Merge pull request #3823 from 5e-Cleric/erase-unnecessary-divs
Clean up DOM
2024-10-26 23:06:17 -04:00
Trevor Buckner d2f6bc03db Merge branch 'master' into erase-unnecessary-divs 2024-10-26 23:02:40 -04:00
Trevor Buckner 547bedb5f9 Merge pull request #3851 from 5e-Cleric/userpage-to-func-comp
Refactor UserPage as a functional component
2024-10-26 23:00:18 -04:00
Trevor Buckner 1b4d41fc19 Remove error prop
Userpage is never passed `Error` prop from anywhere. Thus we can rename the error state here from `currentError` to just `error`
2024-10-26 22:59:49 -04:00
Trevor Buckner 6f2252635a Fix crash; props need props.var to work 2024-10-26 22:56:29 -04:00
Trevor Buckner 8bede8f0ee Merge pull request #3853 from 5e-Cleric/fix-snippetbar-behaviour
fix snippetbar weirdness
2024-10-23 22:45:39 -04:00
Trevor Buckner 671044ca3a Merge pull request #3850 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.25.9
Bump @babel/plugin-transform-runtime from 7.25.7 to 7.25.9
2024-10-23 17:02:34 -04:00
Trevor Buckner 785041dcd1 Merge pull request #3848 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.25.9
Bump @babel/preset-env from 7.25.8 to 7.25.9
2024-10-23 15:23:39 -04:00
Trevor Buckner 40bb823efa Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-env-7.25.9 2024-10-23 15:22:51 -04:00
Trevor Buckner 2ed6aad6f7 Merge pull request #3849 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.25.9
Bump @babel/core from 7.25.8 to 7.25.9
2024-10-23 15:22:31 -04:00
Trevor Buckner 1ab6ef078e Merge branch 'master' into dependabot/npm_and_yarn/babel/core-7.25.9 2024-10-23 15:21:40 -04:00
Trevor Buckner 25a7af5b70 Merge pull request #3847 from naturalcrit/dependabot/npm_and_yarn/babel/preset-react-7.25.9
Bump @babel/preset-react from 7.25.7 to 7.25.9
2024-10-23 15:21:27 -04:00
Trevor Buckner 3a1053ad70 Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-react-7.25.9 2024-10-23 15:03:23 -04:00
Trevor Buckner d768a41746 Merge pull request #3846 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.37.2
Bump eslint-plugin-react from 7.37.1 to 7.37.2
2024-10-23 15:03:14 -04:00
Trevor Buckner f5f22fe0e9 Merge pull request #3805 from 5e-Cleric/add-notification-client-side
Add notification client side
2024-10-23 15:01:14 -04:00
Trevor Buckner 6373c398bc Fix scroll PR when no hash 2024-10-23 13:45:10 -04:00
Trevor Buckner ef5e3ddf4c Merge pull request #3506 from naturalcrit/scroll-to-element
Get external link and scroll to element
2024-10-22 14:10:11 -04:00
Trevor Buckner d5f498cbf9 Merge branch 'master' into scroll-to-element 2024-10-22 14:09:49 -04:00
Trevor Buckner 5040b9528f cleanup 2024-10-22 14:08:20 -04:00
Trevor Buckner 83a48b8d0c Simplify observer 2024-10-22 13:58:35 -04:00
Trevor Buckner 9fbdd24d01 Cleanup 2024-10-22 13:52:34 -04:00
Trevor Buckner 5b136f651c Call scrollToHash from our existing "frameDidMount`
`frameDidMount` is equivalent to using iframe.addEventListener('load');

Let's not add a new listener and just use the existing event we already have. Functionality still works.
2024-10-22 13:03:12 -04:00
Trevor Buckner effeef0d67 Merge pull request #3842 from naturalcrit/dependabot/npm_and_yarn/eslint-9.13.0
Bump eslint from 9.12.0 to 9.13.0
2024-10-21 13:28:22 -04:00
Trevor Buckner cf3d5df582 Merge branch 'master' into dependabot/npm_and_yarn/eslint-9.13.0 2024-10-21 11:25:56 -04:00
Trevor Buckner 71cdbf1079 Merge pull request #3843 from naturalcrit/dependabot/npm_and_yarn/superagent-10.1.1
Bump superagent from 10.1.0 to 10.1.1
2024-10-21 11:25:41 -04:00
Trevor Buckner 712db7dfa7 Merge branch 'master' into dependabot/npm_and_yarn/superagent-10.1.1 2024-10-21 11:22:46 -04:00
Trevor Buckner ed48c6664b Merge pull request #3844 from G-Ambatte/catchIDBErrors
Catch IndexedDB errors
2024-10-21 09:59:29 -04:00