summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-04-28bracket update workstkimia
2014-04-28Tournament Stage now displays correct stage numberguntasgrewal
2014-04-28bracket changes to status 2tkimia
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-28prediction view now done. used Jquerytkimia
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-28Fixed multiple redirection error.guntasgrewal
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-28Some more changes for alerts with messages.nfoy
2014-04-28Hide the bullets for all unordered lists in formsLuke Shumaker
2014-04-28Misc fixes. (This commit is from Luke on Andrew's box)AndrewMurrell
2014-04-28Make Statistic#value a rich (JSON) objectAndrewMurrell
2014-04-28Titleizer is me.AndrewMurrell
2014-04-28I fixed it. added self and fixed variable names.AndrewMurrell
2014-04-28Titleized things.AndrewMurrell
2014-04-28tweak css moreLuke Shumaker
2014-04-28fight with CSS moreLuke Shumaker
2014-04-28misc view cleanupsLuke Shumaker
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-28go to town on the CSSLuke Shumaker
2014-04-28fix trailing whitespaceLuke Shumaker
2014-04-28tidy various forms and inline CSSLuke Shumaker
2014-04-28Shuffle CSS aroundLuke Shumaker
All element-css should now also be in an actual stylesheet
2014-04-28tidy views/common/_show_tournament.html.erbLuke Shumaker
2014-04-28oopsLuke Shumaker
2014-04-28remove dead references to {Tournament,Game}#sampling_methodLuke Shumaker
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-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