summaryrefslogtreecommitdiff
path: root/config/routes.rb
AgeCommit message (Collapse)Author
2014-04-27routs.rb#brackets: don't route /newLuke Shumaker
2014-04-26prelim bracket controltkimia
2014-04-23Merge branch 'clean2'Luke Shumaker
Conflicts: app/assets/stylesheets/static.css.scss app/controllers/static_controller.rb
2014-04-23remove test codeLuke Shumaker
2014-04-23Merge branch 'clean2'Luke Shumaker
Conflicts: config/initializers/mailboxer.rb config/routes.rb
2014-04-23pre-mergeLuke Shumaker
2014-04-23autoindent *.rb files in config/Luke Shumaker
2014-04-22prelim searchtkimia
2014-04-22re-factor for tournament_stage's and separate scheduling modulesLuke Shumaker
2014-04-22tidyLuke Shumaker
2014-04-10Merge branch 'clean2'tkimia
Conflicts: app/assets/stylesheets/matches.css.scss app/assets/stylesheets/tournaments.css.scss app/controllers/alerts_controller.rb app/controllers/games_controller.rb app/controllers/matches_controller.rb app/controllers/pms_controller.rb app/controllers/servers_controller.rb app/controllers/sessions_controller.rb app/controllers/teams_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/models/alert.rb app/models/game.rb app/models/match.rb app/models/server.rb app/models/session.rb app/models/team.rb app/models/tournament.rb app/models/user.rb app/views/alerts/show.html.erb app/views/games/index.html.erb app/views/games/show.html.erb app/views/matches/_form.html.erb app/views/matches/index.html.erb app/views/matches/index.json.jbuilder app/views/matches/new.html.erb app/views/matches/show.html.erb app/views/matches/show.json.jbuilder app/views/pms/show.html.erb app/views/servers/_form.html.erb app/views/servers/edit.html.erb app/views/servers/show.html.erb app/views/sessions/new.html.erb app/views/tournaments/index.html.erb app/views/tournaments/new.html.erb app/views/tournaments/show.html.erb app/views/users/_form.html.erb app/views/users/edit.html.erb app/views/users/index.html.erb app/views/users/new.html.erb app/views/users/show.html.erb config/routes.rb db/migrate/20140406195921_create_simple_captcha_data.rb db/migrate/20140406235927_create_delayed_jobs.rb db/migrate/20140406235933_create_servers.rb db/migrate/20140406235940_create_matches.rb db/migrate/20140406235946_create_teams.rb db/migrate/20140406235952_create_alerts.rb db/migrate/20140406235958_create_pms.rb db/migrate/20140407000005_create_tournaments.rb db/migrate/20140407000011_create_games.rb db/migrate/20140407000017_create_users.rb db/migrate/20140407000024_create_sessions.rb db/migrate/20140407000030_create_server_settings.rb db/migrate/20140407000036_create_game_settings.rb db/migrate/20140407000042_create_tournament_preferences.rb db/migrate/20140407000048_create_scores.rb db/migrate/20140407000054_create_remote_usernames.rb db/migrate/20140407000100_create_tournament_players_join_table.rb db/migrate/20140407000106_create_tournament_hosts_join_table.rb db/migrate/20140407000112_create_team_user_join_table.rb db/migrate/20140407000118_create_match_team_join_table.rb db/migrate/20140407000143_add_hidden_attrs_to_user.rb db/migrate/20140407041416_create_simple_captcha_data.rb db/migrate/20140407081419_create_delayed_jobs.rb db/migrate/20140407081422_create_servers.rb db/migrate/20140407081425_create_matches.rb db/migrate/20140407081427_create_teams.rb db/migrate/20140407081430_create_alerts.rb db/migrate/20140407081434_create_pms.rb db/migrate/20140407081437_create_tournaments.rb db/migrate/20140407081440_create_games.rb db/migrate/20140407081443_create_users.rb db/migrate/20140407081446_create_sessions.rb db/migrate/20140407081449_create_server_settings.rb db/migrate/20140407081452_create_game_settings.rb db/migrate/20140407081454_create_tournament_preferences.rb db/migrate/20140407081458_create_scores.rb db/migrate/20140407081501_create_remote_usernames.rb db/migrate/20140407081503_create_tournament_players_join_table.rb db/migrate/20140407081506_create_tournament_hosts_join_table.rb db/migrate/20140407081509_create_team_user_join_table.rb db/migrate/20140407081512_create_match_team_join_table.rb db/migrate/20140407081524_add_hidden_attrs_to_user.rb db/migrate/20140410170710_create_simple_captcha_data.rb db/migrate/20140410210717_create_delayed_jobs.rb db/migrate/20140410210723_create_servers.rb db/migrate/20140410210730_create_matches.rb db/migrate/20140410210736_create_teams.rb db/migrate/20140410210743_create_alerts.rb db/migrate/20140410210750_create_pms.rb db/migrate/20140410210756_create_tournaments.rb db/migrate/20140410210803_create_games.rb db/migrate/20140410210809_create_users.rb db/migrate/20140410210816_create_sessions.rb db/migrate/20140410211152_create_server_settings.rb db/migrate/20140410211158_create_game_settings.rb db/migrate/20140410211205_create_tournament_preferences.rb db/migrate/20140410211211_create_scores.rb db/migrate/20140410211217_create_remote_usernames.rb db/migrate/20140410211229_create_tournament_players_join_table.rb db/migrate/20140410211236_create_tournament_hosts_join_table.rb db/migrate/20140410211242_create_team_user_join_table.rb db/migrate/20140410211248_create_match_team_join_table.rb db/migrate/20140410211313_add_hidden_attrs_to_user.rb db/schema.rb test/controllers/matches_controller_test.rb test/fixtures/matches.yml
2014-04-10ran generate.shtkimia
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-04Merge branch 'clean2'Luke Shumaker
Conflicts: config/routes.rb db/schema.rb
2014-04-04run generate.shLuke Shumaker
2014-04-04Merge branch 'master' into lukeLuke Shumaker
Conflicts: app/controllers/application_controller.rb app/controllers/tournaments_controller.rb
2014-04-04Implement the new security mechanismLuke Shumaker
2014-04-03CaptchaDavisLWebb
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-02now ran generate without gerAndrewMurrell
2014-04-01players can now leave tournamentsTomer Kimia
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-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 '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-06routes: make server a single resourceLuke Shumaker
2014-03-06implement tournament joiningLuke Shumaker
2014-03-05make a session model as well as controllerLuke Shumaker
2014-03-04Here's to messing everything up.AndrewMurrell
2014-03-04login/logout buttonsLuke Shumaker
2014-03-04changed routes againDavisLWebb
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04RoutesDavisLWebb
2014-03-04signin gives error if user cannot sign inTomer Kimia
2014-03-04routes has redirectionTomer Kimia
2014-03-04simplify the sessions routingLuke Shumaker
2014-03-03Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-03Merge branch 'clean4'Luke Shumaker
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/assets/stylesheets/static.css.scss app/controllers/sessions_controller.rb app/controllers/static_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/models/game.rb app/models/user.rb app/views/games/index.html.erb app/views/tournaments/index.html.erb app/views/tournaments/new.html.erb app/views/users/_form.html.erb app/views/users/index.html.erb app/views/users/index.json.jbuilder app/views/users/new.html.erb app/views/users/show.html.erb app/views/users/show.json.jbuilder config/routes.rb generate.sh
2014-03-03run ./generate.shLuke Shumaker
2014-03-03routes fixed signoutTomer Kimia
2014-03-03Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-02Users work 1000000000000% but there is a path issue with the htmlDavisLWebb
2014-03-02I changed the user controllerDavisLWebb
2014-03-02added abuttonTomer Kimia
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02currently adding Session controller and viewDavisLWebb
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-16 19:18:09 +0000