f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-09-25 09:22:58 +00:00
Code Wiki Activity
2,172 Commits 127 Branches 40 Tags
a17a9ac0a059f89a9971a904102ea866f2ad5e2f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Buckner a17a9ac0a0 lint 2022-05-16 01:41:31 -04:00
Trevor Buckner 4f6555b522 Merge snippets between theme and basetheme 
- Current theme has preference over the base theme
- Snippets with the same name are overwritten by the current theme.
- If the overwritten snippet has no `gen` property (or `gen` is falsy), it will remove the base Theme snippet.
- Snippets not overwritten will carry over from base Theme
- New snippets will be added on to base Theme
 2022-05-16 01:40:40 -04:00
Trevor Buckner 4167026ca7 Point to new theme location for user page 2022-05-16 00:01:34 -04:00
Trevor Buckner ef7b8f1ba4 Themes work on Print page 2022-05-15 23:48:23 -04:00
Trevor Buckner ec57b209b6 Themes work on Share page 2022-05-15 23:36:07 -04:00
Trevor Buckner 1e64ca04d8 BaseTheme is a separate file; not duplicated inside child theme 2022-05-15 23:08:44 -04:00
Trevor Buckner 1f82dbe8ee Make DMG style use CSS variables 2022-05-15 22:45:59 -04:00
Trevor Buckner 96e704234c Convert LESS variables to CSS variables 2022-04-18 16:32:56 -04:00
Trevor Buckner 407528bd94 Don't embed base64 images 
4+MB down to 17kb CSS file.

Images are only ~1.7MB. They were very bloated as base64
 2022-04-18 16:32:35 -04:00
Trevor Buckner 5b107d4e62 Remove unneeded console log 2022-04-18 16:31:23 -04:00
Trevor Buckner f71dc004c0 Themes list to use object instead of array. 2022-04-15 17:17:13 -04:00
Trevor Buckner ff1f70afa8 Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-04-02 13:50:18 -04:00
Trevor Buckner 613b9c4405 Merge pull request #2101 from naturalcrit/dependabot/npm_and_yarn/nanoid-3.3.2 
Bump nanoid from 3.3.1 to 3.3.2
 2022-03-31 23:09:59 -04:00
Trevor Buckner 6318b1f84c Merge pull request #2115 from naturalcrit/dependabot/npm_and_yarn/googleapis-100.0.0 
Bump googleapis from 99.0.0 to 100.0.0
 2022-03-31 23:09:44 -04:00
Trevor Buckner 12670d4d9b Merge pull request #2090 from G-Ambatte/addQueryToUserPageUrl 
Add UserPage filtering to/from URL
 2022-03-31 22:24:48 -04:00
Trevor Buckner 41c0b7fef9 Formatting 2022-03-31 22:21:58 -04:00
Trevor Buckner 34b4556e5c Merge pull request #2088 from naturalcrit/dependabot/npm_and_yarn/minimist-1.2.6 
Bump minimist from 1.2.5 to 1.2.6
 2022-03-31 21:42:47 -04:00
Trevor Buckner bb935f4727 Merge pull request #2097 from naturalcrit/dependabot/npm_and_yarn/ansi-regex-4.1.1 
Bump ansi-regex from 4.1.0 to 4.1.1
 2022-03-31 21:42:35 -04:00
Trevor Buckner 2719bb8280 Merge pull request #2096 from naturalcrit/dependabot/npm_and_yarn/eslint-8.12.0 
Bump eslint from 8.11.0 to 8.12.0
 2022-03-31 21:42:17 -04:00
Trevor Buckner ebfb0d8fcf Merge pull request #2098 from naturalcrit/dependabot/npm_and_yarn/googleapis-99.0.0 
Bump googleapis from 98.0.0 to 99.0.0
 2022-03-31 21:42:03 -04:00
Trevor Buckner 8a0d74d323 Merge pull request #2102 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.9 
Bump mongoose from 6.2.8 to 6.2.9
 2022-03-31 21:41:48 -04:00
Trevor Buckner 84d0010702 Merge pull request #2111 from jeddai/logout-fix 
update logout logic
 2022-03-30 12:58:04 -04:00
Trevor Buckner eeef9dcc1b Merge pull request #2105 from jeddai/add-async-handler 
add asyncHandler to async methods in routes
 2022-03-29 16:43:00 -04:00
Trevor Buckner 36fcce7f1e Merge pull request #2100 from naturalcrit/v3.0.8 
Update version to v3.0.8
 2022-03-28 13:35:20 -04:00
Trevor Buckner 6c85d0f35a Update version to v3.0.8 2022-03-27 23:16:37 -04:00
Trevor Buckner 331fcf0714 Merge pull request #2085 from Gazook89/Drop-Cap-Snippet-Update 
Unset `:first-line` small-caps rule with *Remove Drop Cap* snippet
 2022-03-27 01:14:07 -04:00
Trevor Buckner 0ec9e8932e Merge pull request #2089 from jeddai/google-transfer-api 
Update app to use a single endpoint for google and non-google stored brews
 2022-03-27 00:54:28 -04:00
Trevor Buckner 67eb7fdbd4 Merge branch 'master' into pr/2089 2022-03-27 00:41:50 -04:00
Trevor Buckner a1e7da8d84 Merge pull request #2091 from G-Ambatte/fixComponentWillMount 
Remove calls to deprecated `componentWillMount`
 2022-03-26 23:49:36 -04:00
Trevor Buckner f53b0ec9af Merge pull request #2094 from G-Ambatte/experimentalCircleCIConfig 
Increase test time out and update CircleCI testing configuration
 2022-03-26 23:46:08 -04:00
Trevor Buckner c9935fa45c Merge pull request #2087 from naturalcrit/dependabot/npm_and_yarn/googleapis-98.0.0 
Bump googleapis from 97.0.0 to 98.0.0
 2022-03-24 00:08:23 -04:00
Trevor Buckner 9e5cc57441 Merge pull request #2055 from G-Ambatte/addDividerResetOnWindowResize-#2053 
Add divider reset on window resize #2053
 2022-03-23 21:08:18 -04:00
Trevor Buckner 8bab346cbb Change var names, simplify resize logic, limit on page refresh 2022-03-23 16:21:37 -04:00
Trevor Buckner 0a52cafefe Merge pull request #2050 from lucastucious/Fix-#1749---ToC-linking-in-pdf 
Fix #1749 - ToC linking in pdf
 2022-03-23 12:48:45 -04:00
Trevor Buckner 83b3fdff21 Merge pull request #2084 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.17.8 
Bump @babel/core from 7.17.7 to 7.17.8
 2022-03-23 12:47:45 -04:00
Trevor Buckner 97dfbe9e35 Merge pull request #2086 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.8 
Bump mongoose from 6.2.7 to 6.2.8
 2022-03-23 12:46:07 -04:00
Trevor Buckner 323ccf3b25 Merge pull request #2082 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.7 
Bump mongoose from 6.2.6 to 6.2.7
 2022-03-17 13:35:15 -04:00
Trevor Buckner 45969127f5 Merge pull request #2070 from Gazook89/z-index-on-dropdown 
add z-index to dropdown container.
 2022-03-15 21:42:00 -04:00
Trevor Buckner 392ce35efa Merge pull request #2079 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.17.7 
Bump @babel/core from 7.17.5 to 7.17.7
 2022-03-15 21:41:00 -04:00
Trevor Buckner 1c2992c887 Merge pull request #2073 from naturalcrit/dependabot/npm_and_yarn/eslint-8.11.0 
Bump eslint from 8.10.0 to 8.11.0
 2022-03-14 21:25:46 -04:00
Trevor Buckner 1eaeebf2fe Merge pull request #2078 from naturalcrit/dependabot/npm_and_yarn/googleapis-97.0.0 
Bump googleapis from 96.0.0 to 97.0.0
 2022-03-14 21:25:37 -04:00
Trevor Buckner ffc027a309 Merge pull request #2072 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.6 
Bump mongoose from 6.2.5 to 6.2.6
 2022-03-14 21:25:25 -04:00
Trevor Buckner 2f20eeb016 Merge pull request #2074 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.29.4 
Bump eslint-plugin-react from 7.29.3 to 7.29.4
 2022-03-14 21:02:55 -04:00
Trevor Buckner ebe76aacf3 Merge pull request #2062 from Gazook89/Remove-Reddit-Post-Issue-Title 
Remove post title when opening issue on Reddit; add leading questions
 2022-03-13 01:52:49 -05:00
Trevor Buckner b144f0c1d7 Bold text 2022-03-13 01:51:24 -05:00
Trevor Buckner 8ec8b2c66d Merge pull request #2063 from Gazook89/Fix-classTable-Decoration 
Set `.classTable.decoration` to display below text
 2022-03-13 01:44:40 -05:00
Trevor Buckner 5bb5af2b5e Merge pull request #2064 from Gazook89/Changelog-3.0.6-MacOS-Typo 
Small change to 3.0.6 changelog for MacOS
 2022-03-13 01:41:03 -05:00
Trevor Buckner 438c7eabdc Merge pull request #2065 from Gazook89/Small-Changes-to-Theme-Swapper 
Small changes to theme swapper
 2022-03-13 01:40:38 -05:00
Trevor Buckner e12579a2a2 Restore original image size, shift position to not cover text 2022-03-13 01:38:48 -05:00
Trevor Buckner 2229686057 Merge pull request #2066 from craigelloyd/doc-fixes 
Fixed typos and some grammar things in README.md
 2022-03-13 00:31:54 -05:00
Trevor Buckner 9282bdc09d Merge pull request #2056 from G-Ambatte/addDividerResetOnLogout-#2054 
Reset divider position on log out
 2022-03-10 19:46:51 -05:00
Trevor Buckner 2cb34c6535 Merge pull request #2060 from naturalcrit/dependabot/npm_and_yarn/googleapis-96.0.0 
Bump googleapis from 95.0.0 to 96.0.0
 2022-03-10 19:45:42 -05:00
Trevor Buckner 5329f21896 Merge pull request #2059 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.5 
Bump mongoose from 6.2.4 to 6.2.5
 2022-03-10 14:34:45 -05:00
Trevor Buckner 04cd53397a Merge pull request #2051 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.29.3 
Bump eslint-plugin-react from 7.29.2 to 7.29.3
 2022-03-04 22:49:39 -05:00
Trevor Buckner fc000af68c Merge pull request #2044 from naturalcrit/dependabot/npm_and_yarn/eslint-plugin-react-7.29.2 
Bump eslint-plugin-react from 7.28.0 to 7.29.2
 2022-03-01 15:02:32 -05:00
Trevor Buckner 3143c4e51c Merge pull request #2046 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.4 
Bump mongoose from 6.2.3 to 6.2.4
 2022-03-01 13:10:13 -05:00
Trevor Buckner bf7d43768b Merge pull request #2045 from naturalcrit/dependabot/npm_and_yarn/eslint-8.10.0 
Bump eslint from 8.9.0 to 8.10.0
 2022-03-01 13:09:55 -05:00
Trevor Buckner 01087ca302 Add preview texture to dropdown options 2022-03-01 11:21:13 -05:00
Trevor Buckner 297365407b Fixed comment showing up on page 2022-03-01 09:30:56 -05:00
Trevor Buckner 8e0629062d Fully disable theme selection when in Legacy mode 
Making Legacy a "theme" implies we will add more themes to Legacy, which we aren't planning to.
 2022-03-01 00:34:19 -05:00
Trevor Buckner 98de9f1d7f Merge pull request #2042 from naturalcrit/dependabot/npm_and_yarn/fs-extra-10.0.1 
Bump fs-extra from 10.0.0 to 10.0.1
 2022-02-22 23:46:05 -05:00
Trevor Buckner 4dc3d5dcf7 Merge pull request #2041 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.3 
Bump mongoose from 6.2.2 to 6.2.3
 2022-02-22 23:45:54 -05:00
Trevor Buckner 49566756cd Merge pull request #2040 from naturalcrit/dependabot/npm_and_yarn/codemirror-5.65.2 
Bump codemirror from 5.65.1 to 5.65.2
 2022-02-22 23:45:42 -05:00
Trevor Buckner 4c52c1b188 Merge pull request #2035 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.17.5 
Bump @babel/core from 7.17.4 to 7.17.5
 2022-02-18 17:12:54 -05:00
Trevor Buckner ca7b758dd4 Merge pull request #2026 from jeddai/google-service-auth 
Update Google interactions to prefer the service account where viable
 2022-02-16 23:17:25 -05:00
Trevor Buckner a679c615ed Merge pull request #2015 from G-Ambatte/addLogout-#303 
Add logout button
 2022-02-16 22:52:45 -05:00
Trevor Buckner 99761f0a93 Merge pull request #2032 from naturalcrit/dependabot/npm_and_yarn/nanoid-3.3.1 
Bump nanoid from 3.3.0 to 3.3.1
 2022-02-16 22:19:14 -05:00
Trevor Buckner b87f57cd25 Merge pull request #2031 from naturalcrit/dependabot/npm_and_yarn/express-4.17.3 
Bump express from 4.17.2 to 4.17.3
 2022-02-16 22:19:04 -05:00
Trevor Buckner 14ff9aeae5 Merge pull request #2028 from naturalcrit/dependabot/npm_and_yarn/express-static-gzip-2.1.5 
Bump express-static-gzip from 2.1.4 to 2.1.5
 2022-02-16 22:18:56 -05:00
Trevor Buckner ba7976c5c6 Merge pull request #2030 from naturalcrit/dependabot/npm_and_yarn/body-parser-1.19.2 
Bump body-parser from 1.19.1 to 1.19.2
 2022-02-16 22:16:29 -05:00
Trevor Buckner 6520d3fd76 Merge pull request #2033 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.2 
Bump mongoose from 6.2.1 to 6.2.2
 2022-02-16 22:15:27 -05:00
Trevor Buckner aafe9724d4 Merge pull request #2027 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.17.4 
Bump @babel/core from 7.17.2 to 7.17.4
 2022-02-16 22:14:41 -05:00
Trevor Buckner 41c2d2a3d7 Merge pull request #2025 from naturalcrit/dependabot/npm_and_yarn/nanoid-3.3.0 
Bump nanoid from 3.2.0 to 3.3.0
 2022-02-14 23:14:08 -05:00
Trevor Buckner 42afbd3e70 Merge pull request #2024 from naturalcrit/dependabot/npm_and_yarn/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7
 2022-02-14 10:00:14 -05:00
Trevor Buckner 143d0f294a Merge pull request #2022 from naturalcrit/dependabot/npm_and_yarn/express-static-gzip-2.1.4 
Bump express-static-gzip from 2.1.3 to 2.1.4
 2022-02-14 09:57:06 -05:00
Trevor Buckner e197ab7bc3 Merge pull request #2021 from naturalcrit/dependabot/npm_and_yarn/eslint-8.9.0 
Bump eslint from 8.8.0 to 8.9.0
 2022-02-14 09:56:56 -05:00
Trevor Buckner da5ce35c3c Make themes work on /new 2022-02-11 00:32:05 -05:00
Trevor Buckner 96d9d323d1 Fix merge 2022-02-10 23:42:05 -05:00
Trevor Buckner dd0112f749 Update to Master 2022-02-10 23:38:33 -05:00
Trevor Buckner d35c5c2719 Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-02-10 23:36:41 -05:00
Trevor Buckner 9ab14a9fd8 Merge pull request #2018 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.17.2 
Bump @babel/core from 7.17.0 to 7.17.2
 2022-02-09 08:34:39 -05:00
Trevor Buckner 55a5546f25 Merge pull request #2017 from naturalcrit/dependabot/npm_and_yarn/jest-27.5.1 
Bump jest from 27.5.0 to 27.5.1
 2022-02-09 08:34:30 -05:00
Trevor Buckner 29c32f03ae Merge pull request #2013 from naturalcrit/dependabot/npm_and_yarn/mongoose-6.2.1 
Bump mongoose from 6.2.0 to 6.2.1
 2022-02-08 11:08:30 -05:00
Trevor Buckner 950e03e321 Merge pull request #2014 from naturalcrit/dependabot/npm_and_yarn/express-static-gzip-2.1.3 
Bump express-static-gzip from 2.1.2 to 2.1.3
 2022-02-08 11:08:21 -05:00
Trevor Buckner 30867960ce Merge pull request #2007 from naturalcrit/TweakUserpageBrewItemStyle 
Make brewItems stand out a bit.
 2022-02-07 12:43:08 -05:00
Trevor Buckner ee201ae6d8 Merge pull request #2011 from naturalcrit/dependabot/npm_and_yarn/query-string-7.1.1 
Bump query-string from 7.1.0 to 7.1.1
 2022-02-06 23:19:40 -05:00
Trevor Buckner 6e5b4ca6e0 Merge pull request #2010 from naturalcrit/dependabot/npm_and_yarn/jest-27.5.0 
Bump jest from 27.4.7 to 27.5.0
 2022-02-06 23:19:25 -05:00
Trevor Buckner cbc3c36dc3 Merge pull request #2009 from naturalcrit/dependabot/npm_and_yarn/googleapis-95.0.0 
Bump googleapis from 94.0.0 to 95.0.0
 2022-02-06 23:19:15 -05:00
Trevor Buckner 9675b1cf0b Merge pull request #2008 from naturalcrit/dependabot/npm_and_yarn/express-static-gzip-2.1.2 
Bump express-static-gzip from 2.1.1 to 2.1.2
 2022-02-06 23:19:03 -05:00
Trevor Buckner 30b1aef8ba Make brewItems stand out a bit. 2022-02-06 18:54:09 -05:00
Trevor Buckner e1bbd76208 Merge pull request #1799 from G-Ambatte/createBasePages 
Create Base Page structure - ListPage
 2022-02-06 18:07:05 -05:00
Trevor Buckner d38bf3b450 Clean up. 2022-02-06 17:17:59 -05:00
Trevor Buckner 63e1849854 Merge branch 'master' into pr/1799 2022-02-06 15:31:24 -05:00
Trevor Buckner ac5ce90eba Merge pull request #2005 from jeddai/update-icon-links 
remove text under social links, adjust spacing
 2022-02-03 23:11:16 -05:00
Trevor Buckner 0a41e7a4af Make "Discord of Many Things" a link in homepage 2022-02-03 23:07:04 -05:00
Trevor Buckner 5170b991b4 Move v3 icons to end of page 2022-02-03 21:43:42 -05:00
Trevor Buckner 790420b320 Merge pull request #2004 from naturalcrit/v3.0.7 
Update to Version 3.0.7
 2022-02-02 23:07:27 -05:00
Trevor Buckner 2f011ebb24 Merge pull request #2002 from naturalcrit/dependabot/npm_and_yarn/babel/core-7.17.0 
Bump @babel/core from 7.16.12 to 7.17.0
 2022-02-02 23:07:08 -05:00
Trevor Buckner 191adf0a7c Update to Version 3.0.7 2022-02-02 23:05:32 -05:00
Trevor Buckner 62f505f982 Merge pull request #2003 from naturalcrit/dependabot/npm_and_yarn/babel/plugin-transform-runtime-7.17.0 
Bump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0
 2022-02-02 22:05:37 -05:00