0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-05-08 05:38:40 +00:00
Commit Graph

1073 Commits

Author SHA1 Message Date
Charlie Humphreys 9f69763572 fix deletion request 2022-04-06 11:14:34 -05:00
Trevor Buckner ff1f70afa8 Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-04-02 13:50:18 -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
Charlie Humphreys 6791df7f75 Merge branch 'master' into google-document-stubs
# Conflicts:
#	server/homebrew.api.js
2022-03-30 23:26:41 -05:00
Charlie Humphreys fa8d47400f update API and frontend for google drive document stubs 2022-03-30 23:23:45 -05:00
Trevor Buckner 84d0010702 Merge pull request #2111 from jeddai/logout-fix
update logout logic
2022-03-30 12:58:04 -04:00
Charlie Humphreys e610c12b2a update logout logic 2022-03-30 10:24:25 -05: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
Charlie Humphreys c17db043ba remove extra slash in regex 2022-03-29 11:54:15 -05:00
Charlie Humphreys 89dbd19556 update response handling for saving google brews 2022-03-29 11:46:50 -05: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 67eb7fdbd4 Merge branch 'master' into pr/2089 2022-03-27 00:41:50 -04:00
G.Ambatte c0b2fb8ed9 Merge branch 'master' into addLocalLogin-#269 2022-03-27 17:15:41 +13:00
G.Ambatte c8f6dea1e1 Conflict fix for homebrew.jsx 2022-03-27 17:12:15 +13:00
G.Ambatte 4b6fb9f595 Add publicUrl as configuration item 2022-03-25 17:05:35 +13:00
G.Ambatte 77e8952e8a Shift componentWillMount call to getInitialState 2022-03-25 16:40:41 +13:00
G.Ambatte 2be365c839 Shift global declarations to componentDidMount 2022-03-25 16:12:33 +13:00
G.Ambatte 17dd738ac1 Shift to history.replaceState 2022-03-25 12:23:01 +13:00
G.Ambatte 32a5e71015 Change verbiage of filter placeholder text 2022-03-25 11:28:30 +13:00
G.Ambatte 1c641e3aff Initial pass at UserPage filtering to/from URL 2022-03-25 11:20:16 +13:00
Charlie Humphreys 562ba42b1b add the transfer if statement back in after erroneously removing it 2022-03-24 13:50:26 -05:00
Charlie Humphreys bba0208361 update based on feedback 2022-03-24 13:46:23 -05:00
Charlie Humphreys 92d8027640 update app to use a single endpoint for google and non-google stored brews 2022-03-24 08:13:34 -05:00
Gazook89 58815a3910 add descriptive css comment 2022-03-21 22:09:45 -05:00
Gazook89 b17f173e03 Unset :first-line small-caps rule with drop-cap 2022-03-21 22:02:44 -05:00
G.Ambatte 57c5f28938 Merge branch 'master' into addLocalLogin-#269 2022-03-22 09:39:41 +13:00
G.Ambatte a11e93ef54 Initial pass at social metadata tags 2022-03-15 18:47:46 +13:00
Gazook89 f13c16bb4f add z-index to dropdown container.
also just format spacing on css rules
2022-03-13 20:40:41 -05:00
Trevor Buckner b144f0c1d7 Bold text 2022-03-13 01:51:24 -05:00
Trevor Buckner e12579a2a2 Restore original image size, shift position to not cover text 2022-03-13 01:38:48 -05:00
Gazook89 a6ede58d8e set dropdown items to appear *over* subsequent items
change navdropdown items to position:absolute; so they appear *over* the next metadata items, rather than pushing them down when dropdown is open.
2022-03-11 23:16:08 -06:00
Gazook89 3a82e2a24b fix *suppdorted* typo 2022-03-11 23:11:27 -06:00
Gazook89 28d45b89e0 set mask-image blends to fixed points
fixed blend points allows for different sized metadata panel without inadvertently masking text.
2022-03-11 23:10:50 -06:00
Gazook89 b1932dc8e4 Utilize dedent in URL paremeters 2022-03-10 22:08:19 -06:00
Gazook89 424bc9fa6e remove post title. add post text 2022-03-10 21:42:00 -06:00
G.Ambatte 156e697042 Initial pass: reset divider position on log out 2022-03-09 14:17:12 +13:00
G.Ambatte 535291a91a Add local_environments to configuration files
Add `local` parameter to global `config` object to avoid repeating tests
JWT key `secret` only added to global object `config` when local installation detected
2022-03-07 14:14:32 +13:00
G.Ambatte 7c2663fa56 Add passwordless login for local installs 2022-03-07 13:26:54 +13:00
Trevor Buckner 01087ca302 Add preview texture to dropdown options 2022-03-01 11:21:13 -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 da5ce35c3c Make themes work on /new 2022-02-11 00:32:05 -05:00
Trevor Buckner d35c5c2719 Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure 2022-02-10 23:36:41 -05:00
G.Ambatte a1876f16da Change icon for Brews page 2022-02-08 18:19:17 +13:00
G.Ambatte c4b0dd5aa6 Initial pass of Account dropdown + LogOut 2022-02-08 18:05:02 +13:00
Trevor Buckner 30b1aef8ba Make brewItems stand out a bit. 2022-02-06 18:54:09 -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
G.Ambatte 0b7fee0cc5 Add displayName properties 2022-02-05 19:10:18 +13:00
G.Ambatte 402301f201 Restore BrewItem action classNames 2022-02-05 19:04:53 +13:00