summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-04-21Merge branch 'clean2'Luke Shumaker
Conflicts: start.sh
2014-04-21run ./generate.shLuke Shumaker
2014-04-20add convenience methods for accessing user.remote_usernamesLuke Shumaker
2014-04-20Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-20add the "has_many :remote_usernames" relation to the user modelLuke Shumaker
2014-04-20Made settings work for all the different types, CSS needs to be updated.AndrewMurrell
2014-04-19redirect is slightly more intelligentAndrewMurrell
2014-04-19Set the default user permissions in the model instead of controllerLuke Shumaker
2014-04-17Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-17temp new layoutstkimia
2014-04-17redirectionAndrewMurrell
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-07Added sprint 3 documents.AndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
Conflicts: app/controllers/matches_controller.rb
2014-04-07Moved and updated the not-working asynchronous API auto-update feature.nfoy
2014-04-07Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-07stuffLuke Shumaker
2014-04-07small visual changes to showtkimia
2014-04-07MatchesController: skip peer review if there aren't enough players/teamLuke Shumaker
2014-04-07MstchesController: tidy up commentsLuke Shumaker
2014-04-07fix indentLuke Shumaker
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07ajax support in match showtkimia
2014-04-07Fixed the rejection to be more Ruby-like with .reject.collectAndrewMurrell
2014-04-07Used Ternary operation to blank out current user in the collect of show.html ↵AndrewMurrell
in peer review.
2014-04-07It works. Users can do peer review.AndrewMurrell
2014-04-07Merge branch 'clean2'AndrewMurrell
Conflicts: app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-07Ran generate.shAndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Conflicts: app/controllers/matches_controller.rb app/views/matches/show.html.erb
2014-04-07Tournament advancement stuff. IT'S 4 AMguntasgrewal
2014-04-07Updated Generate and Re-added hoooksAndrewMurrell
2014-04-07updated matches controller and added hooksAndrewMurrell
2014-04-07Merged _selected.AndrewMurrell
2014-04-07Updated Peer Review -- Now allows review and scoring -- not tested because ↵AndrewMurrell
Davis can not yaml.
2014-04-07profiles updatedtkimia
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07fix bugsguntasgrewal
2014-04-07new graphics of the daytkimia
2014-04-07fooguntasgrewal
2014-04-07your team is shown as light green in the tournament treetkimia
2014-04-07MergedAndrewMurrell
2014-04-07Made settings work for league.AndrewMurrell
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-07lol# On branch mastertkimia
2014-04-07Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-07Matches move forward moreguntasgrewal
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06Fixed Preferences.AndrewMurrell
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-04 17:27:10 +0000