summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-22Merge branch 'clean2'Luke Shumaker
Conflicts: app/models/team.rb app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-22run ./generate.shLuke Shumaker
2014-04-22re-factor for tournament_stage's and separate scheduling modulesLuke Shumaker
2014-04-22Get changes to generate.sh from masterLuke Shumaker
2014-04-22tidyLuke Shumaker
2014-04-22fixed permissions styletkimia
2014-04-22Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-22footer problems have been fixedtkimia
2014-04-22Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-22not exactly sure what's wrong with the labels, but fixed true/falseAndrewMurrell
2014-04-22Merge remote-tracking branch 'origin/master'Luke Shumaker
Conflicts: app/models/match.rb
2014-04-22Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-22run ./generate.shLuke Shumaker
2014-04-22generate.sh: add discussed changesLuke Shumaker
2014-04-22migrated from stype to vartype because Luke changes my variable names ↵AndrewMurrell
without consulting me.
2014-04-22Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-22added match.win?(player) for checking if a player won a match or notAndrewMurrell
2014-04-22Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-22redesign of tournaments index and matches indextkimia
2014-04-22Made Scoring Algorithm files use the statistics interface and accept matches ↵AndrewMurrell
for a more general approach.
2014-04-22styled captcha and noticestkimia
2014-04-22new background texture. fixed inconsistency with login pagetkimia
2014-04-21prelim style 2.0tkimia
2014-04-21re-jigger Tournament::SettingLuke Shumaker
2014-04-21Merge branch 'clean2'Luke Shumaker
2014-04-21run ./generate.shLuke Shumaker
2014-04-21generate.sh: remove the 'server_setting' modelLuke Shumaker
2014-04-21normalize field names between {game,tournament}_settingLuke Shumaker
2014-04-21Merge branch 'clean2'Luke Shumaker
Conflicts: start.sh
2014-04-21run ./generate.shLuke Shumaker
2014-04-21generate.sh: add api_requests for managing throttlingLuke Shumaker
2014-04-21generate.sh: s/preference/setting/Luke Shumaker
2014-04-21tidy upLuke Shumaker
2014-04-21Merge branch 'clean2'Luke Shumaker
Conflicts: Gemfile
2014-04-21touch up GemfileLuke Shumaker
2014-04-21simplify/correct seeds development checkLuke 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-19Added some more scoring functions in ScoringAlgorithms.rbAndrewMurrell
2014-04-19Added ScoringAlgorithms to libAndrewMurrell
2014-04-19redirect is slightly more intelligentAndrewMurrell
2014-04-19fix seeds.rbLuke Shumaker
2014-04-19Set the default user permissions in the model instead of controllerLuke Shumaker
2014-04-19Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-19only seed sample users if in dev mode, create an admin userLuke Shumaker
2014-04-19Fixed seeds for game settings.AndrewMurrell
2014-04-17Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-17temp new layoutstkimia