summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-28Tournament: set status=0 by defaultLuke 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-28From master: remove sampling methodLuke Shumaker
2014-04-28Made Round Robin Work (but it makes too many rounds for 1v1s right now)AndrewMurrell
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-28first draft selection. Not done... most of my time was spent reqriting the ↵tkimia
SVG in ERB
2014-04-28Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-28Fixing Errors in lib and hooks into libAndrewMurrell
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-28addes ajax for converstaion it doesnt work right now.guntasgrewal
2014-04-28fix bad mergeLuke Shumaker
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-28implement most of the TODOs in MatchLuke Shumaker
2014-04-28Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-2830 minutes to add a single lineAndrewMurrell
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-28Messages and alerts play together more nicely now.nfoy
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-28Re-jigger the sampling interfaceLuke Shumaker
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-28fixed the db seeds. They can now be startedtkimia
2014-04-27Merge branch 'master' of https://github.com/LukeShu/LeaguerDavisLWebb
Conflicts: app/views/tournaments/_form.html.erb
2014-04-27Fixed an end with a _form and we fixed some other errosDavisLWebb
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-27Alerts now have AJAX. Seeds were changed for tournaments to have sampling ↵guntasgrewal
methods.
2014-04-27Forced Merger - Hostile Takeover.AndrewMurrell
2014-04-27replaced getStatistic with focused whereAndrewMurrell
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-27Fixed conversations.nfoy
2014-04-27handle what I can of `fgrep -r TODO app lib`Luke Shumaker
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-27Re-jig the match life-cycleLuke Shumaker
2014-04-27Fixed the tournament create issueguntasgrewal
2014-04-27Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-27riot_api: update interface, add matchId detectionLuke Shumaker
2014-04-27(incomplete) re-jigger the sampling interfaceLuke Shumaker
2014-04-27dissable sampling/double_blindLuke Shumaker
2014-04-27Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-27Fixed Alerts author field issue.guntasgrewal
2014-04-27riot_api: add detecting when a match is doneLuke Shumaker
2014-04-27Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-27tournaments form: fix changing game typeLuke Shumaker
2014-04-27Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-27Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-27add lib/sampling/peer_review.*Luke Shumaker
2014-04-27touch up commentsLuke Shumaker
2014-04-27remove dead code from MatchesControllerLuke Shumaker
2014-04-27Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell