summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Collapse)Author
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb config/routes.rb
2014-03-05make a session model as well as controllerLuke Shumaker
2014-03-04Here's to messing everything up.AndrewMurrell
2014-03-04Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
Conflicts: app/controllers/sessions_controller.rb
2014-03-04fix SessionsController#createLuke Shumaker
2014-03-04login worksTomer Kimia
2014-03-04signin gives error if user cannot sign inTomer Kimia
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-03users_controller: indentLuke Shumaker
2014-03-03fixed users tableTomer Kimia
2014-03-03Added some partial rendering.AndrewMurrell
2014-03-03More documentation changesDavisLWebb
2014-03-02Users work 1000000000000% but there is a path issue with the htmlDavisLWebb
2014-03-02Added Tournament Name.AndrewMurrell
2014-03-02I changed the user controllerDavisLWebb
2014-03-02THIS SHOULD COMMIT THE SESSION FILESDavisLWebb
2014-03-02fixed an issue in user controllerDavisLWebb
2014-03-02Finished sessions and updated user modelDavisLWebb
2014-03-02Added Session controller and helper. Also update user to have a remember_tokenDavisLWebb
2014-03-02working pages by commenting include sessionhelperTomer Kimia
2014-03-02currently adding Session controller and viewDavisLWebb
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-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-02added preliminary homepageTomer Kimia
2014-03-02added preliminary homepageTomer Kimia
2014-03-01changed the user section of the generateDavisLWebb
2014-03-01users_controller.rbDavisLWebb
2014-02-28fixed db/seeds.rb and tried to get the game... did not succeedTomer Kimia
2014-02-27Added the Games Attributes stuff.AndrewMurrell
2014-02-27Added one line to tournaments controller.AndrewMurrell
2014-02-27give tournaments a game typeLuke Shumaker
2014-02-27add game typesLuke Shumaker
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
2014-02-18Run `rails new`Luke Shumaker