summaryrefslogtreecommitdiff
path: root/app/views/matches/show.html.erb
AgeCommit message (Collapse)Author
2014-04-29fix scoring (mostly... I managed to get a 500 while refreshing)Luke Shumaker
2014-04-28Tournament Stage now displays correct stage numberguntasgrewal
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-27touch up commentsLuke Shumaker
2014-04-26Refactored show.html.erb for matchesAndrewMurrell
2014-04-25Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
Conflicts: app/views/matches/show.html.erb
2014-04-25Touch up s/scores/statistics/Luke Shumaker
2014-04-24Mixed things up a bit on the matches controller and show view.AndrewMurrell
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-23Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-23updated comment documentation on show.html.erbAndrewMurrell
2014-04-23clean up the javascript everywhereLuke Shumaker
2014-04-22I hate codeLuke 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-07Added sprint 3 documents.AndrewMurrell
2014-04-07small visual changes to showtkimia
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
in peer review.
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 Peer Review -- Now allows review and scoring -- not tested because ↵AndrewMurrell
Davis can not yaml.
2014-04-07Matches move forward moreguntasgrewal
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-06small changesguntasgrewal
2014-04-06Dragging to Rankguntasgrewal
2014-04-05Match status 1 pageguntasgrewal
2014-04-04Cookie size 20 minutesguntasgrewal
2014-04-01Settled Merge Conflicts.AndrewMurrell
2014-04-01Re-ran generate.AndrewMurrell
2014-03-25Adding match status after solving conflictsguntasgrewal
2014-03-25Match Status addedguntasgrewal
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-07I think I fixed the issue with permissions.AndrewMurrell
2014-03-07It is 1:30 AMLuke Shumaker
2014-03-07lukeDavisLWebb
2014-03-07Merge branch 'clean'DavisLWebb
Conflicts: app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-03-07Merge branch 'clean'DavisLWebb
Conflicts: app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043624_create_teams.rb db/migrate/20140304043626_create_alerts.rb db/migrate/20140304043629_create_pms.rb db/migrate/20140304043633_create_users.rb db/migrate/20140304043637_create_server_settings.rb db/migrate/20140304043700_create_tournament_options.rb db/migrate/20140307045916_create_servers.rb db/migrate/20140307045922_create_matches.rb db/migrate/20140307045927_create_teams.rb db/migrate/20140307045934_create_alerts.rb db/migrate/20140307045941_create_pms.rb db/migrate/20140307050001_create_users.rb db/migrate/20140307050016_create_server_settings.rb db/migrate/20140307050023_create_tournament_options.rb db/migrate/20140307051752_create_servers.rb db/migrate/20140307051756_create_tournaments.rb db/migrate/20140307051800_create_matches.rb db/migrate/20140307051804_create_teams.rb db/migrate/20140307051808_create_alerts.rb db/migrate/20140307051812_create_pms.rb db/migrate/20140307051816_create_games.rb db/migrate/20140307051820_create_users.rb db/migrate/20140307051824_create_game_attributes.rb db/migrate/20140307051827_create_server_settings.rb db/migrate/20140307051831_create_user_team_pairs.rb db/migrate/20140307051835_create_team_match_pairs.rb db/migrate/20140307051853_add_index_to_users_email.rb db/migrate/20140307051857_add_index_to_users_user_name.rb db/migrate/20140307051901_add_password_digest_to_users.rb db/migrate/20140307051904_add_remember_token_to_users.rb db/migrate/20140307051908_create_tournament_options.rb db/schema.rb generate.sh
2014-03-07I changed a viewDavisLWebb
2014-03-06matches now belong to tournamentnfoy
2014-03-04make notifications be shown an all pagesLuke Shumaker
2014-03-02Added Tournament Name.AndrewMurrell
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb