Trevor Buckner
8153bf7952
Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure
2022-05-18 16:21:20 -04:00
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
f71dc004c0
Themes list to use object instead of array.
2022-04-15 17:17:13 -04:00
G.Ambatte
b2bcc9ef95
Shift to logical OR operator
...
(cherry picked from commit 0fb0f4b6b0
2022-04-14 13:59:42 +12:00
G.Ambatte
a73b3648ae
Update editPage links to use publicUrl
2022-04-13 19:40:33 +12:00
G.Ambatte
0e25793f0a
Add publicUrl to global.config & update template
2022-04-13 19:35:51 +12:00
G.Ambatte
3ad6f1d794
Switch from nullish coalescing operator to ternary operator to correct unexpected behaviour
...
Change meta type from website to article based on feedback
2022-04-13 17:19:45 +12:00
G.Ambatte
de977b3b94
Make local login route conditional and rename
2022-04-13 14:49:16 +12:00
G.Ambatte
0999125678
Update client/homebrew/navbar/account.navitem.jsx
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2022-04-13 14:30:49 +12:00
G.Ambatte
ad8d5bd8a0
Merge branch 'master' into addLocalLogin-#269
2022-04-13 14:30:02 +12:00
G.Ambatte
5d3fe719b3
Remove errant semicolon
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2022-04-13 14:26:25 +12:00
G.Ambatte
85312859d2
Change props.publicUrl fallback behavior
2022-04-13 14:15:26 +12:00
G.Ambatte
1bdd08f878
Shift JWT generation to app.js
2022-04-13 12:40:16 +12:00
G.Ambatte
0023e87d54
Whitespace fix
2022-04-13 12:37:50 +12:00
G.Ambatte
42878ea99d
Merge branch 'master' into addMetadata-#820
2022-04-13 09:13:37 +12:00
G.Ambatte
16ae32b881
Move default URL check to app.js
2022-04-13 09:12:48 +12:00
G.Ambatte
f3ee95f9db
Update client/template.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2022-04-13 08:24:33 +12:00
G.Ambatte
af950159e0
Update client/template.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2022-04-13 08:24:25 +12:00
G.Ambatte
46eaad1226
Update client/template.js
...
Co-authored-by: Trevor Buckner <calculuschild@gmail.com >
2022-04-13 08:24:19 +12:00
Trevor Buckner
0a05f37774
Merge pull request #2119 from jeddai/google-transfer-api
...
fix deletion request
2022-04-06 12:18:04 -04:00
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
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
