Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-04-03 | Merge branch 'master' of https://github.com/LukeShu/leaguer | tkimia | |
2014-04-03 | fixed some of andrews weird stuff with starting a tournament | tkimia | |
2014-04-03 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
2014-04-03 | footer clears on both sides, has top-margin of 10. Tournament show screen ↵ | tkimia | |
repetitive info fixed | |||
2014-04-03 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
2014-04-03 | Added Gravatar support for tournament's index view. | nfoy | |
2014-04-03 | small change in form (Set Rounds no longer viewable). AJAX fixed so that ↵ | tkimia | |
start tournament button enables or disables based on players here. | |||
2014-04-03 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
2014-04-03 | Merge 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-03 | do things to avoid merge conflicts with clean2 | shumakl | |
2014-04-03 | Move things around between users and sessions | shumakl | |
2014-04-02 | now ran generate without ger | AndrewMurrell | |
2014-04-01 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
2014-04-01 | AJAX is now working in the tournament loading page | Tomer Kimia | |
2014-04-01 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
2014-04-01 | Edit Users now works. Added delayed_job gem. | nfoy | |
2014-04-01 | Removed ger | AndrewMurrell | |
2014-04-01 | oops, removed ger | AndrewMurrell | |
2014-04-01 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-04-01 | Settled Merge Conflicts. | AndrewMurrell | |
2014-04-01 | players can now leave tournaments | Tomer Kimia | |
2014-04-01 | Re-ran generate. | AndrewMurrell | |
2014-03-30 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
2014-03-30 | some more work on the styles | Tomer Kimia | |
2014-03-30 | Gravitar images added to user pages. | nfoy | |
2014-03-27 | ROUGH listing of tournaments | Tomer Kimia | |
2014-03-27 | Merge branch 'master' of https://github.com/LukeShu/leaguer | Tomer Kimia | |
Conflicts: app/views/tournaments/show.html.erb | |||
2014-03-27 | New tournement start page | Tomer Kimia | |
2014-03-25 | Adding match status after solving conflicts | guntasgrewal | |
2014-03-25 | Match Status added | guntasgrewal | |
2014-03-25 | revert Guntas | AndrewMurrell | |
2014-03-25 | added match status | guntasgrewal | |
2014-03-25 | Tournament Name added | guntasgrewal | |
2014-03-25 | Tournament has a NAME now | guntasgrewal | |
2014-03-07 | small changes | Tomer Kimia | |
2014-03-07 | FUCK 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-07 | tournaments table is better | Tomer Kimia | |
2014-03-07 | I think I fixed the issue with permissions. | AndrewMurrell | |
2014-03-07 | I changed some of the views for the tournaments and matches (like how match ↵ | DavisLWebb | |
creation asked for a winner) | |||
2014-03-07 | It is 1:30 AM | Luke Shumaker | |
2014-03-07 | luke | DavisLWebb | |
2014-03-07 | Merge branch 'clean' | DavisLWebb | |
Conflicts: app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb | |||
2014-03-07 | Merge 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-07 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-07 | I changed a view | DavisLWebb | |
2014-03-06 | Fixed some merge errors in show.html.erb | AndrewMurrell | |
2014-03-06 | Redirection works as does the close tournament button. | AndrewMurrell | |
2014-03-06 | Merge branch 'master' of github.com:LukeShu/leaguer | Luke Shumaker | |
Conflicts: config/routes.rb | |||
2014-03-06 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/tournaments_controller.rb | |||
2014-03-06 | make the join tables not have models | Luke Shumaker | |