summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Expand)Author
2014-03-25Adding match status after solving conflictsguntasgrewal
2014-03-25Match Status addedguntasgrewal
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-07It is 1:30 AMLuke Shumaker
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-07Hey guys, I made it work. Just pick max_players_per_match to be 1.AndrewMurrell
2014-03-07Merge branch 'clean'DavisLWebb
2014-03-07Merge branch 'clean'DavisLWebb
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
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-06provide a default value for users' groupsLuke Shumaker
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 http://github.com/LukeShu/leaguerDavisLWebb
2014-03-06committing changes I didnt makeDavisLWebb
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-06matches now belong to tournamentnfoy
2014-03-06Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-06matches routednfoy
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 branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-06noDavisLWebb
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-06tournaments: fix game selectionLuke Shumaker
2014-03-06Users can now log in with user_name and email but I could not make one text b...DavisLWebb
2014-03-06fix missing question-marksLuke Shumaker
2014-03-05add access control to the controllers for alerts, servers, and tournamentsLuke 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