Code

Please ignore. Submitted in error#121

Code

Open

teoanne wants to merge 110 commits intogotealeaf:mastergotealeaf/myflix:masterfrom teoanne:week8bteoanne/myflix:week8bCopy head branch name to clipboard

+6,120-24

Commits

Commits on Apr 15, 2014

• added video folder to views

  teoanne

  committed
  0f0e69d

  Copy full SHA for 0f0e69d

• added videos controller and video model

  teoanne

  committed
  66acb1a

  Copy full SHA for 66acb1a

• added video controller and model

  teoanne

  committed
  449ebb7

  Copy full SHA for 449ebb7

Commits on Apr 16, 2014

• added seed data

  teoanne

  committed
  9ca3d95

  Copy full SHA for 9ca3d95

• added categories

  teoanne

  committed
  c5362fc

  Copy full SHA for c5362fc

• added categories show page

  teoanne

  committed
  67df0e3

  Copy full SHA for 67df0e3

• added associations between video, categories and video categories

  teoanne

  committed
  fa49019

  Copy full SHA for fa49019

• Tidied up video controller

  teoanne

  committed
  c197412

  Copy full SHA for c197412

• inserted categories to index view

  teoanne

  committed
  3cf2b6f

  Copy full SHA for 3cf2b6f

Commits on Apr 17, 2014

• Added rspec and tests for models

  teoanne

  committed
  3890dca

  Copy full SHA for 3890dca

Commits on Apr 18, 2014

• added should matchers

  teoanne

  committed
  603d9eb

  Copy full SHA for 603d9eb

• added search by title to video model and its tests

  teoanne

  committed
  f0097e3

  Copy full SHA for f0097e3

• added search form

  teoanne

  committed
  f0aea3f

  Copy full SHA for f0aea3f

Commits on Apr 19, 2014

• added class to search form

  teoanne

  committed
  2bfc3dd

  Copy full SHA for 2bfc3dd

Commits on Apr 20, 2014

• added seed data to test recent videos

  teoanne

  committed
  a0c68c0

  Copy full SHA for a0c68c0

• Added login and register path, user and sessions controller, user model and front page

  teoanne

  committed
  7d62812

  Copy full SHA for 7d62812

Commits on Apr 21, 2014

• Added user authentication and blocked access to relevant pages

  teoanne

  committed
  ad1b8fb

  Copy full SHA for ad1b8fb

• design amendments

  teoanne

  committed
  497db26

  Copy full SHA for 497db26

Commits on Apr 30, 2014

• Amended bootstrap alerts

  teoanne

  committed
  d702538

  Copy full SHA for d702538

Commits on May 1, 2014

• Added test spec for video controller

  teoanne

  committed
  339f856

  Copy full SHA for 339f856

• Merge pull request #1 from teoanne/week1

  Show description for d34bc42
  teoanne

  committed
  d34bc42

  Copy full SHA for d34bc42

• Added users and sessions controller tests

  teoanne

  committed
  59c3d82

  Copy full SHA for 59c3d82

Commits on May 2, 2014

• Added controller and model tests for reviews

  teoanne

  committed
  17c85bb

  Copy full SHA for 17c85bb

Commits on May 3, 2014

• Added tests for the first part of the queue page

  teoanne

  committed
  18f6b72

  Copy full SHA for 18f6b72

• Refactored all tests so far

  teoanne

  committed
  c4e47d3

  Copy full SHA for c4e47d3

Commits on May 4, 2014

• Implemented first half of adding video to queue page test

  teoanne

  committed
  e101c66

  Copy full SHA for e101c66

• Finished queue items create action tests and controller

  teoanne

  committed
  0a67b82

  Copy full SHA for 0a67b82

Commits on May 5, 2014

• Added tests and wrote controller for queue item destroy action

  teoanne

  committed
  f22e1ef

  Copy full SHA for f22e1ef

• Merge pull request #2 from teoanne/week2

  Show description for 1a2994f
  teoanne

  committed
  1a2994f

  Copy full SHA for 1a2994f

Commits on May 6, 2014

• Added tests and controller actions for updating queue items

  teoanne

  committed
  29a59fc

  Copy full SHA for 29a59fc

Commits on May 7, 2014

• added ability for user to change or add ratings from the my queue page

  teoanne

  committed
  646c87a

  Copy full SHA for 646c87a

Commits on May 8, 2014

• Added macros and shared_examples in spec

  teoanne

  committed
  5d899ab

  Copy full SHA for 5d899ab

Commits on May 9, 2014

• Added Capybara

  teoanne

  committed
  4888582

  Copy full SHA for 4888582

Commits on May 10, 2014

• Tidied up testswith macros and shared examples

  teoanne

  committed
  63f0eb7

  Copy full SHA for 63f0eb7

Commits on May 12, 2014

• Added feature tests for user sign in and user interaction with queue

  teoanne

  committed
  a61ddab

  Copy full SHA for a61ddab

Commits on May 14, 2014

• Small amendments to features specs

  teoanne

  committed
  e280896

  Copy full SHA for e280896

• Merge pull request #3 from teoanne/week3

  Show description for 41bdc0a
  teoanne

  committed
  41bdc0a

  Copy full SHA for 41bdc0a

• Added user show page functionality

  teoanne

  committed
  86236e7

  Copy full SHA for 86236e7

Commits on May 15, 2014

• Finished the People page view, added the relationships controller, model and ran tests

  teoanne

  committed
  3fc3c3f

  Copy full SHA for 3fc3c3f

Commits on May 16, 2014

• Added social networking features and ran controller and model tests

  teoanne

  committed
  bf1de62

  Copy full SHA for bf1de62

• Added feature specs for user social networking tools

  teoanne

  committed
  d821ef9

  Copy full SHA for d821ef9

Commits on May 17, 2014

• Added mailers including test specs for mailers

  teoanne

  committed
  eabd74b

  Copy full SHA for eabd74b

Commits on May 18, 2014

• Added password reset

  teoanne

  committed
  450aab3

  Copy full SHA for 450aab3

Commits on May 19, 2014

• Completed password reset request

  teoanne

  committed
  d599986

  Copy full SHA for d599986

• Merge pull request #4 from teoanne/week4

  Show description for 7b039a4
  teoanne

  committed
  7b039a4

  Copy full SHA for 7b039a4

• minor changes to style

  teoanne

  committed
  4763c1f

  Copy full SHA for 4763c1f

• Merge pull request #5 from teoanne/week4

  Show description for e28754d
  teoanne

  committed
  e28754d

  Copy full SHA for e28754d

• Started on invitations

  teoanne

  committed
  e0ffdb2

  Copy full SHA for e0ffdb2

Commits on May 21, 2014

• added invite a friend feature

  teoanne

  committed
  7172f6f

  Copy full SHA for 7172f6f

• Completed inviting friend feature together with test suite

  teoanne

  committed
  0b7d620

  Copy full SHA for 0b7d620

Commits on May 22, 2014

• Added Tokenable module

  teoanne

  committed
  d5100f3

  Copy full SHA for d5100f3

• Merge pull request #6 from teoanne/week5

  Show description for 57ec151
  teoanne

  committed
  57ec151

  Copy full SHA for 57ec151

Commits on May 23, 2014

• changed production environment code

  teoanne

  committed
  53eedcc

  Copy full SHA for 53eedcc

• Added Mailgun production environment code

  teoanne

  committed
  64bb5eb

  Copy full SHA for 64bb5eb

• heroku error

  teoanne

  committed
  4073a34

  Copy full SHA for 4073a34

• Amended production environment code for mailgun

  teoanne

  committed
  5baf064

  Copy full SHA for 5baf064

• minor change to search code to get it working on heroku

  teoanne

  committed
  973934d

  Copy full SHA for 973934d

• added in like operator for video search method

  teoanne

  committed
  bd43548

  Copy full SHA for bd43548

Commits on May 24, 2014

• added redis and sidekiq for background jobs

  teoanne

  committed
  f955850

  Copy full SHA for f955850

Commits on May 25, 2014

• removed worker folder

  teoanne

  committed
  35f9a6b

  Copy full SHA for 35f9a6b

Commits on May 28, 2014

• modified code for redis and sidekiq

  teoanne

  committed
  7988e68

  Copy full SHA for 7988e68

• Added unicorn, installed redis to go and hack for background jobs

  teoanne

  committed
  687dd23

  Copy full SHA for 687dd23

• Added paratrooper and sentry gems

  teoanne

  committed
  3b427e7

  Copy full SHA for 3b427e7

Commits on May 29, 2014

• added paratrooper deploy rake code

  teoanne

  committed
  d8dbe24

  Copy full SHA for d8dbe24

Commits on May 30, 2014

• Added admin view, controller and route

  teoanne

  committed
  2e5426e

  Copy full SHA for 2e5426e

• Finished admin add video

  teoanne

  committed
  8d7225d

  Copy full SHA for 8d7225d

• Added tests for admin add video create action

  teoanne

  committed
  edb78f9

  Copy full SHA for edb78f9

• Error with categories on admin add video page

  teoanne

  committed
  52b2497

  Copy full SHA for 52b2497

Commits on May 31, 2014

• Removed category ids error

  teoanne

  committed
  6173e78

  Copy full SHA for 6173e78

• Added carrierwave uploader

  teoanne

  committed
  345d6dd

  Copy full SHA for 345d6dd

• added carrierwave, minimagick, fog gems

  teoanne

  committed
  c28d812

  Copy full SHA for c28d812

• Merge pull request #7 from teoanne/week6

  Show description for 1c94c5e
  teoanne

  committed
  1c94c5e

  Copy full SHA for 1c94c5e

• halfway with feature tests

  teoanne

  committed
  cb5c0f9

  Copy full SHA for cb5c0f9

• fixed bug in admin feature test

  teoanne

  committed
  0d99a3f

  Copy full SHA for 0d99a3f

Commits on Jun 2, 2014

• Merge pull request #8 from teoanne/week6b

  Show description for 9f88671
  teoanne

  committed
  9f88671

  Copy full SHA for 9f88671

• Changed seed data by adding admin, removing small_cover_url and large_cover_url

  teoanne

  committed
  7c966c3

  Copy full SHA for 7c966c3

• added stripe gem

  teoanne

  committed
  2e05d55

  Copy full SHA for 2e05d55

Commits on Jun 3, 2014

• Added Stripe JS code

  teoanne

  committed
  7649c76

  Copy full SHA for 7649c76

• Added Stripe custom form to new users

  teoanne

  committed
  80d71a0

  Copy full SHA for 80d71a0

• Completed stripe integration

  teoanne

  committed
  ac68d03

  Copy full SHA for ac68d03

Commits on Jun 4, 2014

• Merge pull request #9 from teoanne/week6c

  Show description for b1ac4c1
  teoanne

  committed
  b1ac4c1

  Copy full SHA for b1ac4c1

• started with stripe wrapper and test

  teoanne

  committed
  f1eb7dc

  Copy full SHA for f1eb7dc

• added vcr and webmock 1.11.0 gems

  teoanne

  committed
  299c9be

  Copy full SHA for 299c9be

• small changes to users controller

  teoanne

  committed
  47fead6

  Copy full SHA for 47fead6

Commits on Jun 5, 2014

• added phantomjs autoparts, poltergeist, database_cleaner gems

  teoanne

  committed
  168ec3b

  Copy full SHA for 168ec3b

• finished testing user controller and stripe wrapper. all tests passing

  teoanne

  committed
  162c184

  Copy full SHA for 162c184

• finished feature spec 'user registers with credit card'. all tests passing

  teoanne

  committed
  430e768

  Copy full SHA for 430e768

Commits on Jun 6, 2014

• small changes to feature test user_registers_with_credit_card. whole test suite passing

  teoanne

  committed
  c826f2f

  Copy full SHA for c826f2f

• small comment change in users controller create action

  teoanne

  committed
  a376036

  Copy full SHA for a376036

Commits on Jun 8, 2014

• added decorator

  teoanne

  committed
  54c76e4

  Copy full SHA for 54c76e4

• Merge pull request #10 from teoanne/week7a

  Show description for c645484
  teoanne

  committed
  c645484

  Copy full SHA for c645484

• finished adding decorator to video

  teoanne

  committed
  86088f7

  Copy full SHA for 86088f7

Commits on Jun 9, 2014

• added user sign up service and tests

  teoanne

  committed
  e5132bc

  Copy full SHA for e5132bc

Commits on Jun 10, 2014

• Merge pull request #11 from teoanne/week7b

  Show description for d97503f
  teoanne

  committed
  d97503f

  Copy full SHA for d97503f

Commits on Jun 11, 2014

• started on stripe customer create

  teoanne

  committed
  a00cda2

  Copy full SHA for a00cda2

• completed customer subscription with stripe also changed user sign in service

  teoanne

  committed
  e301f55

  Copy full SHA for e301f55

• added stripe events and payment model

  teoanne

  committed
  468b94f

  Copy full SHA for 468b94f

Commits on Jun 12, 2014

• Finished admin payments in controller and view

  teoanne

  committed
  e1d28d7

  Copy full SHA for e1d28d7

• added user deactivate

  teoanne

  committed
  c89d27e

  Copy full SHA for c89d27e

• small changes

  teoanne

  committed
  2c0ffe8

  Copy full SHA for 2c0ffe8

Commits on Jun 16, 2014

• finished with Stripe

  teoanne

  committed
  14756b9

  Copy full SHA for 14756b9

Commits on Jun 17, 2014

• Merge pull request #12 from teoanne/week8a

  Show description for 261be8d
  teoanne

  committed
  261be8d

  Copy full SHA for 261be8d

• started with user profile and admin area

  teoanne

  committed
  4625a2e

  Copy full SHA for 4625a2e

• Merge pull request #13 from teoanne/week8a

  Show description for 6aab11e
  teoanne

  committed
  6aab11e

  Copy full SHA for 6aab11e

• finished user profile edit and update, continue on billings

  teoanne

  committed
  a13413c

  Copy full SHA for a13413c

• started with user billing

  teoanne

  committed
  6632ef1

  Copy full SHA for 6632ef1

Commits on Jun 18, 2014

• adding billing

  teoanne

  committed
  fa61820

  Copy full SHA for fa61820

Commits on Jun 19, 2014

• added read this first on front page

  teoanne

  committed
  1e55903

  Copy full SHA for 1e55903

Commits on Jun 24, 2014

• small presentational changes

  teoanne

  committed
  84265da

  Copy full SHA for 84265da

• commiting to push to heroku

  teoanne

  committed
  2bff890

  Copy full SHA for 2bff890