Sara, Amy, Nkiru - Pipes - VideoStore#19

Open

nkiruka wants to merge 34 commits into

Ada-C8:masterfrom

Commits on Dec 18, 2017

Set up movie and movie_list models and views, as well as app.js
cashmonger
committed
More set-up
cashmonger
committed
created base html
Sara Frandsen
committed
Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer
Sara Frandsen
committed
renders a list of all movies when a button is clicked
Sara Frandsen
committed

Commits on Dec 19, 2017

movies visible
nkiruka
committed
css file
Sara Frandsen
committed
Added HTML Template
cashmonger
committed
add some basic html styling to index
Sara Frandsen
committed
Set up movie list view
cashmonger
committed
show movies button works, raises header
Sara Frandsen
committed
show/add search form
Sara Frandsen
committed
Successfully display all movies
cashmonger
committed
animate header font size
Sara Frandsen
committed
Successfully retrieve movies from API
cashmonger
committed

Commits on Dec 20, 2017

Add event listener for add movie button
cashmonger
committed
display inline
Sara Frandsen
committed
resolve merge conflicts
Sara Frandsen
committed
Final
cashmonger
committed
Fix merge conflict
cashmonger
committed
resolve more merge conflicts
Sara Frandsen
committed
Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer
Sara Frandsen
committed
Merge conflicts
cashmonger
committed
Fix merge conflict
cashmonger
committed
slideToggle for search form
Sara Frandsen
committed
animate bar to shrink and show a search bar
Sara Frandsen
committed
Merge branch 'master' of https://github.com/nkiruka/VideoStoreConsumer
Sara Frandsen
committed
inline search bar
Sara Frandsen
committed
slide up movie list
Sara Frandsen
committed
add title to nav bar
Sara Frandsen
committed

Commits on Dec 21, 2017

change div to li for movie list view
Sara Frandsen
committed
styling changes
Sara Frandsen
committed
final css
Sara Frandsen
committed
resolve merge conflicts
Sara Frandsen
committed