summaryrefslogtreecommitdiff
path: root/app/views/matches/_form.html.erb
AgeCommit message (Collapse)Author
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-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 'clean2'AndrewMurrell
Conflicts: app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-07Ran generate.shAndrewMurrell
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 changed some of the views for the tournaments and matches (like how match ↵DavisLWebb
creation asked for a winner)
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-06matches routednfoy
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
2014-02-20fix datatype names in generate.shDavisLWebb
2014-02-18Changes to generate.shAndrewMurrell
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-17 23:22:24 +0000