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

Jump to bottom

Ari and Kirsten #18

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

Ari and Kirsten #18

wants to merge 62 commits into from

Commits on May 14, 2019

  1. initial setup

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    98e2f98 View commit details
    Browse the repository at this point in the history

  2. initial setup

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    d499294 View commit details
    Browse the repository at this point in the history

  3. resolved changes

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    8fa9c2f View commit details
    Browse the repository at this point in the history

  4. added customers and movies controllers

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    b5e75a1 View commit details
    Browse the repository at this point in the history

  5. zomg test route

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    50b604b View commit details
    Browse the repository at this point in the history

  6. updated routes

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    57b8f57 View commit details
    Browse the repository at this point in the history

  7. added tests for movies#show and movies#create

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    624971c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1 from kanderson38/movie_show_and_create 

    added tests for movies#show and movies#create
    @kanderson38
    kanderson38 authored May 14, 2019
    Configuration menu
    Copy the full SHA
    4066d05 View commit details
    Browse the repository at this point in the history

  9. movies and customers index

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    c757024 View commit details
    Browse the repository at this point in the history

  10. merging changes

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    47f6d36 View commit details
    Browse the repository at this point in the history

  11. merging again??

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    a36c20a View commit details
    Browse the repository at this point in the history

  12. available_inventory for movies

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    1cc81c1 View commit details
    Browse the repository at this point in the history

  13. available_inventory in movies#create

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    6daa837 View commit details
    Browse the repository at this point in the history

  14. passing all tests for movie create

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    967cbec View commit details
    Browse the repository at this point in the history

  15. added validations to movie model

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    48ef11d View commit details
    Browse the repository at this point in the history

  16. merging to get validations

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    57bf2a1 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'master' of https://github.com/kanderson38/VideoStoreAPI

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    797e7ba View commit details
    Browse the repository at this point in the history

  18. added available_inventory to json

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    97fd061 View commit details
    Browse the repository at this point in the history

  19. added available inventory to moviescontrolloer

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    025ee88 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' of https://github.com/kanderson38/VideoStoreAPI

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    d87b1d6 View commit details
    Browse the repository at this point in the history

  21. added column to customer

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    31d005f View commit details
    Browse the repository at this point in the history

  22. fixed failing tests in movie_test and customers_controller

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    0a24793 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' of https://github.com/kanderson38/VideoStoreAPI

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    b38b4af View commit details
    Browse the repository at this point in the history

  24. generated rentals

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    c844a85 View commit details
    Browse the repository at this point in the history

  25. added validation tests to movie model

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    44953a6 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'master' of https://github.com/kanderson38/VideoStoreAPI

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    1920de8 View commit details
    Browse the repository at this point in the history

  27. rentals routes

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    af5ebc9 View commit details
    Browse the repository at this point in the history

  28. validations for rentals

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    3cd4a2a View commit details
    Browse the repository at this point in the history

  29. checkout action

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    28e51be View commit details
    Browse the repository at this point in the history

  30. fixed checkout

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    1464dbf View commit details
    Browse the repository at this point in the history

  31. added default value to movies_checked_out_by_customer field

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    a85cee6 View commit details
    Browse the repository at this point in the history

  32. passing postman tests for checkout

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    108f25f View commit details
    Browse the repository at this point in the history

  33. added checkedin migration for rentals table

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    7c69fa3 View commit details
    Browse the repository at this point in the history

  34. added fixtures for rental and customer

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    4ed5fa8 View commit details
    Browse the repository at this point in the history

  35. added movies yml and began checkin function

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    93e1dbf View commit details
    Browse the repository at this point in the history

  36. rental tests

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    f871a4c View commit details
    Browse the repository at this point in the history

  37. adding tests for checkout rental method

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    8767202 View commit details
    Browse the repository at this point in the history

  38. merged from master

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    18efbd3 View commit details
    Browse the repository at this point in the history

  39. updated customers yml to add movies_checked_out column

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    a6096ff View commit details
    Browse the repository at this point in the history

  40. merged tests for checkin and checkout

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    367e28b View commit details
    Browse the repository at this point in the history

  41. more rentals testing

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    8b7bc9b View commit details
    Browse the repository at this point in the history

  42. resolving merge conflicts

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    afc9ebe View commit details
    Browse the repository at this point in the history

  43. passing controller tests for rentals#checkout

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    9c1e9b3 View commit details
    Browse the repository at this point in the history

  44. resolved merge conflicts in rentals_controller_test

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    d68b4a8 View commit details
    Browse the repository at this point in the history

  45. fixed references

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    2404ed0 View commit details
    Browse the repository at this point in the history

  46. merge conflict resolution

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    ff2846b View commit details
    Browse the repository at this point in the history

  47. checkin tests

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    ddfcdab View commit details
    Browse the repository at this point in the history

  48. created rental seeds

    @kanderson38
    kanderson38 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    a5af787 View commit details
    Browse the repository at this point in the history

  49. stashing changes to rentalscontroller

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    211be94 View commit details
    Browse the repository at this point in the history

  50. resolving changes in rentalscontroller

    @aribray
    aribray committed May 14, 2019
    Configuration menu
    Copy the full SHA
    9a4860d View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. sort customers

    @kanderson38
    kanderson38 committed May 15, 2019
    Configuration menu
    Copy the full SHA
    da0dfb7 View commit details
    Browse the repository at this point in the history

  2. update gemfile

    @kanderson38
    kanderson38 committed May 15, 2019
    Configuration menu
    Copy the full SHA
    312ea4b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/kanderson38/VideoStoreAPI

    @aribray
    aribray committed May 15, 2019
    Configuration menu
    Copy the full SHA
    eee9222 View commit details
    Browse the repository at this point in the history

  4. sort, paginate customers

    @kanderson38
    kanderson38 committed May 15, 2019
    Configuration menu
    Copy the full SHA
    3a333cc View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/kanderson38/VideoStoreAPI

    @aribray
    aribray committed May 15, 2019
    Configuration menu
    Copy the full SHA
    04f36f5 View commit details
    Browse the repository at this point in the history

  6. fixed rental validation test

    @aribray
    aribray committed May 15, 2019
    Configuration menu
    Copy the full SHA
    2cbdecd View commit details
    Browse the repository at this point in the history

  7. added error checking for invalid params and intitial tests for query … 

    …param features
    @aribray
    aribray committed May 15, 2019
    Configuration menu
    Copy the full SHA
    5bbd789 View commit details
    Browse the repository at this point in the history

  8. fleshed out controller tests for movie query parameters

    @aribray
    aribray committed May 15, 2019
    Configuration menu
    Copy the full SHA
    4cb1481 View commit details
    Browse the repository at this point in the history

  9. more testing in customer

    @kanderson38
    kanderson38 committed May 15, 2019
    Configuration menu
    Copy the full SHA
    e289189 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. added rental model validation and relationship tests

    @aribray
    aribray committed May 17, 2019
    Configuration menu
    Copy the full SHA
    1b8e728 View commit details
    Browse the repository at this point in the history

  2. added relationship test to movie model

    @aribray
    aribray committed May 17, 2019
    Configuration menu
    Copy the full SHA
    85ccd8f View commit details
    Browse the repository at this point in the history

  3. customer model test

    @kanderson38
    kanderson38 committed May 17, 2019
    Configuration menu
    Copy the full SHA
    45eecf9 View commit details
    Browse the repository at this point in the history