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.

Sign up for GitHub

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

Jump to bottom

Full diplay on index #5

Open
wants to merge 77 commits into
base: master
Choose a base branch
from
Open

Full diplay on index #5

wants to merge 77 commits into from

Conversation

pksarguru
Copy link
Contributor

No description provided.

Chris Santos & Joe Harrow and others added 30 commits February 15, 2017 18:15
comment out scss file.
7cf017c
@jwharrow
Merge pull request #5 from jwharrow/feature-comment-out-css
c8f26cc 
comment out scss file.
edit config/environment/production.rb for ck editor
714bf3f
@jwharrow
Merge pull request #6 from jwharrow/ck-editor-debug
6815353 
edit config/environment/production.rb for ck editor
@pksarguru
add travis.yml file
2b4a278
@pksarguru
add database.yml.travis
186d9a7
@pksarguru
edit travis.yml file
43ab0c7
@pksarguru
debug travis yml file
375b686
@pksarguru
debug travis yml file
c15003a
@pksarguru
edit database.yml.travis
05c096d
@pksarguru
edit travis.yml file to run rspec tests
5fd89f8
@pksarguru
Merge pull request #7 from jwharrow/travis-integration
11b2baa 
Travis integration
@jwharrow
Implement simplecov.
cac9318
@pksarguru
Merge pull request #8 from jwharrow/simplecov_implementation
102ab8e 
Implement simplecov.
@csan21
update layout css
b8d05c8
add edit, patch, update routes to game
cbbf0eb
@csan21
Update css and add basic navigation
78e6bab
@csan21
Small edit
79a9384
@jwharrow
Merge pull request #9 from jwharrow/css-edits
cde0639 
Css edits
Edit small style error, optimize for browser
e4d3936
add gem and modify strong params for image uploading
8f16e95
@pksarguru
Merge pull request #10 from jwharrow/style-edit
f28a0ea 
Edit small style error, optimize for browser
add rspec for game edit/put
086d0dc
fix ruby version merge conflict
615ef1a
update ruby version
f58a13b
updated ruby version with bundle install
7e58a26
paperclip config settings
8e03309
@csan21
Merge pull request #12 from jwharrow/edit-update-game
91b7a14 
Edit update game
Complete and working login logout and sessions views, controllers models
441bb09
Merge branch 'master' into feature-paperclip
9577de1
pksarguru and others added 30 commits February 16, 2017 12:39
@pksarguru
Merge pull request #17 from jwharrow/format-home-index-for-html
b2ab34a 
fix html rendering in home
add logic to duplicate game as revision
f3be729
@jwharrow
Merge pull request #19 from jwharrow/revisions-table
df59d8e 
add logic to duplicate game as revision
add logic to game show page
27065f4
Updates to resolve merge conflicts
6e9c6e5
Completed logic for game show page
5872613
fixed feature test
b50af54
Update seed for revisions
6b2c88a
@pksarguru
Merge pull request #20 from jwharrow/feature-show-revisions
7876b3a 
Feature show revisions
@csan21
Add games index route and list all alphabetically
7c246ea
added revisions index page and last revision values in new form
44722ae
add model method to count collaborators
be6ef42
@jwharrow
Merge pull request #21 from jwharrow/revisions-table
a3738a8 
added revisions index page and last revision values in new form
Merge branch 'master' into feature_collaborator_count_method
9b54d6c
Merge branch 'master' into update_recent_game_logic
7813ac7
@csan21
Merge pull request #22 from jwharrow/feature_collaborator_count_method
0f2fd1d 
add model method to count collaborators
Merge branch 'master' into update_recent_game_logic
c6b5893
@csan21
Add user authorization for create and show routes
f43a69d
@csan21
Fix merge conflict
b3e490b
updated links to revision index and game show page and updated game s…
ac7b74f 
…how with collaborator count
fix displays on home#index to show revisions
9b11196
disabled feature tests
2788255
@jwharrow
Merge pull request #24 from jwharrow/feature-game-show-page-revision-…
522c402 
…link

updated links to revision index and game show page and updated game s…
@csan21
Comment out two tests
da8ac26
@jwharrow
Merge pull request #25 from jwharrow/update_recent_game_logic
d5c7492 
Update recent game logic
@pksarguru
Merge pull request #23 from jwharrow/games-index
b2f22db 
Games index
add anonymous method
41ced4b
@pksarguru
Merge pull request #26 from jwharrow/add-anonymous-method
9cb68f8 
add anonymous method
update seed and revision show
017520a
merge resolve
f7de75c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pksarguru @jwharrow @csan21