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

Sara, Amy, Nkiru - Pipes - VideoStore #19

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

Sara, Amy, Nkiru - Pipes - VideoStore #19

wants to merge 34 commits into from

Commits on Dec 18, 2017

  1. Set up movie and movie_list models and views, as well as app.js

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

  2. More set-up

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

  3. created base html

    Sara Frandsen committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    d711348 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer

    Sara Frandsen committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    a4eaa5c View commit details
    Browse the repository at this point in the history

  5. renders a list of all movies when a button is clicked

    Sara Frandsen committed Dec 18, 2017
    Configuration menu
    Copy the full SHA
    079c6f7 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. movies visible

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

  2. css file

    Sara Frandsen committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    63beb13 View commit details
    Browse the repository at this point in the history

  3. Added HTML Template

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

  4. add some basic html styling to index

    Sara Frandsen committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    67dadce View commit details
    Browse the repository at this point in the history

  5. Set up movie list view

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

  6. show movies button works, raises header

    Sara Frandsen committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    1236ce2 View commit details
    Browse the repository at this point in the history

  7. show/add search form

    Sara Frandsen committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    843e66a View commit details
    Browse the repository at this point in the history

  8. Successfully display all movies

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

  9. animate header font size

    Sara Frandsen committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    18ae9c4 View commit details
    Browse the repository at this point in the history

  10. Successfully retrieve movies from API

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

Commits on Dec 20, 2017

  1. Add event listener for add movie button

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

  2. display inline

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    e8ca2e8 View commit details
    Browse the repository at this point in the history

  3. resolve merge conflicts

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    2450026 View commit details
    Browse the repository at this point in the history

  4. Final

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

  5. Fix merge conflict

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

  6. resolve more merge conflicts

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    1ed88be View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    aefb5f5 View commit details
    Browse the repository at this point in the history

  8. Merge conflicts

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

  9. Fix merge conflict

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

  10. slideToggle for search form

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    8ff6088 View commit details
    Browse the repository at this point in the history

  11. animate bar to shrink and show a search bar

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    8488eb0 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    91a8896 View commit details
    Browse the repository at this point in the history

  13. inline search bar

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    a0a5711 View commit details
    Browse the repository at this point in the history

  14. slide up movie list

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    a786b26 View commit details
    Browse the repository at this point in the history

  15. add title to nav bar

    Sara Frandsen committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    2f81fd2 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2017

  1. change div to li for movie list view

    Sara Frandsen committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    71d1cd7 View commit details
    Browse the repository at this point in the history

  2. styling changes

    Sara Frandsen committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    004a987 View commit details
    Browse the repository at this point in the history

  3. final css

    Sara Frandsen committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    03d313e View commit details
    Browse the repository at this point in the history

  4. resolve merge conflicts

    Sara Frandsen committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    577813f View commit details
    Browse the repository at this point in the history