summaryrefslogtreecommitdiff
path: root/app/models/tournament.rb
AgeCommit message (Collapse)Author
2014-03-06fix joining a tournamentLuke Shumaker
2014-03-06Merge branch 'master2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb config/routes.rb
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06login fixed and some views look betterTomer Kimia
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-02-27give tournaments a game typeLuke Shumaker
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell