Merged
Conversation
* staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing
* Readme * Devops circleci and rebuild prune
* started watson * staging changes
* starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route
* merge conflict with rebuild * Get books by Genre and Change XML to JSON node module
Bug/broke everything
* merge conflict with rebuild * ENV for DB production
* fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data
* Filtering complete * added redis to tv
* Filtering complete * added redis to tv * added package * Added flexible limiting function for data
* merge conflict with rebuild * should be fixed
* Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route
…ug/authCallback
danielkang674
added a commit
that referenced
this pull request
Oct 18, 2018
* merge conflict with rebuild * Mergemaster13 (#49) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Mergemaster15 (#57) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * Bug/auth callback (#60) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * star route uses express static
danielkang674
added a commit
that referenced
this pull request
Oct 18, 2018
* Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Bug/auth callback (#59) * merge conflict with rebuild * Mergemaster13 (#49) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Mergemaster15 (#57) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * Bug/auth callback (#61) * merge conflict with rebuild * Mergemaster13 (#49) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Mergemaster15 (#57) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * Bug/auth callback (#60) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * star route uses express static * Feature/watson (#63) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * working user Profile * working wtason integration recs
danielkang674
added a commit
that referenced
this pull request
Oct 19, 2018
* Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Bug/auth callback (#59) * merge conflict with rebuild * Mergemaster13 (#49) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Mergemaster15 (#57) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * Bug/auth callback (#61) * merge conflict with rebuild * Mergemaster13 (#49) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Mergemaster15 (#57) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * Bug/auth callback (#60) * Readme * Feautre/redis caching (#33) * staging changes for merge * Added redis caching for server * added online caching * removed uncessary redis connection * fixing for PR * fixed tests * bug fixing * Devops circleci and rebuild prune * Refactor/devops prune (#34) * Readme * Devops circleci and rebuild prune * circle ci to docker cloud * indent * no pulling * deploy and wget rebuild * Feature/api db testing (#41) * started watson * staging changes * Feature/good reads (#42) * starting work on goodReads * added book routes and formatters * added and fixed ability to get recs based off of tv shows. * added watson skeleton service and route * fixed recs rendering on login (#43) * merge conflict with rebuild * merge conflict with rebuild (#44) * Feature/book recs by genre (#45) * merge conflict with rebuild * Get books by Genre and Change XML to JSON node module * stagin changes * added getByGenre for all mediums * Filtering complete (#47) * Refactor/production links (#48) * merge conflict with rebuild * ENV for DB production * Feature/watson (#50) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * Feature/redis for tv (#51) * Filtering complete * added redis to tv * Feature/limit data (#53) * Filtering complete * added redis to tv * added package * Added flexible limiting function for data * Bug/fixinfiniteloop (#54) * merge conflict with rebuild * should be fixed * Feature/more redis (#55) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * Callback redirect to home route * star route uses express static * Feature/watson (#63) * fixed recs rendering on login * working watson connection with dummy data. Added vuechartjs * working watson with live data * working user Profile * working wtason integration recs * Refactor/destroy console logs (#66) * merge conflict with rebuild * Destroy console logs * Refactor/mix recs (#67) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * stashing * staging for changes * moved some logic from server to client * Refactor/formatting (#68) * Filtering complete * added redis to tv * added package * added redis chachin route * lol more console.log * changed limiting function and added cache route * stashing * staging for changes * moved some logic from server to client * changed formatting * remove logs
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.