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

Queues - Kayla Kubicke - Media Ranker #34

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
fd83df2
Initial Rails setup
Apr 10, 2017
3d69bef
Created controllers and models for users, votes, and works.
Apr 11, 2017
56ce871
Established works, albums, movies, books, and user routes.
Apr 11, 2017
05e8543
Changed routes to reduce number of controllers used.
Apr 12, 2017
053a7db
Created skeleton methods for all controllers.
Apr 12, 2017
dee00a7
Removed unnecessary controller.
Apr 12, 2017
420098c
Moved album, movie, and book methods into works controller.
Apr 12, 2017
458e83d
Created index method and wrote associated test for user controller.
Apr 12, 2017
f508852
Added index method test.
Apr 12, 2017
03ea5d2
Created show method and associated tests for users controller.
Apr 12, 2017
a89e625
Added tests for index and show methods.
Apr 12, 2017
0a02268
Changed login routes to be controlled with sessions controller.
Apr 12, 2017
0e16ec1
Established relationships between models.
Apr 13, 2017
5cf6f0c
Rolled back migrations and added columns to works and users.
Apr 13, 2017
e637e2e
Adjusted routes to correctly account for login session.
Apr 13, 2017
7a32abd
Added methods to controllers and associated tests.
Apr 13, 2017
c738502
Added session controller and test so users can login.
Apr 13, 2017
0685ad1
Switching to new branch.
Apr 13, 2017
f8b0837
Changed votes migration to include belongs_to relationships.
Apr 13, 2017
dd78a83
Updated views to imitate orginal site.
Apr 13, 2017
94b4833
Updated overall styling.
Apr 13, 2017
25538d2
Set up index page and updated welcome controller.
Apr 13, 2017
b0fed56
Altered routes to get post working.
Apr 14, 2017
ff81190
Updating views to match MediaRanker site.
Apr 14, 2017
edcde6c
Can create new album.
Apr 14, 2017
da245b3
Fixing branch conflict.
Apr 14, 2017
0fd1877
Merge branch 'master' of https://github.com/moonpastry/MediaRanker in…
Apr 14, 2017
2207f54
Can add new movies.
Apr 14, 2017
d0769df
Can add new books.
Apr 14, 2017
734703f
Can create a username.
Apr 14, 2017
089dc53
Can login as test_name.
Apr 14, 2017
093d798
Updated relationships so that works and users are connected though vo…
Apr 14, 2017
da8ae7c
Fixed typo.
Apr 14, 2017
80083a4
User can upvote work only once.
Apr 14, 2017
c6b688a
Cleaned up files.
Apr 14, 2017
15b3cd3
Attempting to debug heroku deployment.
Apr 14, 2017
1e275fe
Added basic functionality to individual show pages.
Apr 14, 2017
ba7cc2e
Minor changes, switching branches.
Apr 17, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed unnecessary controller.
Kayla committed Apr 12, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit dee00a7f380a11113fd233c0d24a3b6ed02f28bc
2 changes: 0 additions & 2 deletions app/controllers/votes_controller.rb

This file was deleted.