summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Expand)Author
2014-04-10Merge branch 'clean2'tkimia
2014-04-10ran generate.shtkimia
2014-04-07Added sprint 3 documents.AndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-07Moved and updated the not-working asynchronous API auto-update feature.nfoy
2014-04-07Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-07stuffLuke Shumaker
2014-04-07small visual changes to showtkimia
2014-04-07MatchesController: skip peer review if there aren't enough players/teamLuke Shumaker
2014-04-07MstchesController: tidy up commentsLuke Shumaker
2014-04-07fix indentLuke Shumaker
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07ajax support in match showtkimia
2014-04-07Fixed the rejection to be more Ruby-like with .reject.collectAndrewMurrell
2014-04-07Used Ternary operation to blank out current user in the collect of show.html ...AndrewMurrell
2014-04-07It works. Users can do peer review.AndrewMurrell
2014-04-07Merge branch 'clean2'AndrewMurrell
2014-04-07Ran generate.shAndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07Tournament advancement stuff. IT'S 4 AMguntasgrewal
2014-04-07Updated Generate and Re-added hoooksAndrewMurrell
2014-04-07updated matches controller and added hooksAndrewMurrell
2014-04-07Merged _selected.AndrewMurrell
2014-04-07Updated Peer Review -- Now allows review and scoring -- not tested because Da...AndrewMurrell
2014-04-07profiles updatedtkimia
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07fix bugsguntasgrewal
2014-04-07new graphics of the daytkimia
2014-04-07fooguntasgrewal
2014-04-07your team is shown as light green in the tournament treetkimia
2014-04-07MergedAndrewMurrell
2014-04-07Made settings work for league.AndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07lol# On branch mastertkimia
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07Matches move forward moreguntasgrewal
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06Fixed Preferences.AndrewMurrell
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-06MatchesController: define matches_urlLuke Shumaker
2014-04-06indent the matches_controllerLuke Shumaker
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06A few bug fixes, and a bunch of code that almost works.AndrewMurrell
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-06matches starttkimia
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-06small changesguntasgrewal
2014-04-06matches are given teams correctlytkimia
2014-04-06how 2 spell tournament?tkimia