summaryrefslogtreecommitdiff
path: root/app/models
AgeCommit message (Collapse)Author
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-07fix indentLuke Shumaker
2014-04-07It works. Users can do peer review.AndrewMurrell
2014-04-07Tournament advancement stuff. IT'S 4 AMguntasgrewal
2014-04-07MergedAndrewMurrell
2014-04-07Made settings work for league.AndrewMurrell
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
2014-04-06holy shit matches actually move forwardguntasgrewal
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06A few bug fixes, and a bunch of code that almost works.AndrewMurrell
2014-04-06matches are given teams correctlytkimia
2014-04-06some more graphicstkimia
2014-04-06started SVG generationtkimia
2014-04-06implement editing the default user permissionsLuke Shumaker
2014-04-06User.permission_bits: return 2^n instead of n for each.Luke Shumaker
This way they can easily be ORed together, C-like.
2014-04-06make editing user permissions workLuke Shumaker
2014-04-05Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-05Match status 1 pageguntasgrewal
2014-04-05Updated Settings, renaming, tournament views and misc.AndrewMurrell
2014-04-05Commenting my crazy.AndrewMurrell
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-04Cookie size 20 minutesguntasgrewal
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03matches table is back, and a lot of things are fixedtkimia
2014-04-03Merge branch 'master' of https://github.com/LukeShu/LeaguerDavisLWebb
2014-04-03CaptchaDavisLWebb
2014-04-03fixed some of andrews weird stuff with starting a tournamenttkimia
2014-04-03Merge branch 'master' of github.com:LukeShu/leaguershumakl
2014-04-03Use the null object pattern for current_user when not logged inshumakl
2014-04-03Users can't join twicetkimia
2014-04-03fix login with tokens belonging to sessionsshumakl
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-03normalize to tab indentshumakl
2014-04-03run generate.shshumakl
2014-04-01Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-01Settled Merge Conflicts.AndrewMurrell
2014-04-01players can now leave tournamentsTomer Kimia
2014-04-01Re-ran generate.AndrewMurrell
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-25Merge branch 'clean'guntasgrewal
2014-03-25Changes to generate.shguntasgrewal
2014-03-07Foy found my error '!=' not '==' in tournament model.AndrewMurrell
2014-03-07tournaments table is betterTomer Kimia