summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
AgeCommit message (Collapse)Author
2014-04-06implement editing the default user permissionsLuke Shumaker
2014-04-06make editing user permissions workLuke Shumaker
2014-04-04Merge branch 'master' into lukeLuke Shumaker
Conflicts: app/controllers/application_controller.rb app/controllers/tournaments_controller.rb
2014-04-04Implement the new security mechanismLuke Shumaker
2014-04-03CaptchaDavisLWebb
2014-04-03fix login with tokens belonging to sessionsshumakl
2014-04-03Merge branch 'clean2'shumakl
Conflicts: app/controllers/alerts_controller.rb app/controllers/application_controller.rb app/controllers/matches_controller.rb app/controllers/servers_controller.rb app/controllers/sessions_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/models/match.rb app/models/team.rb app/models/tournament.rb app/views/sessions/_form.html.erb app/views/sessions/index.html.erb app/views/sessions/index.json.jbuilder app/views/sessions/show.html.erb app/views/sessions/show.json.jbuilder app/views/tournaments/index.html.erb config/routes.rb generate.sh
2014-04-03normalize to tab indentshumakl
2014-04-03run generate.shshumakl
2014-03-06provide a default value for users' groupsLuke Shumaker
2014-03-05users_controller: check permissions for doing thingsLuke Shumaker
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05move the separate migrations into the original generatesLuke 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-03users_controller: indentLuke Shumaker
2014-03-03fixed users tableTomer Kimia
2014-03-02Users work 1000000000000% but there is a path issue with the htmlDavisLWebb
2014-03-02I changed the user controllerDavisLWebb
2014-03-02fixed an issue in user controllerDavisLWebb
2014-03-02Added Session controller and helper. Also update user to have a remember_tokenDavisLWebb
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb
2014-03-02Gemfile.lockDavisLWebb
2014-03-01changed the user section of the generateDavisLWebb
2014-03-01users_controller.rbDavisLWebb
2014-02-18Changes to generate.shAndrewMurrell
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell