Updating develop branch #71
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Big Merge in
…tructions, migrating id's
Implementing effects of local settings, fixing literature not appearing
* linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * updating package number and database infra * progressing lint action
* linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * Squashed commit of the following: commit fa7e200 Author: Jimmy Paolini <[email protected]> Date: Tue Jul 13 22:29:34 2021 -0400 v1.2.0 (#50) * linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * updating package number and database infra * progressing lint action * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * linting and formatting implementation * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * fixing merge issues * fixing package-lock
* linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * Squashed commit of the following: commit fa7e200 Author: Jimmy Paolini <[email protected]> Date: Tue Jul 13 22:29:34 2021 -0400 v1.2.0 (#50) * linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * updating package number and database infra * progressing lint action * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * linting and formatting implementation * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * fixing merge issues * fixing package-lock * Fixing snackbar action stacking on small screens * reverting snackbars to non persistent * Suring up logging infra, fully implementing custom literature local * Custom texts working initially, more testing needed before release * fixing so that that user custom texts don't appear after logging out * Adding CTA subheader to login card * Implementing custom literature menu hover away close, and alphabetizing user custom texts by title * Fixing oauth login bug when using local docker environment * Testing and tidying migration for deployment * Fixing final bugs, tidying up helpful sql statements * Fixing more merge conflicts * Fixing the bottom padding on declined/conjugated entries, renaming server auth folder
* linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * Squashed commit of the following: commit fa7e200 Author: Jimmy Paolini <[email protected]> Date: Tue Jul 13 22:29:34 2021 -0400 v1.2.0 (#50) * linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * updating package number and database infra * progressing lint action * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * linting and formatting implementation * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * fixing merge issues * fixing package-lock * Fixing snackbar action stacking on small screens * reverting snackbars to non persistent * Suring up logging infra, fully implementing custom literature local * Custom texts working initially, more testing needed before release * fixing so that that user custom texts don't appear after logging out * Adding CTA subheader to login card * Implementing custom literature menu hover away close, and alphabetizing user custom texts by title * Fixing oauth login bug when using local docker environment * Testing and tidying migration for deployment * Fixing final bugs, tidying up helpful sql statements * Fixing more merge conflicts * Fixing the bottom padding on declined/conjugated entries, renaming server auth folder * Attempting login bug fix
* linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * Squashed commit of the following: commit fa7e200 Author: Jimmy Paolini <[email protected]> Date: Tue Jul 13 22:29:34 2021 -0400 v1.2.0 (#50) * linting and formatting implementation * fixing glob-parent dependency vulnerability * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * adding translation search * updating package number and database infra * progressing lint action * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * linting and formatting implementation * Bugs from linting/formatting fixed, grammar page begun * grammar cards, fixed logging, EFK stack working, monitoring * Bug fixing, adding Google analytics, beginning on custom literature implementation * Google analytics, improving search performance * Improving SEO with title and meta tags * fixing local bookmarks bug, fixing literature fallback bug, attempting performance improvements * Solidifying k8s arch, fixing single search bug, fixing google analytics, enhancing reader url paths * fixing merge issues * fixing package-lock * Fixing snackbar action stacking on small screens * reverting snackbars to non persistent * Suring up logging infra, fully implementing custom literature local * Custom texts working initially, more testing needed before release * fixing so that that user custom texts don't appear after logging out * Adding CTA subheader to login card * Implementing custom literature menu hover away close, and alphabetizing user custom texts by title * Fixing oauth login bug when using local docker environment * Testing and tidying migration for deployment * Fixing final bugs, tidying up helpful sql statements * Fixing more merge conflicts * Fixing the bottom padding on declined/conjugated entries, renaming server auth folder * Attempting login bug fix * Second attempt to fix login issue
This reverts commit bc841f9.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trying to follow git-flow branching model