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/database
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: TeamBoosted/database
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.
  • 7 commits
  • 6 files changed
  • 3 contributors

Commits on Oct 9, 2018

  1. Merge pull request #6 from TeamBoosted/mergemaster 

    Mergemaster
    @WalkerJG33
    WalkerJG33 authored Oct 9, 2018
    Configuration menu
    Copy the full SHA
    dc7abcc View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. Merge branch 'master' of https://github.com/TeamBoosted/database into… 

    … mergemaster3
    @danielkang674
    danielkang674 committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    314efe2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from TeamBoosted/mergemaster3 

    Mergemaster3
    @WalkerJG33
    WalkerJG33 authored Oct 10, 2018
    Configuration menu
    Copy the full SHA
    5c58c29 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Mergemaster10 (#21) 

    * added genres tables, queries, and working incrementing

* working on incrementing

* working increment functionality

* working incremntal genre relationship between user and genres. unique genres are good

* Added that muthafuckin function work baby

* Found missing function

* Implemented getTopGenres on db and db server (#12)

* Got array of books from genre

* Feature/server db api (#13)

* Implemented getTopGenres on db and db server

* Implemented Medium to Genre

* Staging final changes

* Got individual books data

* Add genres file

* Make Book table

* save 1 book change to Upsert

* added medium-genre relations (#14)

* added medium-genre relations

* Removed token

* Add 5 books to db

* Add book, genre, and join table

* fixed addingMediums that already existed to new users

* CI/CD

* Circle CI

* Rebuild script tweak

* Remove Docker pull

* Docker pull again

* Get all books by genre ID (#20)

* Get all books by genre ID

* Rename to genre_id
    @danielkang674
    danielkang674 authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    c038a9f View commit details
    Browse the repository at this point in the history

  2. Mergemaster11 (#23) 

    * added genres tables, queries, and working incrementing

* working on incrementing

* working increment functionality

* working incremntal genre relationship between user and genres. unique genres are good

* Added that muthafuckin function work baby

* Found missing function

* Implemented getTopGenres on db and db server (#12)

* Got array of books from genre

* Feature/server db api (#13)

* Implemented getTopGenres on db and db server

* Implemented Medium to Genre

* Staging final changes

* Got individual books data

* Add genres file

* Make Book table

* save 1 book change to Upsert

* added medium-genre relations (#14)

* added medium-genre relations

* Removed token

* Add 5 books to db

* Add book, genre, and join table

* fixed addingMediums that already existed to new users

* CI/CD

* Circle CI

* Rebuild script tweak

* Remove Docker pull

* Docker pull again

* Get all books by genre ID (#20)

* Get all books by genre ID

* Rename to genre_id

* Rebuild remove -t flag (#22)
    @danielkang674
    danielkang674 authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    a6831d6 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2018

  1. Mergemaster15 (#27) 

    * added genres tables, queries, and working incrementing

* working on incrementing

* working increment functionality

* working incremntal genre relationship between user and genres. unique genres are good

* Added that muthafuckin function work baby

* Found missing function

* Implemented getTopGenres on db and db server (#12)

* Got array of books from genre

* Feature/server db api (#13)

* Implemented getTopGenres on db and db server

* Implemented Medium to Genre

* Staging final changes

* Got individual books data

* Add genres file

* Make Book table

* save 1 book change to Upsert

* added medium-genre relations (#14)

* added medium-genre relations

* Removed token

* Add 5 books to db

* Add book, genre, and join table

* Staging for updates

* fixed addingMediums that already existed to new users

* CI/CD

* Circle CI

* Rebuild script tweak

* Remove Docker pull

* Docker pull again

* Get all books by genre ID (#20)

* Get all books by genre ID

* Rename to genre_id

* Rebuild remove -t flag (#22)

* Implemented route and DB fucntion to get all Media by user

* fix books (#25)
    @danielkang674
    danielkang674 authored Oct 17, 2018
    Configuration menu
    Copy the full SHA
    7668262 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Mergemaster22 (#32) 

    * added genres tables, queries, and working incrementing

* working on incrementing

* working increment functionality

* working incremntal genre relationship between user and genres. unique genres are good

* Added that muthafuckin function work baby

* Found missing function

* Implemented getTopGenres on db and db server (#12)

* Got array of books from genre

* Feature/server db api (#13)

* Implemented getTopGenres on db and db server

* Implemented Medium to Genre

* Staging final changes

* Got individual books data

* Add genres file

* Make Book table

* save 1 book change to Upsert

* added medium-genre relations (#14)

* added medium-genre relations

* Removed token

* Add 5 books to db

* Add book, genre, and join table

* Staging for updates

* fixed addingMediums that already existed to new users

* CI/CD

* Circle CI

* Rebuild script tweak

* Remove Docker pull

* Docker pull again

* Get all books by genre ID (#20)

* Get all books by genre ID

* Rename to genre_id

* Rebuild remove -t flag (#22)

* Implemented route and DB fucntion to get all Media by user

* fix books (#25)

* Destroy console logs (#28)

* updated at desc (#29)

* yerp (#30)

* remove console log (#31)
    @danielkang674
    danielkang674 authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    ca1ea77 View commit details
    Browse the repository at this point in the history
Loading