Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-03-06 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-03-06 | Fixed the registration in the tourney model and fixed a lint int the controller. | AndrewMurrell | |
2014-03-06 | provide a default value for users' groups | Luke Shumaker | |
2014-03-06 | fix thing again | Luke Shumaker | |
2014-03-06 | Merge branch 'master' of github.com:LukeShu/leaguer | Luke Shumaker | |
2014-03-06 | TournamentsController: add stricter host access control | Luke Shumaker | |
2014-03-06 | tidy up the tournament join and open controller logic | Luke Shumaker | |
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 | add self as a host to a tourney upon creation | Luke Shumaker | |
2014-03-06 | Merge branch 'master' of github.com:LukeShu/leaguer | Luke Shumaker | |
Conflicts: config/routes.rb | |||
2014-03-06 | fix the has_and_belongs_to_many relations | Luke Shumaker | |
2014-03-06 | tournaments setup started. NOT FINISHED | Tomer Kimia | |
2014-03-06 | use had_and_belongs_to_many | Luke Shumaker | |
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 | |
2014-03-06 | tournament controller to matches redirect | AndrewMurrell | |
2014-03-06 | matches now belong to tournament | nfoy | |
2014-03-06 | Merge branch 'master' of https://github.com/LukeShu/leaguer | nfoy | |
Conflicts: config/routes.rb | |||
2014-03-06 | matches routed | nfoy | |
2014-03-06 | fix joining a tournament | Luke Shumaker | |
2014-03-06 | Merge 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-06 | Merge branch 'clean' into master2 | Luke Shumaker | |
Conflicts: config/routes.rb | |||
2014-03-06 | Merge 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-06 | Merge branch 'master' of github.com:LukeShu/leaguer | Luke 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-06 | defaults now come in | Tomer Kimia | |
2014-03-06 | implement tournament joining | Luke Shumaker | |
2014-03-06 | Here's Luke's stuff because he doesn't have wifi. | AndrewMurrell | |
2014-03-06 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb | |||
2014-03-06 | no | DavisLWebb | |
2014-03-06 | merge ready? | guntasgrewal | |
2014-03-06 | new generate | guntasgrewal | |
2014-03-06 | tournaments table only shows if tournaments exits | Tomer Kimia | |
2014-03-06 | login fixed and some views look better | Tomer Kimia | |
2014-03-06 | Merge branch 'clean' | Luke Shumaker | |
2014-03-06 | add a user_tournament_pair | Luke Shumaker | |
2014-03-06 | tournaments: fix game selection | Luke Shumaker | |
2014-03-06 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-06 | Users can now log in with user_name and email but I could not make one text ↵ | DavisLWebb | |
box for both | |||
2014-03-06 | Minor visual changes | guntasgrewal | |
2014-03-06 | fix missing question-marks | Luke Shumaker | |
2014-03-05 | User model: implement #join_groups and #leave_groups | Luke Shumaker | |
2014-03-05 | add access control to the controllers for alerts, servers, and tournaments | Luke Shumaker | |
2014-03-05 | users_controller: check permissions for doing things | Luke Shumaker | |
2014-03-05 | User model: implement #in_group? | Luke Shumaker | |
2014-03-05 | undelete more files that Davis accidentally deleted | Luke Shumaker | |
2014-03-05 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb | |||
2014-03-05 | use separate migrations to make things hidden, add user#groups:integer | Luke Shumaker | |
2014-03-05 | Merge 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-05 | move the separate migrations into the original generates | Luke Shumaker | |