Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seventh week #139

Open
wants to merge 76 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
719e31b
Video model and seeds added. Adding home page.
unai-trecet Feb 7, 2014
f1b4e9e
Pre-course completed
unai-trecet Feb 8, 2014
d8c3faf
Before shoulda-matchers
unai-trecet Feb 12, 2014
e71be60
Shoulda-matchers
unai-trecet Feb 12, 2014
4e425b4
Search_by_title added.
unai-trecet Feb 16, 2014
aebfbac
Front, register and sign in linked
unai-trecet Feb 17, 2014
c609968
Authentication added
unai-trecet Feb 19, 2014
f3f7893
Index, show and search test done. Included Fabricator and Fake gems i…
unai-trecet Mar 1, 2014
a4eb4df
Authentication controller tests done. Using Fabricate and Fake gems.
unai-trecet Mar 3, 2014
c555ee8
Reviews test added. Migration, nodel, created; view and controller mo…
unai-trecet Mar 5, 2014
896c0b6
Reviews tested and added
unai-trecet Mar 20, 2014
3a2e880
Second_week branch created. Working on queues tests.
unai-trecet Mar 24, 2014
3e246f9
Queue tests almost.
unai-trecet Mar 26, 2014
9f1c8b4
Queue model tests finished. Working on adding videos to an user queue.
unai-trecet Mar 27, 2014
66e5ace
Add_to_queue method tests completed.
unai-trecet Mar 29, 2014
e493709
Last in order added.
unai-trecet Mar 29, 2014
a52ad8a
Queue_item create action changed and finished becouse mine was a litt…
unai-trecet Apr 1, 2014
28c4a7e
Destroy action and its tests finished
unai-trecet Apr 1, 2014
81009be
Update queue positions action and tests done.
unai-trecet Apr 5, 2014
182d788
Queue items controller pushed down. Working on rating update.
unai-trecet Apr 8, 2014
ef204c7
Only few test left. Update_Attributes! caused many problems. Solved u…
unai-trecet Apr 11, 2014
58e3601
Rate videos in my queue done by my way. Before solution.
unai-trecet Apr 12, 2014
ad0ea4f
Current_user improvement added: @current_user ||= User.find(session[:…
unai-trecet Apr 12, 2014
c837074
Some changes added, I missed some Steve Turczyn comments on my first …
unai-trecet Apr 14, 2014
a6854ae
Application helper method added for select reviews rating.
unai-trecet Apr 14, 2014
f08dd50
Macross and shared examples done.
unai-trecet Apr 16, 2014
dcbbf3e
Capybara invluded in Gemfile and require 'capybara/rails' added to sp…
unai-trecet Apr 16, 2014
535bdf3
First feature test added: sign in test.
unai-trecet Apr 18, 2014
a1ae7ff
Back again after Droxbox messing
unai-trecet Apr 20, 2014
385cd7a
Third week almost finish. After Luke suggestions
unai-trecet Apr 20, 2014
2e9591e
Luke suggestions added.
unai-trecet Apr 20, 2014
31f2be4
Merging third_week branch and master branch
unai-trecet Apr 21, 2014
dcb7a89
User show page, action and tests added.
unai-trecet Apr 22, 2014
dead8f9
Relationship association added.
unai-trecet Apr 24, 2014
c82ad15
People I follow page, relatioships controller, model, migration and t…
unai-trecet Apr 26, 2014
6ee3e5c
GET instaed of POST problem.
unai-trecet Apr 26, 2014
83104a6
Follow a user assigment finished. GET/POST problem solved.
unai-trecet Apr 26, 2014
e2bf05a
Social interaction feature test added.
unai-trecet Apr 26, 2014
b0d13f2
Welcome mail added. Env vars defined.
unai-trecet May 5, 2014
dccbd94
Merging master branch before Heroku Upload.
unai-trecet May 5, 2014
cc9da36
Pry deleted from Gemfile, left it only in developement
unai-trecet May 5, 2014
cb6698c
Changing gem 'thread_safe' from 0.3.0 to '0.2.0'
unai-trecet May 5, 2014
7e02cad
Changing gem 'thread_safe' from 0.3.0 to '0.2.0'. Bundle install exec…
unai-trecet May 5, 2014
b473b7a
Removing MyQueue create migration
unai-trecet May 5, 2014
81db3ec
Changing timestamps to timestamp in categories alter migration.
unai-trecet May 5, 2014
73d21e0
Producction enviroment email conf added.
unai-trecet May 5, 2014
e605bb4
Welcome email test added.
unai-trecet May 6, 2014
4952bf4
Working on reset password feature. Forgot_password action done, headi…
unai-trecet May 9, 2014
e545fe7
Reset Password assigment finished following the solution. I changed t…
unai-trecet May 15, 2014
1c5bfd2
Password confirmation and reset url time expiration added.
unai-trecet May 15, 2014
6136288
Password reset feature spec added. Reset password email duration cont…
unai-trecet May 21, 2014
9f53f7e
Invitations views, controller and tests added. Working on creating th…
unai-trecet May 28, 2014
c2e0600
User invitations implemented. Working on feature test.
unai-trecet May 29, 2014
acd7b39
Invitations feature added, my way. Without checking solutions.
unai-trecet May 30, 2014
4d1140b
Tokenable concern added and its shared example. Mailgun add-on added …
unai-trecet May 31, 2014
2790b98
Invitations part of the workflow done. Working on invited user creation.
unai-trecet Jun 3, 2014
094022f
Invitation feature finishid following the solutions
unai-trecet Jun 4, 2014
6ec7812
Before merging
unai-trecet Jun 23, 2014
9f3d975
Unicorn gem added, unicorn.rb config file added, heroku redis conf ad…
unai-trecet Jun 24, 2014
5c7fdc3
Procfile
unai-trecet Jun 24, 2014
da99f1f
Register error solved.
unai-trecet Jun 24, 2014
29db736
Solving email problems: settting host: 'http://myflix-unai.herokuapp.…
unai-trecet Jun 26, 2014
afb398e
Sentry-raven gem installed
unai-trecet Jun 26, 2014
f8fa345
Paratrooper gem added. lib/task/deploy.rake created with the docu con…
unai-trecet Jun 27, 2014
d0f7df9
Admin video adding creation tests added.
unai-trecet Jul 10, 2014
63ce54d
Feature test admin adds video done.
unai-trecet Jul 12, 2014
33fda08
Stripe form and paument included
unai-trecet Jul 18, 2014
e56e5c6
Stripe custom form added.
unai-trecet Jul 20, 2014
4e3ae5d
Stripe API wrapper and tests added.
unai-trecet Jul 22, 2014
afdb7f5
Working on charge card on sign up. Problem with invitations.
unai-trecet Jul 26, 2014
05566f6
Invitaion feature test with credit card info. Problems creating the i…
unai-trecet Jul 28, 2014
bdf7bf4
Invitations feature test with credit card donde.
unai-trecet Jul 29, 2014
15ad55f
SttripeWrapper model test almost finished: error with invalid cards.
unai-trecet Jul 29, 2014
f6c430c
User registration feature test. Problems with invalid card.
unai-trecet Jul 30, 2014
4440578
Rating method added to video model. Still having problems with sign u…
unai-trecet Aug 4, 2014
43bf42a
Signup service object added. Still having problems with signup with c…
unai-trecet Aug 4, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

# Ignore application configuration
/config/application.yml
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--color
Empty file modified .ruby-gemset
100644 → 100755
Empty file.
Empty file modified .ruby-version
100644 → 100755
Empty file.
36 changes: 34 additions & 2 deletions Gemfile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.0.0'
ruby '2.1.1'

gem 'bootstrap-sass'
gem 'coffee-rails'
Expand All @@ -8,18 +8,50 @@ gem 'haml-rails'
gem 'sass-rails'
gem 'uglifier'
gem 'jquery-rails'
gem 'bootstrap_form'
gem 'bcrypt'
gem 'fabrication'
gem 'faker'
gem 'pry'

group :test, :development do
gem 'rspec-rails'
end

group :test do
gem 'shoulda-matchers'
gem 'capybara'
gem 'launchy'
gem 'capybara-email'
gem 'vcr'
gem 'webmock'
gem 'selenium-webdriver'
gem 'database_cleaner'
end


group :development do
gem 'sqlite3'
gem 'pry'
gem 'pry-nav'
gem 'thin'
gem "better_errors"
gem "binding_of_caller"
gem "letter_opener"
end

group :production do
gem 'pg'
gem 'rails_12factor'
end

gem 'therubyracer'
gem 'thread_safe', '0.2.0'
gem 'sidekiq'
gem 'unicorn'
gem "sentry-raven"
gem 'paratrooper'
gem 'carrierwave'
gem 'mini_magick'
gem 'stripe', :git => 'https://github.com/stripe/stripe-ruby'
gem 'figaro'
gem 'draper'
Loading