f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-09-23 20:32:56 +00:00
Code Wiki Activity
2,551 Commits 125 Branches 40 Tags
9e137fa6a8d1e1475b607716e297bd094e98e41d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner 9e137fa6a8 Merge pull request #2344 from naturalcrit/StyleBrewitemTags 
Add Styling to Tags on userpage
 2022-09-08 22:40:31 -04:00
Trevor Buckner 1f8701bea6 Merge pull request #2342 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.19.0 
Bump @babel/preset-env from 7.18.10 to 7.19.0
 2022-09-08 22:39:21 -04:00
Trevor Buckner 313ffab7c1 Merge pull request #2341 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.31.7 
Bump eslint-plugin-react from 7.31.1 to 7.31.7
 2022-09-08 22:39:10 -04:00
Trevor Buckner 9f602e416f Merge pull request #2343 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.19.0 
Bump @babel/core from 7.18.13 to 7.19.0
 2022-09-08 22:38:54 -04:00
Trevor Buckner de90e2d801 Merge pull request #2347 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.5.5 
Bump mongoose from 6.5.4 to 6.5.5
 2022-09-08 22:38:37 -04:00
Trevor Buckner cd8496b62b Merge pull request #2338 from naturalcrit/dependabot/npm_and_yarn/jest-29.0.2 
Bump jest from 29.0.1 to 29.0.2
 2022-09-08 00:04:23 -04:00
Trevor Buckner c0a14a5618 remove console.log 2022-09-06 22:57:00 -04:00
Trevor Buckner 8709545f14 Don't display tags that are empty strings. 2022-09-06 22:41:10 -04:00
Trevor Buckner e0d8846c44 tweaks 2022-09-06 01:00:38 -04:00
Trevor Buckner cae1bc9f0a Put tags in individual spans 2022-09-05 23:31:23 -04:00
Trevor Buckner 746e8f8a6a Merge pull request #2329 from G-Ambatte/smartenApostrophe-#2328 
[UserPage] Change apostrophe in `usernameWithS`
 2022-09-03 23:12:13 -04:00
Trevor Buckner 4f52cc075a Merge pull request #2327 from G-Ambatte/addSortType&DirToLocalStorage-#2326 
[UserPage] Add sort type & dir to local storage
 2022-09-03 23:11:24 -04:00
Trevor Buckner 8cf8c5cabb Merge branch 'master' into addSortType&DirToLocalStorage-#2326 2022-09-03 23:11:13 -04:00
Trevor Buckner 2f44c35ede Merge pull request #2320 from G-Ambatte/addBrewTagsToFilter-#2319 
[UserPage] Add tags to filter
 2022-09-03 22:40:08 -04:00
Trevor Buckner 62dee13881 Merge pull request #2324 from naturalcrit/FixNewPageCloning 
Fix conflicts on /new
 2022-09-03 22:38:59 -04:00
Trevor Buckner b4be9bb741 Default brew in getDefaultProps, don't get localstorage when cloning 2022-09-03 01:32:42 -04:00
Trevor Buckner e5fe6b1fd9 Merge branch 'master' into pr/2320 2022-09-02 23:55:34 -04:00
Trevor Buckner 8d10800cb6 Merge pull request #2318 from G-Ambatte/addTagsToBrewItem-#2317 
[UserPage] Add tags to UserPage BrewItem
 2022-09-02 23:43:26 -04:00
Trevor Buckner 67099bba40 Merge pull request #2316 from G-Ambatte/addSortTypeAndDirToURL-#2315 
[UserPage] Add sort type and dir to URL
 2022-09-02 22:46:25 -04:00
Trevor Buckner d94b274439 Merge branch 'master' into addSortTypeAndDirToURL-#2315 2022-09-02 22:44:43 -04:00
Trevor Buckner 99c2ff15a0 Merge pull request #2300 from G-Ambatte/addUserPageCollapse-#1797 
[UserPage] Collapse Brew Groups
 2022-09-02 22:33:27 -04:00
Trevor Buckner 407d3565cd Fix /new page "default" values not being read 2022-09-01 11:05:47 -04:00
Trevor Buckner 98e2d57691 Update changelog for v3.2.1 2022-08-31 23:29:38 -04:00
Trevor Buckner 6038b90798 3.2.1 2022-08-31 23:12:36 -04:00
Trevor Buckner 0ca25c06f2 Update Marked-Extended-Tables to V1.0.5 2022-08-31 23:11:55 -04:00
Trevor Buckner b85b3be1d1 Merge pull request #2291 from naturalcrit/dependabot/npm_and_yarn/jest-29.0.1 
Bump jest from 28.1.3 to 29.0.1
 2022-08-31 21:57:32 -04:00
Trevor Buckner 78b7e07d09 Merge pull request #2309 from naturalcrit/dependabot/npm_and_yarn/marked-4.1.0 
Bump marked from 4.0.19 to 4.1.0
 2022-08-31 19:51:54 -04:00
Trevor Buckner 0a0e57ad38 Merge pull request #2310 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.5.4 
Bump mongoose from 6.5.3 to 6.5.4
 2022-08-31 11:08:37 -04:00
Trevor Buckner 4c565657a9 Merge pull request #2313 from G-Ambatte/fixMissingSnippetButtons-#2311 
[NewPage] Load from local storage in componentDidMount
 2022-08-31 08:44:03 -04:00
Trevor Buckner 165a15e106 Update newPage.jsx 2022-08-31 08:43:18 -04:00
Trevor Buckner 545ea8342e Merge pull request #2308 from jeddai/fix-new-print-page 
add elvis to handle missing metaStorage
 2022-08-31 08:26:37 -04:00
Trevor Buckner 0831c68e2d Merge pull request #2305 from G-Ambatte/userPage-removeAutofocus-#2121 
[UserPage] Remove autofocus from filter textbox
 2022-08-31 08:24:20 -04:00
Trevor Buckner 4ad674040d Merge pull request #2304 from G-Ambatte/userPage-fixSortContainerPosition-#2303 
[UserPage] Fix sort container position when scroll bar absent
 2022-08-31 08:22:05 -04:00
Trevor Buckner 052fd4132b Merge pull request #2302 from G-Ambatte/userPage-changeRenderer 
[UserPage] Change UserPage CSS
 2022-08-31 08:19:53 -04:00
Trevor Buckner 17704e5010 Immediately save brew to localstorage upon page load 2022-08-30 22:50:04 -04:00
Trevor Buckner 9a60d60b6d Merge pull request #2299 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.31.1 
Bump eslint-plugin-react from 7.31.0 to 7.31.1
 2022-08-29 11:06:50 -04:00
Trevor Buckner e6d034b163 Merge pull request #2298 from naturalcrit/dependabot/npm_and_yarn/eslint-8.23.0 
Bump eslint from 8.22.0 to 8.23.0
 2022-08-29 11:03:00 -04:00
Trevor Buckner 0811da79c4 Merge pull request #2297 from jeddai/fix-query-params 
update WithRoute to handle query params correctly
 2022-08-28 15:00:39 -04:00
Trevor Buckner e40dbf7935 Merge pull request #2292 from naturalcrit/v3.2.0 
Up version to 3.2.0
 2022-08-27 13:28:56 -04:00
Trevor Buckner 2ea853aeda Up version to 3.2.0 2022-08-27 13:28:31 -04:00
Trevor Buckner 215b64f5a6 Merge pull request #2287 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.5.3 
Bump mongoose from 6.5.2 to 6.5.3
 2022-08-27 13:05:57 -04:00
Trevor Buckner 239526f4ee Merge pull request #2286 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.31.0 
Bump eslint-plugin-react from 7.30.1 to 7.31.0
 2022-08-27 13:05:49 -04:00
Trevor Buckner 697d4d98bf Merge pull request #2285 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.18.13 
Bump @babel/core from 7.18.10 to 7.18.13
 2022-08-27 13:05:37 -04:00
Trevor Buckner 87bc27544b Merge pull request #2290 from naturalcrit/MakeV3Default 
Make V3 default setting in /new, and homepage
 2022-08-27 13:05:26 -04:00
Trevor Buckner 1bbddacbf3 Merge pull request #2233 from jeddai/document-tags 
Document tags
 2022-08-27 13:05:09 -04:00
Trevor Buckner cf2e6aa900 Update notificationPopup.jsx 2022-08-27 13:01:53 -04:00
Trevor Buckner 3271eae4df Make V3 default setting in /new, and homepage 2022-08-27 01:51:30 -04:00
Trevor Buckner ed933bdf92 Merge pull request #2273 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.18.10 
Bump @babel/plugin-transform-runtime from 7.18.6 to 7.18.10
 2022-08-22 21:34:43 -04:00
Trevor Buckner 1c4dac6a52 Merge pull request #2255 from naturalcrit/dependabot/npm_and_yarn/jest-28.1.3 
Bump jest from 28.1.2 to 28.1.3
 2022-08-22 21:34:29 -04:00
Trevor Buckner f734b29a00 Merge pull request #2284 from naturalcrit/dependabot/npm_and_yarn/marked-4.0.19 
Bump marked from 4.0.17 to 4.0.19
 2022-08-22 21:33:32 -04:00
Trevor Buckner fa4db2acfa Merge pull request #2279 from naturalcrit/dependabot/npm_and_yarn/eslint-8.22.0 
Bump eslint from 8.19.0 to 8.22.0
 2022-08-22 21:33:22 -04:00
Trevor Buckner 167e5c87ae Merge pull request #2283 from naturalcrit/dependabot/npm_and_yarn/googleapis-107.0.0 
Bump googleapis from 105.0.0 to 107.0.0
 2022-08-22 21:33:13 -04:00
Trevor Buckner 42db46fa33 Merge pull request #2276 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.5.2 
Bump mongoose from 6.4.4 to 6.5.2
 2022-08-22 21:32:51 -04:00
Trevor Buckner 257920d9db Merge pull request #2272 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.18.10 
Bump @babel/preset-env from 7.18.6 to 7.18.10
 2022-08-22 21:32:08 -04:00
Trevor Buckner 88a09415e5 Merge pull request #2271 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.18.10 
Bump @babel/core from 7.18.6 to 7.18.10
 2022-08-22 21:31:56 -04:00
Trevor Buckner 80334a1649 Merge pull request #2252 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.4.4 
Bump mongoose from 6.4.2 to 6.4.4
 2022-07-08 14:19:16 -04:00
Trevor Buckner b257b4c0fc Merge pull request #2251 from naturalcrit/dependabot/npm_and_yarn/moment-2.29.4 
Bump moment from 2.29.3 to 2.29.4
 2022-07-08 13:44:39 -04:00
Trevor Buckner 985f4abb45 Merge pull request #2232 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.30.1 
Bump eslint-plugin-react from 7.30.0 to 7.30.1
 2022-07-05 20:53:07 -04:00
Trevor Buckner e20fa09170 Merge pull request #2239 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.18.6 
Bump @babel/plugin-transform-runtime from 7.18.5 to 7.18.6
 2022-07-05 20:52:59 -04:00
Trevor Buckner b2a4054561 Merge pull request #2249 from naturalcrit/dependabot/npm_and_yarn/googleapis-105.0.0 
Bump googleapis from 104.0.0 to 105.0.0
 2022-07-05 20:52:44 -04:00
Trevor Buckner 5362cc90f4 Merge pull request #2237 from naturalcrit/dependabot/npm_and_yarn/babel/preset-env-7.18.6 
Bump @babel/preset-env from 7.18.2 to 7.18.6
 2022-07-04 01:46:00 -04:00
Trevor Buckner 66ae4dc67d Merge pull request #2246 from naturalcrit/dependabot/npm_and_yarn/eslint-8.19.0 
Bump eslint from 8.18.0 to 8.19.0
 2022-07-04 01:45:52 -04:00
Trevor Buckner 7d8890a61a Merge pull request #2247 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.4.2 
Bump mongoose from 6.4.1 to 6.4.2
 2022-07-04 01:45:45 -04:00
Trevor Buckner 0697673382 Merge pull request #2248 from naturalcrit/dependabot/npm_and_yarn/supertest-6.2.4 
Bump supertest from 6.2.3 to 6.2.4
 2022-07-04 01:45:38 -04:00
Trevor Buckner bc66ad0221 Merge pull request #2238 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.4.1 
Bump mongoose from 6.4.0 to 6.4.1
 2022-07-02 10:19:31 -04:00
Trevor Buckner 08c52e4bac Merge pull request #2240 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.18.6 
Bump @babel/core from 7.18.5 to 7.18.6
 2022-07-02 10:19:13 -04:00
Trevor Buckner 0741066554 Merge pull request #2241 from naturalcrit/dependabot/npm_and_yarn/babel/preset-react-7.18.6 
Bump @babel/preset-react from 7.17.12 to 7.18.6
 2022-07-02 10:19:05 -04:00
Trevor Buckner 24458ad2af Merge pull request #2242 from naturalcrit/dependabot/npm_and_yarn/jest-28.1.2 
Bump jest from 28.1.1 to 28.1.2
 2022-07-02 10:18:57 -04:00
Trevor Buckner 3649099d00 Merge pull request #2229 from naturalcrit/dependabot/npm_and_yarn/googleapis-104.0.0 
Bump googleapis from 103.0.0 to 104.0.0
 2022-06-22 00:24:28 -04:00
Trevor Buckner 5d7a46abfe Merge pull request #2228 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.65.6 
Bump codemirror from 5.65.5 to 5.65.6
 2022-06-22 00:24:14 -04:00
Trevor Buckner 32833459e4 Merge pull request #2230 from naturalcrit/dependabot/npm_and_yarn/shell-quote-1.7.3 
Bump shell-quote from 1.7.2 to 1.7.3
 2022-06-22 00:20:18 -04:00
Trevor Buckner c4ee39461e Merge pull request #2223 from jlgraves/master 
Implements issue #2215 - spell-casting ability
 2022-06-21 15:40:54 -04:00
Trevor Buckner 586ff67fa0 Small tweaks 2022-06-21 15:38:20 -04:00
Trevor Buckner a76715d2b3 Merge pull request #2224 from jeddai/update-react-router-dom 
react-router-dom 5->6 upgrade
 2022-06-20 17:27:19 -04:00
Trevor Buckner 9073435ff3 Update package-lock.json 2022-06-20 17:26:52 -04:00
Trevor Buckner 802e798492 Merge branch 'master' into update-react-router-dom 2022-06-20 17:24:59 -04:00
Trevor Buckner 038d0c5b68 Merge pull request #1699 from naturalcrit/v3ClassTableTweaks 
Allow wide classTables to bleed into top margin
 2022-06-20 11:36:38 -04:00
Trevor Buckner 5ac65245b7 Merge pull request #2226 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.4.0 
Bump mongoose from 6.3.8 to 6.4.0
 2022-06-19 23:12:53 -04:00
Trevor Buckner 06cbcb047b Merge pull request #2225 from naturalcrit/dependabot/npm_and_yarn/eslint-8.18.0 
Bump eslint from 8.17.0 to 8.18.0
 2022-06-19 23:12:45 -04:00
Trevor Buckner f7d8c6434f Small tweaks 2022-06-16 22:41:04 -04:00
Trevor Buckner 936fdff871 Update CSS, Shrink vertical border margins slightly 2022-06-16 22:13:52 -04:00
Trevor Buckner da3460f3bf Merge branch 'master' into v3ClassTableTweaks 2022-06-16 22:08:01 -04:00
Trevor Buckner 8ea58d22ba Merge pull request #2218 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.18.5 
Bump @babel/core from 7.18.2 to 7.18.5
 2022-06-16 15:31:18 -04:00
Trevor Buckner 7dafd3ee77 Merge pull request #2217 from naturalcrit/dependabot/npm_and_yarn/marked-4.0.17 
Bump marked from 4.0.16 to 4.0.17
 2022-06-15 23:47:06 -04:00
Trevor Buckner 4e403dd0e9 Merge pull request #2220 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.18.5 
Bump @babel/plugin-transform-runtime from 7.18.2 to 7.18.5
 2022-06-15 23:46:46 -04:00
Trevor Buckner e8c7bcfee9 Merge pull request #2219 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.3.8 
Bump mongoose from 6.3.6 to 6.3.8
 2022-06-15 23:44:14 -04:00
Trevor Buckner 6ed12f41f9 Merge pull request #2222 from naturalcrit/dependabot/npm_and_yarn/googleapis-103.0.0 
Bump googleapis from 101.0.0 to 103.0.0
 2022-06-15 23:44:07 -04:00
Trevor Buckner 5601b932c8 Fix Clone to New broken with #2114 2022-06-09 01:09:18 -04:00
Trevor Buckner 204b379fcb Merge pull request #2114 from jeddai/google-document-stubs 
Google Drive document stubs
 2022-06-09 00:37:49 -04:00
Trevor Buckner 5f7abe2a8f Merge branch 'master' into pr/2114 2022-06-09 00:33:44 -04:00
Trevor Buckner 385a22f199 Merge pull request #2214 from naturalcrit/3.1.1 
v3.1.1
 2022-06-09 00:27:51 -04:00
Trevor Buckner 1045867d73 Up version to 3.1.1 2022-06-09 00:26:22 -04:00
Trevor Buckner 0061e44339 3.1.1 2022-06-09 00:11:57 -04:00
Trevor Buckner 29eb2fe39e Merge pull request #2211 from naturalcrit/FixOverlappingDecorations 
Fix Overlapping ClassTable Decorations
 2022-06-09 00:09:35 -04:00
Trevor Buckner f9af27b159 Merge pull request #2208 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.3.6 
Bump mongoose from 6.3.5 to 6.3.6
 2022-06-09 00:05:29 -04:00
Trevor Buckner 86f0abbfd1 Merge pull request #2209 from naturalcrit/dependabot/npm_and_yarn/googleapis-101.0.0 
Bump googleapis from 100.0.0 to 101.0.0
 2022-06-09 00:05:18 -04:00
Trevor Buckner e2a46c4883 Merge pull request #2210 from naturalcrit/dependabot/npm_and_yarn/jest-28.1.1 
Bump jest from 28.1.0 to 28.1.1
 2022-06-09 00:04:43 -04:00
Trevor Buckner 389bcf1bbd Use z-index instead of translateZ 2022-06-08 00:44:58 -04:00
Trevor Buckner b1066a1df5 Merge pull request #2206 from naturalcrit/v3.1.0 
Up version to 3.1.0
 2022-06-06 00:45:12 -04:00
Trevor Buckner 111ade7719 Merge pull request #2205 from naturalcrit/dependabot/npm_and_yarn/eslint-8.17.0 
Bump eslint from 8.16.0 to 8.17.0
 2022-06-06 00:44:59 -04:00