summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
Conflicts: app/views/tournaments/show.html.erb
2014-03-27New tournement start pageTomer Kimia
2014-03-25Adding match status after solving conflictsguntasgrewal
2014-03-25Match Status addedguntasgrewal
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-25Tournament Name addedguntasgrewal
2014-03-25Tournament has a NAME nowguntasgrewal
2014-03-25Merge branch 'clean'guntasgrewal
2014-03-25Changes to generate.shguntasgrewal
2014-03-07small changesTomer Kimia
2014-03-07such progress, very barTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-07FUCK IT WAS THE DAMN PERCENT IT COMES AFTER THE NUMBER NOT BEFORE WTF. the ↵Tomer Kimia
progress bar in the tournament is up
2014-03-07Foy found my error '!=' not '==' in tournament model.AndrewMurrell
2014-03-07tournaments table is betterTomer Kimia
2014-03-07no conflicts:Tomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-07notices in center, league of legends seed fixedTomer Kimia
2014-03-07I think I fixed the issue with permissions.AndrewMurrell
2014-03-07I changed some of the views for the tournaments and matches (like how match ↵DavisLWebb
creation asked for a winner)
2014-03-07It is 1:30 AMLuke Shumaker
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-07Hey guys, I made it work. Just pick max_players_per_match to be 1.AndrewMurrell
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-07Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-07I changed a viewDavisLWebb
2014-03-06add all the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06Sorry guys.AndrewMurrell
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06let anyone always create a tourneyLuke Shumaker
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-06Fixed the registration in the tourney model and fixed a lint int the controller.AndrewMurrell
2014-03-06provide a default value for users' groupsLuke Shumaker
2014-03-06fix thing againLuke Shumaker
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06TournamentsController: add stricter host access controlLuke Shumaker
2014-03-06tidy up the tournament join and open controller logicLuke Shumaker
2014-03-06Fixed some merge errors in show.html.erbAndrewMurrell
2014-03-06Redirection works as does the close tournament button.AndrewMurrell
2014-03-06add self as a host to a tourney upon creationLuke Shumaker
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-06committing changes I didnt makeDavisLWebb
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
Conflicts: config/routes.rb
2014-03-06fix the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06tournaments setup started. NOT FINISHEDTomer Kimia
2014-03-06use had_and_belongs_to_manyLuke Shumaker
2014-03-06Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb
2014-03-06make the join tables not have modelsLuke Shumaker