summaryrefslogtreecommitdiff
path: root/app/controllers/matches_controller.rb
AgeCommit message (Collapse)Author
2014-04-26lib methods for tournament_stageAndrewMurrell
2014-04-26Made tons of red. Scheduling works from lib.AndrewMurrell
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-24TOMER WE ADDED YOUR DESIRED 5 TEAM SEEDguntasgrewal
2014-04-24Added get_riot function which to gather, score, and place members in their ↵DavisLWebb
proper blue/purple teams. Also changed the user view so that once the remote_username for League of Legends was added the button would be removed (since we are only supporting league for the remote_usernames right now)
2014-04-24Changed the riot api function name and I am committing it now so I never ↵DavisLWebb
have to do it again
2014-04-24Fixed Scoring for all 1v1 games. Scheduling needs to be fixed to proceed to ↵AndrewMurrell
larger tournys.
2014-04-24Fixed Spacing, Scoring, and began implementing statisticsAndrewMurrell
2014-04-23fix the nil bug from last nightLuke Shumaker
2014-04-22I hate codeLuke Shumaker
2014-04-22Merge branch 'clean2'Luke Shumaker
Conflicts: app/models/team.rb app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-22run ./generate.shLuke Shumaker
2014-04-22re-factor for tournament_stage's and separate scheduling modulesLuke Shumaker
2014-04-22Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-22run ./generate.shLuke Shumaker
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
Conflicts: app/controllers/matches_controller.rb
2014-04-07Moved and updated the not-working asynchronous API auto-update feature.nfoy
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-07It works. Users can do peer review.AndrewMurrell
2014-04-07Merge branch 'clean2'AndrewMurrell
Conflicts: app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-07Ran generate.shAndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Conflicts: app/controllers/matches_controller.rb app/views/matches/show.html.erb
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-07Updated Peer Review -- Now allows review and scoring -- not tested because ↵AndrewMurrell
Davis can not yaml.
2014-04-07fix bugsguntasgrewal
2014-04-07fooguntasgrewal
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07lol# On branch mastertkimia
2014-04-07Matches move forward moreguntasgrewal
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-06matches starttkimia
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
Conflicts: app/assets/stylesheets/matches.css.scss
2014-04-06some more graphicstkimia
2014-04-06Auto-Checking for a match's end is implemented.nfoy
2014-04-06started SVG generationtkimia
2014-04-04Merge branch 'master' into lukeLuke Shumaker
Conflicts: app/controllers/application_controller.rb app/controllers/tournaments_controller.rb
2014-04-04Implement the new security mechanismLuke Shumaker
2014-04-03CaptchaDavisLWebb
2014-04-03Merge branch 'clean2'shumakl
Conflicts: app/controllers/alerts_controller.rb app/controllers/application_controller.rb app/controllers/matches_controller.rb app/controllers/servers_controller.rb app/controllers/sessions_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/models/match.rb app/models/team.rb app/models/tournament.rb app/views/sessions/_form.html.erb app/views/sessions/index.html.erb app/views/sessions/index.json.jbuilder app/views/sessions/show.html.erb app/views/sessions/show.json.jbuilder app/views/tournaments/index.html.erb config/routes.rb generate.sh
2014-04-03normalize to tab indentshumakl
2014-04-03run generate.shshumakl
2014-04-01Settled Merge Conflicts.AndrewMurrell