Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TeamBoosted/server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: TeamBoosted/server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 12 files changed
  • 1 contributor

Commits on Oct 16, 2018

  1. 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
    danielkang674 authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    9079996 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2018

  1. 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
    danielkang674 authored Oct 17, 2018
    Configuration menu
    Copy the full SHA
    07ec641 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. 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
    danielkang674 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    900945f View commit details
    Browse the repository at this point in the history
  2. Bug/auth callback (#62)

    * 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
    
    * 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
    
    * star route uses express static
    danielkang674 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    ce6da4b View commit details
    Browse the repository at this point in the history
  3. Mergemaster17 (#64)

    * 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 authored Oct 18, 2018
    Configuration menu
    Copy the full SHA
    278acd1 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Mergemaster21 (#69)

    * 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
    danielkang674 authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    bda8507 View commit details
    Browse the repository at this point in the history
Loading