Code

Week 7 part 2#144

Code

Open

Jameskcoleman wants to merge 63 commits intogotealeaf:mastergotealeaf/myflix:masterfrom Jameskcoleman:week_7_part_2Jameskcoleman/myflix:week_7_part_2Copy head branch name to clipboard

+3,436-53

Commits

Commits on Jun 22, 2014

• Finished prework

  Jameskcoleman

  committed
  84166d0

• Finished week 1 assignments 7 through 10

  Jameskcoleman

  committed
  8389e62

Commits on Jun 23, 2014

• Merge pull request #1 from Jameskcoleman/week_1_first_assignments

  Show description for f41e882
  Jameskcoleman

  committed
  f41e882

• Completed assignments 15 and 16

  Jameskcoleman

  committed
  503fb10

• Trying to solve problem

  Jameskcoleman

  committed
  c651f11

Commits on Jun 29, 2014

• Finished Week 1

  Jameskcoleman

  committed
  bbf12e5

• Merge pull request #2 from Jameskcoleman/week_1_section_2

  Show description for d37d229
  Jameskcoleman

  committed
  d37d229

Commits on Jul 4, 2014

• Finished Week 2 assignment 10

  Jameskcoleman

  committed
  7c7f812

Commits on Jul 7, 2014

• Completed through week 2 assignment 17

  Jameskcoleman

  committed
  596aed6

• Merge pull request #3 from Jameskcoleman/week_2_part_1

  Show description for c578c38
  Jameskcoleman

  committed
  c578c38

• Completed week 2 assignments 15 and 16

  Jameskcoleman

  committed
  79ea0ad

• Finished Week 2

  Jameskcoleman

  committed
  394f9c7

• Merge pull request #4 from Jameskcoleman/week_2_part_2

  Show description for 7b8e61d
  Jameskcoleman

  committed
  7b8e61d

Commits on Jul 9, 2014

• User can reorder videos in the queue

  Jameskcoleman

  committed
  cced288

• Pushed down complexity. User can change video ratings in the queue.

  Jameskcoleman

  committed
  6c32f0c

• Merge pull request #5 from Jameskcoleman/week_3_part_1

  Show description for 2cda3ef
  Jameskcoleman

  committed
  2cda3ef

Commits on Jul 10, 2014

• Implemented feature spec for user sign in

  Jameskcoleman

  committed
  80d46d8

Commits on Jul 11, 2014

• Completed Week 3

  Jameskcoleman

  committed
  e9b76e9

• Merge pull request #6 from Jameskcoleman/week_3_part_2

  Show description for d0f3e1e
  Jameskcoleman

  committed
  d0f3e1e

• Implemented the user profile page

  Jameskcoleman

  committed
  d9df28f

Commits on Jul 14, 2014

• Implemented user profile page, People I Follow page, ability to follow a person, and feature spec for social networking features

  Jameskcoleman

  committed
  aeb77ad

• Merge pull request #7 from Jameskcoleman/week_4_part_1

  Show description for d139ad6
  Jameskcoleman

  committed
  d139ad6

Commits on Jul 15, 2014

• Implemented welcome email sending and added tests to email sending

  Jameskcoleman

  committed
  26c035d

Commits on Jul 16, 2014

• Implemented sending welcome email, added tests to email sending, implemented password resetting

  Jameskcoleman

  committed
  294336e

• Merge pull request #8 from Jameskcoleman/week_4_part_2

  Show description for 9cf1cd5
  Jameskcoleman

  committed
  9cf1cd5

• Deleted superfluous file.

  Jameskcoleman

  committed
  2195494

Commits on Jul 19, 2014

• Wrote integration test for resetting password and implemented inviting users

  Jameskcoleman

  committed
  94cf991

Commits on Jul 21, 2014

• Refactored with concerns

  Jameskcoleman

  committed
  2eb4e45

• Merge pull request #9 from Jameskcoleman/week_5_part_1

  Show description for a595be2
  Jameskcoleman

  committed
  a595be2

• Changed email configuration

  Jameskcoleman

  committed
  5f90182

• Changed email configuration

  Jameskcoleman

  committed
  81e8a93

• Changed email configuration

  Jameskcoleman

  committed
  2edbd1d

• Changed email configuration

  Jameskcoleman

  committed
  43ab794

• Changed email configuration

  Jameskcoleman

  committed
  7d2ba13

Commits on Jul 28, 2014

• Set up Sidekiq and Unicorn

  Jameskcoleman

  committed
  6516620

• Merge pull request #10 from Jameskcoleman/week_5_part_2

  Show description for 0580974
  Jameskcoleman

  committed
  0580974

• Changed Unicorn config

  Jameskcoleman

  committed
  0b12bb8

• Changed procfile

  Jameskcoleman

  committed
  7e8bfb8

• Added Sentry

  Jameskcoleman

  committed
  b8cd20c

• Gem update

  Jameskcoleman

  committed
  cbf2f7e

• Added paratrooper gem

  Jameskcoleman

  committed
  1570e44

• Added deployment rake task

  Jameskcoleman

  committed
  e8ce385

• Modified deploy.rake

  Jameskcoleman

  committed
  73eb8da

• Modified deploy.rake

  Jameskcoleman

  committed
  c6e4051

• Modified deploy.rake

  Jameskcoleman

  committed
  3822f37

Commits on Jul 29, 2014

• Implemented admin sign in

  Jameskcoleman

  committed
  a91c02d

Commits on Aug 4, 2014

• Implemented admin signs in, admin adds a video

  Jameskcoleman

  committed
  428c65e

Commits on Aug 5, 2014

• Implemented watch video and feature test for adding video.

  Jameskcoleman

  committed
  735bd67

• Merge pull request #11 from Jameskcoleman/week_6_part_1

  Show description for 5685425
  Jameskcoleman

  committed
  5685425

• Implemented using Stripe custom form to charge credit card

  Jameskcoleman

  committed
  1e9a6b9

• Improved description of tokenable

  Jameskcoleman

  committed
  1b39aec

Commits on Aug 6, 2014

• Merge pull request #12 from Jameskcoleman/week_6_part_2

  Show description for 775c38e
  Jameskcoleman

  committed
  775c38e

• Removed config file

  Jameskcoleman

  committed
  1d04683

• Built API wrapper for Stripe

  Jameskcoleman

  committed
  a243c15

• Implemented charge credit card on registration

  Jameskcoleman

  committed
  b7db515

• Implemented charge credit card on registration

  Jameskcoleman

  committed
  91576aa

Commits on Aug 7, 2014

• Implemented feature test for registration with credit card

  Jameskcoleman

  committed
  536f1e2

• Merge pull request #13 from Jameskcoleman/week_7_part_1

  Show description for 85f0d27
  Jameskcoleman

  committed
  85f0d27

• Wrote videos decorator

  Jameskcoleman

  committed
  f79956b

• Wrote a sign up service

  Jameskcoleman

  committed
  f0ce62d

Commits on Aug 9, 2014

• Modified .gitignore

  Jameskcoleman

  committed
  c5b5936

• Modified .gitignore

  Jameskcoleman

  committed
  f6ec4b2

• Modified gitignore

  Jameskcoleman

  committed
  d46c20d