summaryrefslogtreecommitdiff
path: root/app/helpers
AgeCommit message (Collapse)Author
2014-04-04Merge branch 'clean2'Luke Shumaker
Conflicts: config/routes.rb db/schema.rb
2014-04-04run generate.shLuke Shumaker
2014-04-04fix the login cookieLuke 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-04Cookie size 20 minutesguntasgrewal
2014-04-03Use the null object pattern for current_user when not logged inshumakl
2014-04-03fix login with tokens belonging to sessionsshumakl
2014-04-03fix auto-indent mess upshumakl
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-02now ran generate without gerAndrewMurrell
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-03I added a lot of documentation to user.rbDavisLWebb
2014-03-03I HAVE THE WEBSITE RENDER THE USER'S USER NAMEDavisLWebb
2014-03-02the users helper wasnt being pushDavisLWebb
2014-03-02THIS SHOULD COMMIT THE SESSION FILESDavisLWebb
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-02added preliminary homepageTomer Kimia
2014-02-27add game typesLuke Shumaker
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
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-18 06:01:03 +0000