Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

&& Steffany & Nicoleta #13

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

&& Steffany & Nicoleta #13

wants to merge 49 commits into from

Commits on May 7, 2018

  1. set-up original rails project

    @nbrandolini
    nbrandolini committed May 7, 2018
    Configuration menu
    Copy the full SHA
    dd797ee View commit details
    Browse the repository at this point in the history

  2. added customer and movie models

    @steffnay
    steffnay committed May 7, 2018
    Configuration menu
    Copy the full SHA
    54e4095 View commit details
    Browse the repository at this point in the history

  3. added registered_at column to customers table

    @steffnay
    steffnay committed May 7, 2018
    Configuration menu
    Copy the full SHA
    c70e150 View commit details
    Browse the repository at this point in the history

  4. added customers and movies controllers

    @nbrandolini
    nbrandolini committed May 7, 2018
    Configuration menu
    Copy the full SHA
    ee40590 View commit details
    Browse the repository at this point in the history

  5. routes

    @steffnay
    steffnay committed May 7, 2018
    Configuration menu
    Copy the full SHA
    660b650 View commit details
    Browse the repository at this point in the history

  6. merge conflict resolved

    @steffnay
    steffnay committed May 7, 2018
    Configuration menu
    Copy the full SHA
    fb5e36a View commit details
    Browse the repository at this point in the history

  7. setup seed data

    @steffnay
    steffnay committed May 7, 2018
    Configuration menu
    Copy the full SHA
    32129f6 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

  1. index customerscontroller tests

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    3266fb2 View commit details
    Browse the repository at this point in the history

  2. changes

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    a6aa7d4 View commit details
    Browse the repository at this point in the history

  3. merge conflict resolved

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    d6c97e8 View commit details
    Browse the repository at this point in the history

  4. added tests for index moviecontroller

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    408ad30 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'videobranch'

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    6b13ed1 View commit details
    Browse the repository at this point in the history

  6. updated model validations

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    754b961 View commit details
    Browse the repository at this point in the history

  7. basic model tests

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    a677b53 View commit details
    Browse the repository at this point in the history

  8. updated schema

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    f00ef06 View commit details
    Browse the repository at this point in the history

  9. added routes for movie controller and create method show

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    3c19c9e View commit details
    Browse the repository at this point in the history

  10. Merge branch 'videobranch'

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    0c35866 View commit details
    Browse the repository at this point in the history

  11. added available_inventory parameter

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    cb67c55 View commit details
    Browse the repository at this point in the history

  12. added movies#create

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    a7bbef5 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/nbrandolini/VideoStoreAPI

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    3f8f09f View commit details
    Browse the repository at this point in the history

  14. updated seed file so movies available matches inventory

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    66a98d5 View commit details
    Browse the repository at this point in the history

  15. added tests for show moviecontrollers

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    9737b53 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'videobranch'

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    bf489ec View commit details
    Browse the repository at this point in the history

  17. added movies controller#create tests

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    16977fc View commit details
    Browse the repository at this point in the history

  18. resolved merge conflict

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    56e5eb6 View commit details
    Browse the repository at this point in the history

  19. tests for show moviescontroller done

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    cf11f32 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'videobranch'

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    a1d8850 View commit details
    Browse the repository at this point in the history

  21. updated movie_params so params are no longer nested

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    62a4c94 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'master' of https://github.com/nbrandolini/VideoStoreAPI

    @steffnay
    steffnay committed May 8, 2018
    Configuration menu
    Copy the full SHA
    21a2fd0 View commit details
    Browse the repository at this point in the history

  23. added movies_checked_out_count to customerscontroller

    @nbrandolini
    nbrandolini committed May 8, 2018
    Configuration menu
    Copy the full SHA
    a8372ec View commit details
    Browse the repository at this point in the history

Commits on May 9, 2018

  1. created rentals model

    @steffnay
    steffnay committed May 9, 2018
    Configuration menu
    Copy the full SHA
    98bd044 View commit details
    Browse the repository at this point in the history

  2. generated rental controller and methods

    @nbrandolini
    nbrandolini committed May 9, 2018
    Configuration menu
    Copy the full SHA
    a238727 View commit details
    Browse the repository at this point in the history

  3. added routes to rental controller

    @nbrandolini
    nbrandolini committed May 9, 2018
    Configuration menu
    Copy the full SHA
    6ded50d View commit details
    Browse the repository at this point in the history

  4. added check_out method to rentals controller

    @steffnay
    steffnay committed May 9, 2018
    Configuration menu
    Copy the full SHA
    d037aa2 View commit details
    Browse the repository at this point in the history

  5. added checkin method for rental

    @nbrandolini
    nbrandolini committed May 9, 2018
    Configuration menu
    Copy the full SHA
    2a65a92 View commit details
    Browse the repository at this point in the history

  6. changed routes to match postman

    @nbrandolini
    nbrandolini committed May 9, 2018
    Configuration menu
    Copy the full SHA
    05b59b6 View commit details
    Browse the repository at this point in the history

  7. fixed method for checkin

    @nbrandolini
    nbrandolini committed May 9, 2018
    Configuration menu
    Copy the full SHA
    4fad254 View commit details
    Browse the repository at this point in the history

  8. updated rentals controller tests and rentals model validations

    @steffnay
    steffnay committed May 9, 2018
    Configuration menu
    Copy the full SHA
    a06c188 View commit details
    Browse the repository at this point in the history

  9. updated checkout method

    @steffnay
    steffnay committed May 9, 2018
    Configuration menu
    Copy the full SHA
    3f63920 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. updated rentals controller tests

    @steffnay
    steffnay committed May 10, 2018
    Configuration menu
    Copy the full SHA
    043c7d7 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2018

  1. updated rental methods

    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    23ebe97 View commit details
    Browse the repository at this point in the history

  2. adjusted rentals controller and customer model to check that customer… 

    … movies_checked_out_count is updating. It looks like it is but smoke test is still failing
    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    adf6ffe View commit details
    Browse the repository at this point in the history

  3. updated check in and check out methods

    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    f1fc453 View commit details
    Browse the repository at this point in the history

  4. deleted unsed customer model method

    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    fb8416f View commit details
    Browse the repository at this point in the history

  5. fixed test customer controller

    @nbrandolini
    nbrandolini committed May 11, 2018
    Configuration menu
    Copy the full SHA
    a650448 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/nbrandolini/VideoStoreAPI

    @nbrandolini
    nbrandolini committed May 11, 2018
    Configuration menu
    Copy the full SHA
    9b282dd View commit details
    Browse the repository at this point in the history

  7. updated rental model test

    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    a7c1099 View commit details
    Browse the repository at this point in the history

  8. removed error migration

    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    f80c2e5 View commit details
    Browse the repository at this point in the history

  9. added rentals check-in testing

    @steffnay
    steffnay committed May 11, 2018
    Configuration menu
    Copy the full SHA
    7475fcc View commit details
    Browse the repository at this point in the history