summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2014-04-06Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
Conflicts: app/views/matches/show.html.erb
2014-04-06Auto-Checking for a match's end is implemented.nfoy
2014-04-06solved merge conflictsguntasgrewal
2014-04-06Dragging to Rankguntasgrewal
2014-04-06started SVG generationtkimia
2014-04-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-06I swear I have fixed this beforeLuke Shumaker
2014-04-06Fixed match view, GUNTASDavisLWebb
2014-04-06add a server settings button to the top bar if you have permissionLuke Shumaker
2014-04-06implement editing the default user permissionsLuke Shumaker
2014-04-06oopsLuke 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-06Simplify the server controller and views, as it is a singular resourceLuke Shumaker
2014-04-06Merge branch 'clean2'Luke Shumaker
Conflicts: app/views/servers/show.html.erb
2014-04-06run generateLuke Shumaker
2014-04-06make editing user permissions workLuke Shumaker
2014-04-05Merge branch 'master' of github.com:LukeShu/leaguerLuke 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-04fix issues in tournaments controllerLuke Shumaker
2014-04-04fix tournaments controllerLuke Shumaker
2014-04-04remove hold overs from the old permission systemLuke Shumaker
2014-04-04Merge branch 'clean2'Luke Shumaker
2014-04-04run generate.shLuke Shumaker
2014-04-04Merge branch 'clean2'Luke Shumaker
Conflicts: config/routes.rb db/schema.rb
2014-04-04run generate.shLuke Shumaker
2014-04-04fix the login cookieLuke Shumaker
2014-04-04Merge branch 'master' into lukeLuke Shumaker
Conflicts: app/controllers/application_controller.rb app/controllers/tournaments_controller.rb
2014-04-04re-jigger the TournamentController#update to be all one case blockLuke Shumaker
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-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03fixed some of andrews weird stuff with starting a tournamenttkimia
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03footer clears on both sides, has top-margin of 10. Tournament show screen ↵tkimia
repetitive info fixed
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-03Added Gravatar support for tournament's index view.nfoy
2014-04-03Merge branch 'master' of github.com:LukeShu/leaguershumakl
2014-04-03small change in form (Set Rounds no longer viewable). AJAX fixed so that ↵tkimia
start tournament button enables or disables based on players here.
2014-04-03Use the null object pattern for current_user when not logged inshumakl
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03Users can't join twicetkimia
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy