summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2014-03-07small changesTomer Kimia
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-07tournaments table is betterTomer 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-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-07I changed a viewDavisLWebb
2014-03-06Fixed some merge errors in show.html.erbAndrewMurrell
2014-03-06Redirection works as does the close tournament button.AndrewMurrell
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
Conflicts: config/routes.rb
2014-03-06Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb
2014-03-06make the join tables not have modelsLuke Shumaker
2014-03-06tournament controller to matches redirectAndrewMurrell
2014-03-06matches now belong to tournamentnfoy
2014-03-06Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
Conflicts: config/routes.rb
2014-03-06matches routednfoy
2014-03-06fix joining a tournamentLuke Shumaker
2014-03-06Merge branch 'master2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb config/routes.rb
2014-03-06Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/teams/show.html.erb app/views/tournaments/index.html.erb config/routes.rb
2014-03-06defaults now come inTomer Kimia
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06Here's Luke's stuff because he doesn't have wifi.AndrewMurrell
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb
2014-03-06noDavisLWebb
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06tournaments table only shows if tournaments exitsTomer Kimia
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-06tournaments: fix game selectionLuke Shumaker
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-06Users can now log in with user_name and email but I could not make one text ↵DavisLWebb
box for both
2014-03-06Minor visual changesguntasgrewal
2014-03-05users_controller: check permissions for doing thingsLuke Shumaker
2014-03-05undelete more files that Davis accidentally deletedLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/show.json.jbuilder db/migrate/20140306014123_add_index_to_users_email.rb db/migrate/20140306014125_add_index_to_users_user_name.rb db/migrate/20140306014128_add_password_digest_to_users.rb db/migrate/20140306014130_add_remember_token_to_users.rb db/schema.rb
2014-03-05move the separate migrations into the original generatesLuke Shumaker
2014-03-05make a session model as well as controllerLuke Shumaker
2014-03-05simplify with css moreLuke Shumaker
2014-03-05undo my kludgery from when JS was brokenLuke Shumaker
2014-03-05css is simpler than html (remove the hr above the footer, do it with css)Luke Shumaker
2014-03-04dynamic formgit add app/views/tournaments/new.html.erb ↵Tomer Kimia
app/views/tournaments/_selected.html.erb
2014-03-04I REALLY hope I'm not overwriting anythingTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss
2014-03-04some error stylingTomer Kimia
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
generated by cgit v1.1-4-g5e80 at 2024-07-03 01:58:50 +0000