summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Collapse)Author
2014-04-28Misc fixes. (This commit is from Luke on Andrew's box)AndrewMurrell
2014-04-28That query was literally taken from the "don't do this, you'll get SQL ↵Luke Shumaker
injections" example in the Rails tutorial...
2014-04-28remove dead references to {Tournament,Game}#sampling_methodLuke Shumaker
2014-04-28Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/_form.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-28run ./generate.shLuke Shumaker
2014-04-28first draft selection. Not done... most of my time was spent reqriting the ↵tkimia
SVG in ERB
2014-04-27handle what I can of `fgrep -r TODO app lib`Luke Shumaker
2014-04-27Re-jig the match life-cycleLuke Shumaker
2014-04-27Fixed Alerts author field issue.guntasgrewal
2014-04-27remove dead code from MatchesControllerLuke Shumaker
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-27touch up tournament creationLuke Shumaker
2014-04-27Updated Seeing and Round Robin scheduling.AndrewMurrell
2014-04-27Save tournament after changing status.AndrewMurrell
2014-04-27Found where stages were being created twice. Fixed it.AndrewMurrell
2014-04-27sorry about that, didn't mean to commit with -a (git gui was super laggy) ↵AndrewMurrell
reverted tourn controller
2014-04-27fixed, seeds, roundrobin, and _show_tournAndrewMurrell
2014-04-27Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/_form.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-27ran ./generate.shLuke Shumaker
2014-04-27TournamentsController: better error messagesLuke Shumaker
2014-04-27TournamentsController: fix gross hackLuke Shumaker
2014-04-27touch up the tournaments formLuke Shumaker
2014-04-27fix the Tournaments#new form getting submittedLuke Shumaker
2014-04-27Work on the tournament creation pageLuke Shumaker
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-26Some shit I didguntasgrewal
2014-04-26Sampling methods WIPLuke Shumaker
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-26lib methods for tournament_stageAndrewMurrell
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-26Messages is working (besides default permissions)!nfoy
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-26Wrote a script the start the server called start deleted the old one. The ↵guntasgrewal
new one has 2 flag options -c and -s these correspond to starting the console or server respectively.
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-26Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-26Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-26Made tons of red. Scheduling works from lib.AndrewMurrell
2014-04-26run ./generate.shLuke Shumaker
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-26bracket creation is goodtkimia
2014-04-26brackets just get createdtkimia
2014-04-26prelim bracket controltkimia
2014-04-26Added updated Skeleton for match controller.AndrewMurrell
2014-04-24Mixed things up a bit on the matches controller and show view.AndrewMurrell
2014-04-24Merge branch 'clean2'nfoy
Conflicts: app/models/pm.rb app/views/pms/index.html.erb app/views/pms/show.html.erb
2014-04-24run ./generate.shnfoy
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-24Mailboxer progress without generate changes.nfoy
2014-04-24TOMER WE ADDED YOUR DESIRED 5 TEAM SEEDguntasgrewal
2014-04-24rename Tournament#tournament_stages to Tournament#stagesLuke Shumaker