Code

Carets -- Maria & Sara#4

Code

Open

SaraChandler wants to merge 18 commits intoAda-C8:masterAda-C8/VideoStoreConsumer:masterfrom SaraChandler:masterSaraChandler/VideoStoreConsumer:masterCopy head branch name to clipboard

+196-6

Commits

Commits on Dec 18, 2017

• added movie model and collection, views for both, add underscore template for movielistview

  mariamcgrew

  committed
  855630e

  Copy full SHA for 855630e

• list of titles rendered from library movies

  SaraChandler

  committed
  fdc4c36

  Copy full SHA for fdc4c36

• added search bar and button to html

  mariamcgrew

  committed
  913571d

  Copy full SHA for 913571d

• added function getMovie, not working yet

  mariamcgrew

  committed
  b85a80e

  Copy full SHA for b85a80e

• trying to fix merge conflicts

  SaraChandler

  committed
  0627792

  Copy full SHA for 0627792

• Merge branch 'master' of https://github.com/SaraChandler/VideoStoreConsumer

  SaraChandler

  committed
  3783c13

  Copy full SHA for 3783c13

Commits on Dec 19, 2017

• added searchDbList function, moved fetch to app.js, added searchUrl to the collection

  mariamcgrew

  committed
  4ebda97

  Copy full SHA for 4ebda97

• Merge branch 'master' of https://github.com/SaraChandler/VideoStoreConsumer

  mariamcgrew

  committed
  c8c5016

  Copy full SHA for c8c5016

• moved allMoviesList to movie list views

  mariamcgrew

  committed
  7d21074

  Copy full SHA for 7d21074

• Merge branch 'maria'

  mariamcgrew

  committed
  f10f53e

  Copy full SHA for f10f53e

• attempting refactoring of collection fetch

  SaraChandler

  committed
  d47771a

  Copy full SHA for d47771a

• fix merge conflict

  SaraChandler

  committed
  9de060a

  Copy full SHA for 9de060a

Commits on Dec 20, 2017

• added search view and search list view

  SaraChandler

  committed
  87489a7

  Copy full SHA for 87489a7

• fixed get results event function

  mariamcgrew

  committed
  f8ea29b

  Copy full SHA for f8ea29b

• starting merge

  SaraChandler

  committed
  1f5d050

  Copy full SHA for 1f5d050

• Merge branch 'master' of https://github.com/SaraChandler/VideoStoreConsumer

  SaraChandler

  committed
  75e37bf

  Copy full SHA for 75e37bf

• adding movie to list works

  SaraChandler

  committed
  7319066

  Copy full SHA for 7319066

• cleaned up extra code

  SaraChandler

  committed
  84e2848

  Copy full SHA for 84e2848