Code

Mod11#103

Code

Open

johntmorgan wants to merge 121 commits intogotealeaf:mastergotealeaf/myflix:masterfrom johntmorgan:mod11johntmorgan/myflix:mod11Copy head branch name to clipboard

+26,530-339

Commits

Commits on Feb 28, 2014

• added categories, show category page

  johntmorgan

  committed
  cfd17a5

  Copy full SHA for cfd17a5

Commits on Mar 1, 2014

• fixed index, category pages so videos only display once

  johntmorgan

  committed
  5a04908

  Copy full SHA for 5a04908

• a bit more cleanup of index code

  johntmorgan

  committed
  c75ec4f

  Copy full SHA for c75ec4f

Commits on Mar 3, 2014

• installed rspec

  johntmorgan

  committed
  074bfb7

  Copy full SHA for 074bfb7

• Merge pull request #1 from Nissl/video_model_test

  Show description for 0a596de
  johntmorgan

  committed
  0a596de

  Copy full SHA for 0a596de

• basic save test of video model

  johntmorgan

  committed
  aa91532

  Copy full SHA for aa91532

• category and category/video relationship tests

  johntmorgan

  committed
  1769972

  Copy full SHA for 1769972

• revised testing with more options from solutions

  johntmorgan

  committed
  a2f8aba

  Copy full SHA for a2f8aba

• video validations

  johntmorgan

  committed
  c48a9de

  Copy full SHA for c48a9de

• replaced original tests with shoulda matchers

  johntmorgan

  committed
  ae3125b

  Copy full SHA for ae3125b

• added empty category check from Amber's code

  johntmorgan

  committed
  e9af52e

  Copy full SHA for e9af52e

Commits on Mar 4, 2014

• Merge pull request #2 from Nissl/mod1

  Show description for 5989a4f
  johntmorgan

  committed
  5989a4f

  Copy full SHA for 5989a4f

• added search by title (before viewing solution)

  johntmorgan

  committed
  c8aca12

  Copy full SHA for c8aca12

• cleaned up search_by_title after watching solution

  johntmorgan

  committed
  192f5b6

  Copy full SHA for 192f5b6

• search bar added

  johntmorgan

  committed
  aa792c5

  Copy full SHA for aa792c5

• recent_videos method w/tests (pre-solution)

  johntmorgan

  committed
  81a9435

  Copy full SHA for 81a9435

• recent videos method revision after solution

  johntmorgan

  committed
  0e28fa0

  Copy full SHA for 0e28fa0

Commits on Mar 5, 2014

• added users, wired up registration & sign-in pages (pre-solution)

  johntmorgan

  committed
  76808c1

  Copy full SHA for 76808c1

• added users, wired up registration & sign-in pages (post-solution)

  johntmorgan

  committed
  ba7d93a

  Copy full SHA for ba7d93a

• added authentication features (pre-solution)

  johntmorgan

  committed
  cec2d4e

  Copy full SHA for cec2d4e

• minor revisions to authentication from solution

  johntmorgan

  committed
  8a68f86

  Copy full SHA for 8a68f86

Commits on Mar 6, 2014

• Merge pull request #3 from Nissl/mod1

  Show description for ab4128b
  johntmorgan

  committed
  ab4128b

  Copy full SHA for ab4128b

Commits on Mar 8, 2014

• video controller test (with solution revisions & notes)

  johntmorgan

  committed
  92349e2

  Copy full SHA for 92349e2

Commits on Mar 10, 2014

• user, session controller tests

  johntmorgan

  committed
  c6d5497

  Copy full SHA for c6d5497

• user & session controller tests (solution refactor)

  johntmorgan

  committed
  5bb1ac6

  Copy full SHA for 5bb1ac6

Commits on Mar 11, 2014

• added reviews to video show page, with test (pre-solution)

  johntmorgan

  committed
  cc79a4d

  Copy full SHA for cc79a4d

• added user submission of reviews (pre-solution)

  johntmorgan

  committed
  72170cf

  Copy full SHA for 72170cf

• minor refactor to user review submission from solutions

  johntmorgan

  committed
  16cf4b5

  Copy full SHA for 16cf4b5

• added set @reviews test to user multiple submission error condition

  johntmorgan

  committed
  9f2dde5

  Copy full SHA for 9f2dde5

Commits on Mar 13, 2014

• revisions to reviews controller from @poiyzy suggestions

  johntmorgan

  committed
  0f160d4

  Copy full SHA for 0f160d4

• revised 'user has already submitted a review for this video' condition to have a model-based trigger

  johntmorgan

  committed
  469cd52

  Copy full SHA for 469cd52

Commits on Mar 17, 2014

• basic queues view, pre-solution

  johntmorgan

  committed
  25136b8

  Copy full SHA for 25136b8

• revised my_queue display from solution(major refactor)

  johntmorgan

  committed
  7cf0abd

  Copy full SHA for 7cf0abd

Commits on Mar 19, 2014

• updated with fixed review error messaging

  johntmorgan

  committed
  8422dc2

  Copy full SHA for 8422dc2

• Merge pull request #4 from Nissl/mod2

  Show description for cbaf85a
  johntmorgan

  committed
  cbaf85a

  Copy full SHA for cbaf85a

Commits on Mar 20, 2014

• implemented user adding video to queue, list order

  johntmorgan

  committed
  cd60da4

  Copy full SHA for cd60da4

• add video to queue, solution refactor

  johntmorgan

  committed
  e14891a

  Copy full SHA for e14891a

• implemented user deletion of items from queue (pre-solution)

  johntmorgan

  committed
  41b6716

  Copy full SHA for 41b6716

• revised queue item delete post-solution, one major fix

  johntmorgan

  committed
  41f7418

  Copy full SHA for 41f7418

Commits on Mar 21, 2014

• Merge pull request #5 from Nissl/mod2

  Show description for 68dcfdd
  johntmorgan

  committed
  68dcfdd

  Copy full SHA for 68dcfdd

• a few minor refactorings from luketower's feedback

  johntmorgan

  committed
  551b015

  Copy full SHA for 551b015

• Merge pull request #6 from Nissl/mod2

  Show description for 46e9287
  johntmorgan

  committed
  46e9287

  Copy full SHA for 46e9287

• one more quick refactor from mod2

  johntmorgan

  committed
  afae1a4

  Copy full SHA for afae1a4

Commits on Apr 4, 2014

• added queue reordering (pre-solution refactor, but using solution for a few things)

  johntmorgan

  committed
  bdede77

  Copy full SHA for bdede77

Commits on Apr 11, 2014

• refactor queue reordering from solution

  johntmorgan

  committed
  52b6e81

  Copy full SHA for 52b6e81

Commits on Apr 13, 2014

• added dropdowns that allow user to set and change ratings on my queue page. issue with rspec refactor using let for office hours.

  johntmorgan

  committed
  1ca25b7

  Copy full SHA for 1ca25b7

• bug fix for rspec refactor in queue items controller

  johntmorgan

  committed
  c3f9399

  Copy full SHA for c3f9399

Commits on Apr 14, 2014

• fixed bug in queue items controller spec refactor

  johntmorgan

  committed
  a842f08

  Copy full SHA for a842f08

• cleaned up a few residual commented out binding.pry commands I missed

  johntmorgan

  committed
  1235af5

  Copy full SHA for 1235af5

• remove unnecessary quarantine.rb file, eliminate model-level validation of integer in favor of controller-level only

  johntmorgan

  committed
  159a0a5

  Copy full SHA for 159a0a5

• Merge pull request #7 from Nissl/mod3

  Show description for a3468a0
  johntmorgan

  committed
  a3468a0

  Copy full SHA for a3468a0

• fix sessions controller bug, refactor half of queue_items_controller_spec with macros and shared examples

  johntmorgan

  committed
  c4c7359

  Copy full SHA for c4c7359

Commits on Apr 15, 2014

• complete spec refactor (pre-solution)

  johntmorgan

  committed
  a79dbea

  Copy full SHA for a79dbea

• added first feature spec

  johntmorgan

  committed
  e130a3f

  Copy full SHA for e130a3f

• user interacts with queue spec (pre-solution, hideously ugly)

  johntmorgan

  committed
  97ffbf2

  Copy full SHA for 97ffbf2

Commits on Apr 16, 2014

• refactor queue item feature spec

  johntmorgan

  committed
  590f38b

  Copy full SHA for 590f38b

• additional refactor queue item feature spec

  johntmorgan

  committed
  f7244d0

  Copy full SHA for f7244d0

• user profile page, start week 4

  johntmorgan

  committed
  0306e20

  Copy full SHA for 0306e20

Commits on Apr 17, 2014

• minor refactor to user profile page from solution

  johntmorgan

  committed
  ed06647

  Copy full SHA for ed06647

Commits on Apr 18, 2014

• Merge pull request #8 from Nissl/mod4

  Show description for c6f67f1
  johntmorgan

  committed
  c6f67f1

  Copy full SHA for c6f67f1

Commits on Apr 20, 2014

• completed relationships functions (pre-solution refactor)

  johntmorgan

  committed
  4bf1faf

  Copy full SHA for 4bf1faf

Commits on Apr 21, 2014

• all relationships completed including refactor

  johntmorgan

  committed
  06edd8f

  Copy full SHA for 06edd8f

• feature spec for following people (note ugly delete select, waiting for xpath solution refactor

  johntmorgan

  committed
  70c5e4e

  Copy full SHA for 70c5e4e

• minor refactor to feature spec from solution

  johntmorgan

  committed
  9084191

  Copy full SHA for 9084191

Commits on Apr 22, 2014

• switched to postgresql prior to heroku deploy

  johntmorgan

  committed
  de71145

  Copy full SHA for de71145

• implemented basic mail on registration

  johntmorgan

  committed
  cb81239

  Copy full SHA for cb81239

• test email sending

  johntmorgan

  committed
  4a3114c

  Copy full SHA for 4a3114c

• added bad input test to registration email

  johntmorgan

  committed
  463135d

  Copy full SHA for 463135d

Commits on Apr 23, 2014

• password reset (pre-solution refactor, but with guidance to controller setup from first part of solution)

  johntmorgan

  committed
  69ed2e1

  Copy full SHA for 69ed2e1

• minor refactor/renaming to password reset from solution

  johntmorgan

  committed
  c55d5ed

  Copy full SHA for c55d5ed

• Workaround for Heroku to migrate past a table I later dropped

  johntmorgan

  committed
  ecc6020

  Copy full SHA for ecc6020

• removed table erroneously created that was causing problems with heroku deploy

  johntmorgan

  committed
  117fedb

  Copy full SHA for 117fedb

• one more db fix

  johntmorgan

  committed
  0f4b68a

  Copy full SHA for 0f4b68a

• Merge pull request #9 from Nissl/mod5

  Show description for 34032d6
  johntmorgan

  committed
  34032d6

  Copy full SHA for 34032d6

Commits on Apr 24, 2014

• broken click button for tealeaf feedback

  johntmorgan

  committed
  3ffd8ac

  Copy full SHA for 3ffd8ac

• Merge pull request #10 from Nissl/mod6

  Show description for fa971e3
  johntmorgan

  committed
  fa971e3

  Copy full SHA for fa971e3

• feature spec for user login via email (pre-solution)

  johntmorgan

  committed
  9f8c5cd

  Copy full SHA for 9f8c5cd

Commits on Apr 25, 2014

• added invite a friend feature (pre-solution)

  johntmorgan

  committed
  64b42e8

  Copy full SHA for 64b42e8

• refactor user invites friend from solution

  johntmorgan

  committed
  86f2d14

  Copy full SHA for 86f2d14

Commits on Apr 29, 2014

• shared concerns for token generation

  johntmorgan

  committed
  423a3be

  Copy full SHA for 423a3be

• setup mailgun on heroku

  johntmorgan

  committed
  a5fe52a

  Copy full SHA for a5fe52a

• fixed bug in mail code

  johntmorgan

  committed
  b0abcc2

  Copy full SHA for b0abcc2

Commits on Apr 30, 2014

• Merge pull request #11 from Nissl/mod7

  Show description for 2099aea
  johntmorgan

  committed
  2099aea

  Copy full SHA for 2099aea

• added sidekiq mailing of invitation

  johntmorgan

  committed
  689bef3

  Copy full SHA for 689bef3

• setup foreman and unicorn

  johntmorgan

  committed
  66cea71

  Copy full SHA for 66cea71

• setup redis for heroku

  johntmorgan

  committed
  8dda92d

  Copy full SHA for 8dda92d

• try fix to

  johntmorgan

  committed
  fb522f7

  Copy full SHA for fb522f7

• fixed error in custom validation message being displayed by bootstrap_form_for

  johntmorgan

  committed
  8120781

  Copy full SHA for 8120781

• update to email subject field

  johntmorgan

  committed
  4d59abb

  Copy full SHA for 4d59abb

Commits on May 1, 2014

• test port set via env file

  johntmorgan

  committed
  a255cf1

  Copy full SHA for a255cf1

• turn off worker dyno

  johntmorgan

  committed
  d596a85

  Copy full SHA for d596a85

Commits on May 3, 2014

• staging config, sentry setup

  johntmorgan

  committed
  d23fb1e

  Copy full SHA for d23fb1e

• add paratrooper

  johntmorgan

  committed
  f353b94

  Copy full SHA for f353b94

Commits on May 5, 2014

• Merge pull request #12 from Nissl/mod8

  Show description for 901648f
  johntmorgan

  committed
  901648f

  Copy full SHA for 901648f

• add video page, admin role, authentication

  johntmorgan

  committed
  25a4cae

  Copy full SHA for 25a4cae

• admin add video solution refactor (bootstrap form for)

  johntmorgan

  committed
  44aa53e

  Copy full SHA for 44aa53e

Commits on May 8, 2014

• carrierwave and fog implemented, some tests of gem functionality not set (pre-solution)

  johntmorgan

  committed
  a43c31e

  Copy full SHA for a43c31e

• solution refactor to admin page, add video url

  johntmorgan

  committed
  2c8b725

  Copy full SHA for 2c8b725

• feature spec for admin adding video (pre-solution)

  johntmorgan

  committed
  af8ce96

  Copy full SHA for af8ce96

• admin adds video feature spec (solution refactor)

  johntmorgan

  committed
  0d5a71f

  Copy full SHA for 0d5a71f

Commits on May 9, 2014

• Merge pull request #13 from Nissl/mod9

  Show description for 74f6509
  johntmorgan

  committed
  74f6509

  Copy full SHA for 74f6509

• stripe checkout charges card (presolution)

  johntmorgan

  committed
  a0f2a38

  Copy full SHA for a0f2a38

• stripe form (pre-solution)

  johntmorgan

  committed
  073abb7

  Copy full SHA for 073abb7

• stripe form (solution revise)

  johntmorgan

  committed
  9344516

  Copy full SHA for 9344516

Commits on May 10, 2014

• stripe form with solution controller

  johntmorgan

  committed
  e6c0356

  Copy full SHA for e6c0356

Commits on May 12, 2014

• Figaro update fix

  johntmorgan

  committed
  3b54fbc

  Copy full SHA for 3b54fbc

• Merge pull request #14 from Nissl/mod10

  Show description for 4981767
  johntmorgan

  committed
  4981767

  Copy full SHA for 4981767

• JS staging server fix

  johntmorgan

  committed
  2a705aa

  Copy full SHA for 2a705aa

• another js fix attempt

  johntmorgan

  committed
  1574adf

  Copy full SHA for 1574adf

• another heroku js fix attempt

  johntmorgan

  committed
  3bb9840

  Copy full SHA for 3bb9840

• another js fix by setting config.serve_static_assets to true

  johntmorgan

  committed
  3d2bbbc

  Copy full SHA for 3d2bbbc

• undo serve_static_assets

  johntmorgan

  committed
  4cfb23e

  Copy full SHA for 4cfb23e

• deleted manifest

  johntmorgan

  committed
  afebec3

  Copy full SHA for afebec3

• added payments to application file

  johntmorgan

  committed
  62c0507

  Copy full SHA for 62c0507

• stripe wrapper w/tests (pre-solution)

  johntmorgan

  committed
  6583b93

  Copy full SHA for 6583b93

Commits on May 13, 2014

• stripe wrapper (solution refactor)

  johntmorgan

  committed
  bc9f8d0

  Copy full SHA for bc9f8d0

• charge credit card on registration w/tests (incl solution)

  johntmorgan

  committed
  4a1abd1

  Copy full SHA for 4a1abd1

• setup capybara-webkit testing

  johntmorgan

  committed
  acdb972

  Copy full SHA for acdb972

Commits on May 14, 2014

• webkit implementation (w/webkit and vcr issues)

  johntmorgan

  committed
  cfe66cb

  Copy full SHA for cfe66cb

• VCR fix via configure_metadata

  johntmorgan

  committed
  abe5656

  Copy full SHA for abe5656

• webkit fix

  johntmorgan

  committed
  144be72

  Copy full SHA for 144be72