summaryrefslogtreecommitdiff
path: root/app/views/users
AgeCommit message (Collapse)Author
2014-07-10use the appropriate *_field methods instead of text_field ..., type: *Luke Shumaker
2014-07-09clean up some styles and form stuffLuke Shumaker
Just look at the diff.
2014-07-07add AGPL copyright header to all non-trivial non-generated filesLuke Shumaker
2014-05-01clean up grep-able issues in forms (mostly using <p> instead of <div>)Luke Shumaker
2014-05-01Redo styles to be "pure"/simple bootstrap, and fix found issues with forms.Luke Shumaker
2014-04-27More tournament index stuff.nfoy
2014-04-27Tournament index now displays game images.nfoy
Images must be named the exact name of the game and be of the .png format.
2014-04-27misc form touch-upLuke Shumaker
2014-04-24Added get_riot function which to gather, score, and place members in their ↵DavisLWebb
proper blue/purple teams. Also changed the user view so that once the remote_username for League of Legends was added the button would be removed (since we are only supporting league for the remote_usernames right now)
2014-04-23Luke made the remote_username stuff workDavisLWebb
2014-04-23Fixed several user controller errorsDavisLWebb
2014-04-22users look nicetkimia
2014-04-07profiles updatedtkimia
2014-04-06make editing user permissions workLuke Shumaker
2014-04-03CaptchaDavisLWebb
2014-04-01Edit Users now works. Added delayed_job gem.nfoy
2014-03-30Gravitar images added to user pages.nfoy
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-05users_controller: check permissions for doing thingsLuke Shumaker
2014-03-05undelete more files that Davis accidentally deletedLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/show.json.jbuilder db/migrate/20140306014123_add_index_to_users_email.rb db/migrate/20140306014125_add_index_to_users_user_name.rb db/migrate/20140306014128_add_password_digest_to_users.rb db/migrate/20140306014130_add_remember_token_to_users.rb db/schema.rb
2014-03-05move the separate migrations into the original generatesLuke Shumaker
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04show errors when signing upLuke Shumaker
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/games/index.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
2014-03-04make notifications be shown an all pagesLuke Shumaker
2014-03-04simplify the sessions routingLuke Shumaker
2014-03-03Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-03Merge branch 'clean4'Luke Shumaker
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/assets/stylesheets/static.css.scss app/controllers/sessions_controller.rb app/controllers/static_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/models/game.rb app/models/user.rb app/views/games/index.html.erb app/views/tournaments/index.html.erb app/views/tournaments/new.html.erb app/views/users/_form.html.erb app/views/users/index.html.erb app/views/users/index.json.jbuilder app/views/users/new.html.erb app/views/users/show.html.erb app/views/users/show.json.jbuilder config/routes.rb generate.sh
2014-03-03run ./generate.shLuke Shumaker
2014-03-03small thingsTomer Kimia
2014-03-03dont see log in if logged inTomer Kimia
2014-03-03fixed users tableTomer Kimia
2014-03-03Changed password input to password type so that passwords are hidden as *** ↵Tomer Kimia
when typed, also why are we using an html form?
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03view stuffDavisLWebb
2014-03-03Made it possible to log in from the sign up page. As in I put a link under ↵AndrewMurrell
the mess I made.
2014-03-02Since I don't know how to do stuff with forms, I edited the actual HTML to ↵AndrewMurrell
fix where the form submits to. Tomer should help correct it.
2014-03-02I changed the user controllerDavisLWebb
2014-03-01added new user formTomer Kimia
2014-03-01changed the user section of the generateDavisLWebb
2014-02-20fix datatype names in generate.shDavisLWebb
2014-02-18Changes to generate.shAndrewMurrell
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell