summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
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
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' into master2Luke Shumaker
Conflicts: 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-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb db/migrate/20140306024707_create_servers.rb db/migrate/20140306024711_create_matches.rb db/migrate/20140306024713_create_teams.rb db/migrate/20140306024715_create_alerts.rb db/migrate/20140306024718_create_pms.rb db/migrate/20140306024722_create_users.rb db/migrate/20140306024724_create_sessions.rb db/migrate/20140306024729_create_server_settings.rb db/migrate/20140306024731_create_user_team_pairs.rb db/migrate/20140306024733_create_team_match_pairs.rb db/migrate/20140306024735_create_tournament_options.rb db/migrate/20140306024744_add_hidden_attrs_to_user.rb db/migrate/20140306202154_create_servers.rb db/migrate/20140306202156_create_tournaments.rb db/migrate/20140306202158_create_matches.rb db/migrate/20140306202200_create_teams.rb db/migrate/20140306202202_create_alerts.rb db/migrate/20140306202204_create_pms.rb db/migrate/20140306202207_create_games.rb db/migrate/20140306202209_create_users.rb db/migrate/20140306202211_create_sessions.rb db/migrate/20140306202213_create_game_attributes.rb db/migrate/20140306202215_create_server_settings.rb db/migrate/20140306202217_create_tournament_options.rb db/migrate/20140306202219_create_user_team_pairs.rb db/migrate/20140306202224_create_team_match_pairs.rb db/migrate/20140306202232_add_hidden_attrs_to_user.rb db/migrate/20140306222309_create_servers.rb db/migrate/20140306222320_create_matches.rb db/migrate/20140306222325_create_teams.rb db/migrate/20140306222330_create_alerts.rb db/migrate/20140306222336_create_pms.rb db/migrate/20140306222347_create_users.rb db/migrate/20140306222352_create_sessions.rb db/migrate/20140306222357_create_server_settings.rb db/migrate/20140306222402_create_tournament_options.rb db/migrate/20140306222422_create_user_team_pairs.rb db/migrate/20140306222427_create_team_match_pairs.rb db/migrate/20140306222447_add_hidden_attrs_to_user.rb db/schema.rb generate.sh
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-06Merge branch 'clean'Luke Shumaker
2014-03-06add a user_tournament_pairLuke Shumaker
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-06fix missing question-marksLuke Shumaker
2014-03-05User model: implement #join_groups and #leave_groupsLuke Shumaker
2014-03-05add access control to the controllers for alerts, servers, and tournamentsLuke Shumaker
2014-03-05users_controller: check permissions for doing thingsLuke Shumaker
2014-03-05User model: implement #in_group?Luke 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-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb config/routes.rb
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-04fixed css conflictTomer Kimia
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
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-10-31 20:05:39 +0000