-
Notifications
You must be signed in to change notification settings - Fork 2
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
Don't merge - Steven for review #33
Open
stevecass
wants to merge
148
commits into
review-base
Choose a base branch
from
review-target
base: review-base
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
148 commits
Select commit
Hold shift + click to select a range
0dd9f7f
Initial commit
kevalwell d9d0748
Merge branch 'master' of https://github.com/kevalwell/StackOverflow
e50a028
complete question/answer migrations
e0bb83a
complete header styling
d653b67
columns
3082aa4
set database relationships
efa3b80
Merge branch 'Malcolm_header'
hoathenguyen85 ca75cfa
Ready User Controller
kevalwell 8008fb1
Merge pull request #2 from kevalwell/ka/NewUser
25cb8eb
finished seed file
samguergen 50f5b4b
created link_to signup
kevalwell ec9d235
fixed minor syntax error in seed. seed now working
samguergen 62ff66b
Merge pull request #3 from kevalwell/Sam_seed
hoathenguyen85 ee13ebd
created signup link
kevalwell ab12982
Made question skeleton
hoathenguyen85 8847f11
Created User Essentials
kevalwell ac9589a
added index method to user controller
samguergen 3418b94
Finish question/new
hoathenguyen85 405dd5d
Merge pull request #4 from kevalwell/question_new
kevalwell 38d08b4
Merge pull request #5 from kevalwell/Sam_User_Index
hoathenguyen85 43aad9f
added custom route for login
samguergen 3578d61
Made question/show page
hoathenguyen85 c1a64fb
Made show action method for the question controller
hoathenguyen85 295c257
finished login controller
samguergen c9674e4
Create view for new user
kevalwell 42b7513
finished login form on login erb page
samguergen 828ea94
Made show page for question controller. shows question, answers, and…
hoathenguyen85 0651f74
finished login route - login form displays success and redirect success
samguergen 8970673
Merge pull request #6 from kevalwell/Sam_Login
samguergen d4325ce
Add answers controller routes
hoathenguyen85 df9698d
create user form
kevalwell d6f2abb
Merge branch 'master' into ka/NewUser
hoathenguyen85 0e40eb2
Merge branch 'ka/NewUser'
hoathenguyen85 db7ae59
Users working
kevalwell af4693b
Made answer create form
hoathenguyen85 eead885
view user page
kevalwell 1d15602
Merge branch 'master' of github.com:kevalwell/StackOverflow into ques…
hoathenguyen85 3d3dae6
Merge pull request #8 from kevalwell/ka/NewUser
hoathenguyen85 24a427d
made Answer Controller
hoathenguyen85 445d33f
Add answer form
hoathenguyen85 28b0f32
Fix routes by merging into resource block
hoathenguyen85 09392cb
Moved erb back
hoathenguyen85 4d1c79a
Merge branch 'master' of github.com:kevalwell/StackOverflow into ques…
hoathenguyen85 5280d2b
Save answer from question#show
hoathenguyen85 f06a96f
header auth additions/routes additions/questions index/answers edit/s…
78da0cb
Merge pull request #9 from kevalwell/question_show
hoathenguyen85 3a163ae
Merge branch 'master' into Malcolm_Friday
hoathenguyen85 c8421eb
Merge branch 'Malcolm_Friday'
hoathenguyen85 fb39f8e
Fixed minor question code
hoathenguyen85 5e24a30
clean up controllers
55f9b1c
link to users
9d9ffa1
questions index
ca5bdd2
finished destroy method for questions
samguergen 39d4906
finished create route for questions
samguergen 4d5a15b
user show
84b645b
finished delete question link on questions show page
samguergen 41fe156
delete route and link working succesfully for questions.
samguergen 6544d88
finished add question link
samguergen ff48b5f
Merge pull request #12 from kevalwell/Sam_Delete_Create_Question
samguergen 3f7d072
Merge branch 'master' into Malcolm_front_pt_1
hoathenguyen85 fc0a375
Merge branch 'Malcolm_front_pt_1'
hoathenguyen85 0156e1f
finished answer delete route
samguergen 3f44129
Update answer#create/update
hoathenguyen85 7ec6c60
fixed comment edit route
samguergen f330df7
Merge branch 'master' into Sam_AnswerDeleterouteEditLink
hoathenguyen85 5fce53f
Merge branch 'Sam_AnswerDeleterouteEditLink'
hoathenguyen85 0c97e87
Merge pull request #13 from kevalwell/answer
hoathenguyen85 0d1ba30
made existing destroy method into logout method, so that destroy method
samguergen 33a37fc
finished user destroy method and link from user show page
samguergen 3981edf
Fix Login/logout on layout
438e5fe
added link to user show on user index
samguergen f8a8d42
added edit and update rout for user
samguergen 7649419
finished edit route for user and link to edit route from user show page
samguergen 33c8c45
Merge pull request #15 from kevalwell/ka/login
hoathenguyen85 f315335
Merge pull request #16 from kevalwell/Sam_User_EditDelete
samguergen 32aac22
fix auth for header
4f30139
fixed header
1e17abd
fix header
7537732
fixed header
ca233c6
Merge branch 'master' of https://github.com/kevalwell/StackOverflow i…
115c8be
Merge pull request #17 from kevalwell/Malcolm_front_pt_1
hoathenguyen85 59c3ba4
fix login
9fdb57f
final header fix
12bd93a
Merge branch 'master' into Malcolm_front_pt_1
hoathenguyen85 4abb427
Merge branch 'Malcolm_front_pt_1'
hoathenguyen85 9fa6e22
Made polymorphic comments and votes table
8274da3
edit show
764b21e
Add links for user and question
5e7491b
Merge pull request #19 from kevalwell/poly_tables
hoathenguyen85 67a2908
Merge branch 'master' of https://github.com/kevalwell/StackOverflow
d913054
Put question and answer links on user_index page
kevalwell 31d2f0f
Merge pull request #20 from kevalwell/ka/question_links
kevalwell a813ff5
added partial to votes erb page on questions show page
samguergen 259ac78
question show user sections
1b8a36d
added votes controller and nested resources votes inside resources an…
samguergen 8e6bd4f
Merge pull request #21 from kevalwell/question_show_frontend
hoathenguyen85 9d84042
user cant answer unless logged in
79e7123
Merge pull request #22 from kevalwell/answer_question_auth
hoathenguyen85 7974aa1
create comment seeds && Comment folderpaths
kevalwell f9800da
created comments resource
kevalwell 8523e2b
made links
ee044b4
Created form that accepts user_id
kevalwell bfad446
more styling
9f7512c
Merge pull request #23 from kevalwell/sign_login_ajax
hoathenguyen85 16f10c3
altered comment controller
kevalwell 724ff8d
Created Comment area for answer
kevalwell b62593e
Fix bug...use reg variable and not instance variable
hoathenguyen85 292797d
Merge pull request #25 from kevalwell/answer_bug
hoathenguyen85 831556a
vote links working but like and dislike links cannot both display on …
samguergen 8feba3d
both like and dislike displaing with link_to and not button
samguergen 5087c2d
delete unnecessary method for downpost- all is working for votes
samguergen 62fc16d
Merge branch 'master' into Sam_Votes, also updated the comment & vote…
acdade0
Merge branch 'Sam_Votes'
b0f9938
user index names
79235ed
question index links fix
5d38de8
user index contents height fix
86b1bf8
Merge branch 'master' into ka/comments
6264ce7
Fix Login for incorrect email error
kevalwell 3d10130
created comment controller new form and partial
kevalwell cd11a54
Update link to use id and type of the comment table
02e17ce
Comment now carries id and parentquestion
kevalwell 2a0fe9f
Comment Working
kevalwell 8e1dff1
answer amount on question show
0ad240f
Comments as unordered list displaying comment content
kevalwell c051be0
Create spec files
kevalwell 1720753
Created supporting spec files
kevalwell 10ea860
User_spec && Question Spec
kevalwell c87b57c
edited gemfile
kevalwell db2f9d5
reformatted comments
kevalwell c6d7f91
rspecs failing but running
kevalwell ee93eba
vote answers in votes controller
5451a96
Validations on user email
kevalwell ed2b8fe
Tests Not passing yet
kevalwell cf0a34b
Merge pull request #28 from kevalwell/ka/comment_working
kevalwell 41b2221
Add a comment
kevalwell 2e1d119
Merge pull request #29 from kevalwell/ka/tweaks
kevalwell 77fe045
Comment saves for answers and questions
7742d7c
Merge branch 'ka/comments'
4686095
answer votes
59b18cb
Merge pull request #30 from kevalwell/Malcolm_Sunday_edits
hoathenguyen85 68ff5f6
Nifty Search Bar for User Index
kevalwell ae425a2
comment/edit/delete styling
78a687d
delete/edit styling
48b8561
footer
92928a5
Merge pull request #32 from kevalwell/final_edits
95db26d
Merge pull request #31 from kevalwell/ka/search_bar
kevalwell ff5dce3
Merge branch 'master' of https://github.com/kevalwell/StackOverflow
f3d2037
Merge branch 'master' of https://github.com/kevalwell/StackOverflow
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
The MIT License (MIT) | ||
|
||
Copyright (c) 2015 Kevin Alwell | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# StackOverflow |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Think this is not used? In any case, in general, it's better ux to show / hide / dynamically create forms with JS rather than get+partial (it's a good idea to avoid a network round-trip if we can.)