summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-04-03fix login with tokens belonging to sessionsshumakl
2014-04-03fix auto-indent mess upshumakl
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-03do things to avoid merge conflicts with clean2shumakl
2014-04-03normalize to tab indentshumakl
2014-04-03run generate.shshumakl
2014-04-03Move things around between users and sessionsshumakl
2014-04-02now ran generate without gerAndrewMurrell
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-04-01AJAX is now working in the tournament loading pageTomer Kimia
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-01Edit Users now works. Added delayed_job gem.nfoy
2014-04-01Removed gerAndrewMurrell
2014-04-01oops, removed gerAndrewMurrell
2014-04-01Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-01Settled Merge Conflicts.AndrewMurrell
2014-04-01players can now leave tournamentsTomer Kimia
2014-04-01Re-ran generate.AndrewMurrell
2014-03-30Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-30some more work on the stylesTomer Kimia
2014-03-30Gravitar images added to user pages.nfoy
2014-03-27ROUGH listing of tournamentsTomer Kimia
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
generated by cgit v1.1-4-g5e80 at 2024-07-03 05:18:35 +0000