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

Carets -- Maria & Sara #4

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

Carets -- Maria & Sara #4

wants to merge 18 commits into from

Commits on Dec 18, 2017

  1. added movie model and collection, views for both, add underscore temp… 

    …late for movielistview
    @mariamcgrew
    mariamcgrew committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    855630e View commit details
    Browse the repository at this point in the history

  2. list of titles rendered from library movies

    @SaraChandler
    SaraChandler committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    fdc4c36 View commit details
    Browse the repository at this point in the history

  3. added search bar and button to html

    @mariamcgrew
    mariamcgrew committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    913571d View commit details
    Browse the repository at this point in the history

  4. added function getMovie, not working yet

    @mariamcgrew
    mariamcgrew committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    b85a80e View commit details
    Browse the repository at this point in the history

  5. trying to fix merge conflicts

    @SaraChandler
    SaraChandler committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    0627792 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/SaraChandler/VideoStoreCo… 

    …nsumer
    @SaraChandler
    SaraChandler committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    3783c13 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. added searchDbList function, moved fetch to app.js, added searchUrl t… 

    …o the collection
    @mariamcgrew
    mariamcgrew committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    4ebda97 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/SaraChandler/VideoStoreCo… 

    …nsumer
    @mariamcgrew
    mariamcgrew committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    c8c5016 View commit details
    Browse the repository at this point in the history

  3. moved allMoviesList to movie list views

    @mariamcgrew
    mariamcgrew committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    7d21074 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'maria'

    @mariamcgrew
    mariamcgrew committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    f10f53e View commit details
    Browse the repository at this point in the history

  5. attempting refactoring of collection fetch

    @SaraChandler
    SaraChandler committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    d47771a View commit details
    Browse the repository at this point in the history

  6. fix merge conflict

    @SaraChandler
    SaraChandler committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    9de060a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. added search view and search list view

    @SaraChandler
    SaraChandler committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    87489a7 View commit details
    Browse the repository at this point in the history

  2. fixed get results event function

    @mariamcgrew
    mariamcgrew committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    f8ea29b View commit details
    Browse the repository at this point in the history

  3. starting merge

    @SaraChandler
    SaraChandler committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    1f5d050 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/SaraChandler/VideoStoreCo… 

    …nsumer
    @SaraChandler
    SaraChandler committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    75e37bf View commit details
    Browse the repository at this point in the history

  5. adding movie to list works

    @SaraChandler
    SaraChandler committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    7319066 View commit details
    Browse the repository at this point in the history

  6. cleaned up extra code

    @SaraChandler
    SaraChandler committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    84e2848 View commit details
    Browse the repository at this point in the history