summaryrefslogtreecommitdiff
path: root/app/models/match.rb
AgeCommit message (Collapse)Author
2014-04-28fix bad mergeLuke Shumaker
2014-04-28implement most of the TODOs in MatchLuke Shumaker
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-28Re-jigger the sampling interfaceLuke Shumaker
2014-04-28fixed the db seeds. They can now be startedtkimia
2014-04-27Forced Merger - Hostile Takeover.AndrewMurrell
2014-04-27replaced getStatistic with focused whereAndrewMurrell
2014-04-27Re-jig the match life-cycleLuke Shumaker
2014-04-25Touch up s/scores/statistics/Luke Shumaker
2014-04-22Merge remote-tracking branch 'origin/master'Luke Shumaker
Conflicts: app/models/match.rb
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-22added match.win?(player) for checking if a player won a match or notAndrewMurrell
2014-04-07Moved and updated the not-working asynchronous API auto-update feature.nfoy
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-04Cookie size 20 minutesguntasgrewal
2014-04-03normalize to tab indentshumakl
2014-04-03run generate.shshumakl
2014-03-07It is 1:30 AMLuke Shumaker
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-06add all the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06matches routednfoy
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
2014-02-20fix datatype names in generate.shDavisLWebb
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell