summaryrefslogtreecommitdiff
path: root/app/controllers/tournaments_controller.rb
AgeCommit message (Expand)Author
2014-04-01Settled Merge Conflicts.AndrewMurrell
2014-04-01players can now leave tournamentsTomer Kimia
2014-04-01Re-ran generate.AndrewMurrell
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-25Tournament Name addedguntasgrewal
2014-03-25Tournament has a NAME nowguntasgrewal
2014-03-07tournaments table is betterTomer Kimia
2014-03-07Hey guys, I made it work. Just pick max_players_per_match to be 1.AndrewMurrell
2014-03-06Sorry guys.AndrewMurrell
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-06Fixed the registration in the tourney model and fixed a lint int the controller.AndrewMurrell
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06TournamentsController: add stricter host access controlLuke Shumaker
2014-03-06tidy up the tournament join and open controller logicLuke Shumaker
2014-03-06Fixed some merge errors in show.html.erbAndrewMurrell
2014-03-06Redirection works as does the close tournament button.AndrewMurrell
2014-03-06add self as a host to a tourney upon creationLuke Shumaker
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06tournaments setup started. NOT FINISHEDTomer Kimia
2014-03-06Merge branch 'clean'Luke Shumaker
2014-03-06make the join tables not have modelsLuke Shumaker
2014-03-06tournament controller to matches redirectAndrewMurrell
2014-03-06fix joining a tournamentLuke Shumaker
2014-03-06Merge branch 'master2'Luke Shumaker
2014-03-06Merge branch 'clean'Luke Shumaker
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06Here's Luke's stuff because he doesn't have wifi.AndrewMurrell
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06tournaments: fix game selectionLuke Shumaker
2014-03-06fix missing question-marksLuke Shumaker
2014-03-05add access control to the controllers for alerts, servers, and tournamentsLuke Shumaker
2014-03-04Here's to messing everything up.AndrewMurrell
2014-03-03Added some partial rendering.AndrewMurrell
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-02-28fixed db/seeds.rb and tried to get the game... did not succeedTomer Kimia
2014-02-27Added one line to tournaments controller.AndrewMurrell
2014-02-27give tournaments a game typeLuke Shumaker
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell