Code

Hrw/master - wave 3 PR#47

Code

Open

yourFriendWes wants to merge 30 commits intoAda-C4:hrw/masterAda-C4/MediaRanker:hrw/masterfrom yourFriendWes:hrw/masteryourFriendWes/MediaRanker:hrw/masterCopy head branch name to clipboard

+834-15

Commits

Commits on Dec 1, 2015

• generate models for books,movies,albums

  yourFriendWes

  committed
  21fbb41

• generate controllers and routes for movie,book,album

  yourFriendWes

  committed
  e9259ff

• add root route and welcome controller

  yourFriendWes

  committed
  d98df6b

• add empty methods for each controller and empty views for albums

  yourFriendWes

  committed
  9b3a548

• add index template within album, no data yet

  yourFriendWes

  committed
  8648e3c

Commits on Dec 2, 2015

• fix naming bugs in controller, add method and view for new album

  yourFriendWes

  committed
  16bac87

• add mockup of welcome page

  yourFriendWes

  committed
  f307cb7

• add bootstrap to app

  yourFriendWes

  committed
  877b1db

• add welcome index method

  yourFriendWes

  committed
  0ed8fab

• add button to add new album

  yourFriendWes

  committed
  f78feae

• add book methods and views that render album views as template

  yourFriendWes

  committed
  0a78212

• add movie methods and views that render album views as template

  yourFriendWes

  committed
  f6424bf

Commits on Dec 3, 2015

• create show method for album

  yourFriendWes

  committed
  b51dfd6

• install rspec

  yourFriendWes

  committed
  c3f667c

• add rspec files for each controller

  yourFriendWes

  committed
  24e6d36

• add styling and fix bug in upvote button

  yourFriendWes

  committed
  cfb8407

• so many things

  yourFriendWes

  committed
  a9a38d0

• add edit method and button to album

  yourFriendWes

  committed
  0644eed

• add edit and update methods for books and movies

  yourFriendWes

  committed
  d6dea7c

Commits on Dec 4, 2015

• add destroy method for movies/books/albums

  yourFriendWes

  committed
  cd50b59

• add rspec tests for shared controller specs

  yourFriendWes

  committed
  bac4901

• add view media buttons and styling

  yourFriendWes

  committed
  1352274

• Add custom naming feature to edit button

  yourFriendWes

  committed
  2eca402

• tweak divs in indexes to match heroku site

  yourFriendWes

  committed
  0e3c43e

• rearrange divs on show and index and show page to match heroku example

  yourFriendWes

  committed
  71c4295

• write and pass tests for welcome_controller

  yourFriendWes

  committed
  9392c9b

• attempt to fix bug that won't accept params in controller_spec

  yourFriendWes

  committed
  a808b15

• add bootstrap to new/edit forms

  yourFriendWes

  committed
  58268bd

Commits on Dec 5, 2015

• add @artist_type to edit page to customize label for each controller

  yourFriendWes

  committed
  521cfcb

• add bootstrap in index table to match heroku page

  yourFriendWes

  committed
  4ee51a2