f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 20:42:43 +00:00
Code Wiki Activity
1,219 Commits 108 Branches 39 Tags
6573ada881ff671bfcb7dfb540bec67ee1fc69ab
Commit Graph

1219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
G.Ambatte
6573ada881 Eliminate hanging comma 2021-08-17 19:25:39 +12:00
G.Ambatte
2a7bde7e44 Eliminate spacer div in BrewItem 2021-08-17 19:05:30 +12:00
G.Ambatte
eca58bb27e Push pageCount to NewPage and EditPage 2021-08-17 19:05:30 +12:00
G.Ambatte
2e68cd77fa Add a page count to User page 2021-08-17 19:03:23 +12:00
G.Ambatte
f1d19d2d63 Eliminate spacer div in BrewItem 2021-08-17 18:01:07 +12:00
G.Ambatte
a13759130d Push pageCount to NewPage and EditPage 2021-08-17 17:36:26 +12:00
G.Ambatte
a99cf75b2e Lint fix. 2021-08-17 17:07:19 +12:00
G.Ambatte
3b7a52a60f Update client/homebrew/pages/userPage/brewItem/brewItem.jsx 
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
 2021-08-17 16:02:50 +12:00
G.Ambatte
6489a29436 Update server/googleActions.js 
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
 2021-08-17 15:51:05 +12:00
G.Ambatte
c907d32779 Update server/googleActions.js 
Co-authored-by: Trevor Buckner <calculuschild@gmail.com>
 2021-08-17 15:50:40 +12:00
G.Ambatte
3a2477949b Resolve merge conflict 2021-08-15 21:19:09 +12:00
G.Ambatte
1edc62d023 Hide pageCount on User Page if the brew only has one page 2021-08-15 21:02:56 +12:00
G.Ambatte
7b0f5cec97 Add support for Google Brews. 2021-08-15 21:02:46 +12:00
G.Ambatte
f0a0c0c11d Add a page count to User page 2021-08-15 21:00:17 +12:00
G.Ambatte
3489a76a1d Hide pageCount on User Page if the brew only has one page 2021-08-15 20:32:23 +12:00
G.Ambatte
3cf05e551f Add support for Google Brews. 2021-08-15 20:17:50 +12:00
Trevor Buckner
ec92a0307b Merge pull request #1562 from Gazook89/Page-Snippet-Menu 
Editor-Specific Snippet Groups, and Print Snippet Menu Changes
 2021-08-15 00:45:47 -04:00
Trevor Buckner
edce4e5bbc Refactoring switching logic, formatting LESS 2021-08-15 00:45:01 -04:00
Trevor Buckner
d853643874 Inherit colors 2021-08-14 23:40:38 -04:00
Trevor Buckner
28884d6774 Merge pull request #1509 from Gazook89/v3-Artist-Snippet 
Add Artist Credit Snippet
 2021-08-14 23:22:23 -04:00
Trevor Buckner
8f7d6a3eb5 Update color, snippet positioning, added into v3 Image and BackgroundImage 2021-08-14 23:21:13 -04:00
Trevor Buckner
58568468f6 Fix font in v3. Clean up LESS formatting. 2021-08-14 00:52:35 -04:00
Trevor Buckner
53de59940f Merge pull request #1561 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.7 
Bump mongoose from 5.13.6 to 5.13.7
 2021-08-13 20:34:56 -04:00
dependabot[bot]
4588e02faf Bump mongoose from 5.13.6 to 5.13.7 
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.6 to 5.13.7.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/commits/5.13.7)

---
updated-dependencies:
- dependency-name: mongoose
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 19:03:49 +00:00
Trevor Buckner
bd5b3fa6e9 Merge pull request #1567 from naturalcrit/dependabot/npm_and_yarn/nanoid-3.1.25 
Bump nanoid from 3.1.23 to 3.1.25
 2021-08-13 15:02:46 -04:00
Trevor Buckner
9dc6d2532a Drastic simplification of SpanTables via better regex 
Thanks @ericscheid for finding a good regex!
 2021-08-13 14:38:43 -04:00
dependabot[bot]
6c68502d03 Bump nanoid from 3.1.23 to 3.1.25 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.1.25.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.1.25)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-13 03:00:59 +00:00
Gazook89
88c485ffe5 circleCI fix 
hopefully last one..

circleCI fixes

circleCI fixes
 2021-08-12 21:23:21 -05:00
Gazook89
562bf6d4ac Fix to snippets.js both legacy and v3 for CircleCI 2021-08-12 07:45:00 -05:00
Gazook89
807f865d8b Match Legacy snippets to v3, remove <style> from style snippets 
- Matched the Legacy snippets to v3, with appropriate syntax.
- Small adjustments to Ink Friendly snippet (retains images, reduces drop shadows, sets more backgrounds to White)
- Adds commented snippet 'titles' for Page snippets
 2021-08-12 07:42:08 -05:00
Gazook89
50c07a5c8e Change 'print' to 'page' on Legacy snippet.js 
Tiny fix to change "Print" menu to "Page" menu on Legacy.
 2021-08-12 07:00:51 -05:00
Gazook89
3545bdc586 Update snippetbar.jsx with filter for editor/view specific menus 
Add logic to filter available snippet menus based on the view/editor that is open ("text" vs "style") for both Legacy and v3.
 2021-08-12 06:59:55 -05:00
Gazook89
3d9f8ea142 Update snippet.js 'editor' to 'view' 
Change new property 'editor' to 'view'  on  @calculuschild 's recommendation.
 2021-08-12 06:01:48 -05:00
Trevor Buckner
9726fb5666 Merge pull request #1558 from naturalcrit/GoogleExpiredNotification 
Popup error when gDrive credentials are expired on both /edit and /new
 2021-08-12 00:08:59 -04:00
Trevor Buckner
db22725687 New fix to table regex. Avoids ReDOS issues. 2021-08-12 00:06:56 -04:00
Gazook89
69a69bbb82 Add 'editor' property to snippets.js 
Add another property to the snippet groups, "editor", with values either "text" or "style".
 2021-08-11 21:44:39 -05:00
Trevor Buckner
0075b0836a Popup error when gDrive credentials are expired on both /edit and /new 2021-08-11 15:36:57 -04:00
Trevor Buckner
77d447c0a3 Fix redundant Codemirror hotkeys 2021-08-11 12:54:18 -04:00
Trevor Buckner
a48c74b2e7 Replace Regex Lookbehind with obnoxious workaround so Safari doesn't break 2021-08-10 23:42:46 -04:00
Gazook89
a63949636e Update Ink Friendly snippet for v3 
updated the ink friendly snippet so that it points to elements like .monster rather than hr+blockquote.

Goes further than original snippet by setting white background for monster, note, descriptive blocks.

Did not update Legacy.
 2021-08-10 22:02:46 -05:00
Gazook89
9a44cc04b1 Add Square Page snippet 
Add a snippet to Print menu (renamed to "Page") for a square page.  Reduces padding and removes columns as well.
 2021-08-10 21:46:47 -05:00
Gazook89
79fa0dbe77 Fix font-family values for legacy/v3 2021-08-10 13:45:30 -05:00
Gazook89
9120c1d0eb Merge branch 'master' into v3-Artist-Snippet 2021-08-10 13:34:26 -05:00
Gazook89
a46370b81e Merge branch 'master' into v3-Artist-Snippet 2021-08-10 13:32:35 -05:00
Trevor Buckner
3cf5dc74bb update Patreon link in homepage 2021-08-10 00:53:48 -04:00
Trevor Buckner
a351e2a118 Merge pull request #1540 from naturalcrit/dependabot/npm_and_yarn/mongoose-5.13.6 
Bump mongoose from 5.13.5 to 5.13.6
 2021-08-09 23:11:15 -04:00
dependabot[bot]
4a2b9bd662 Bump mongoose from 5.13.5 to 5.13.6 
Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.5 to 5.13.6.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/commits)

---
updated-dependencies:
- dependency-name: mongoose
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-10 03:00:42 +00:00
Trevor Buckner
82355f0175 Merge pull request #1539 from naturalcrit/v2.13.3 
up version to 2.13.3
 2021-08-09 22:48:45 -04:00
Trevor Buckner
965645f1e6 up version to 2.13.3 2021-08-09 22:47:19 -04:00
Trevor Buckner
79e05b1665 Merge pull request #1534 from G-Ambatte/addMetaToLocalStorage-#1498 
Save Renderer data in LocalStorage and GoogleDrive
 2021-08-09 22:08:52 -04:00