summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Expand)Author
2014-04-04Merge branch 'clean2'Luke Shumaker
2014-04-04run generate.shLuke Shumaker
2014-04-04fix the login cookieLuke Shumaker
2014-04-04Merge branch 'master' into lukeLuke Shumaker
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 rep...tkimia
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 star...tkimia
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
2014-04-03fix login with tokens belonging to sessionsshumakl
2014-04-03fix auto-indent mess upshumakl
2014-04-03Merge branch 'clean2'shumakl
2014-04-03do things to avoid merge conflicts with clean2shumakl
2014-04-03normalize to tab indentshumakl
2014-04-03run generate.shshumakl
2014-04-03Move things around between users and sessionsshumakl
2014-04-02now ran generate without gerAndrewMurrell
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-04-01AJAX is now working in the tournament loading pageTomer Kimia
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-01Edit Users now works. Added delayed_job gem.nfoy
2014-04-01Removed gerAndrewMurrell
2014-04-01oops, removed gerAndrewMurrell
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-30Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-30some more work on the stylesTomer Kimia
2014-03-30Gravitar images added to user pages.nfoy
2014-03-27ROUGH listing of tournamentsTomer Kimia
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-27New tournement start pageTomer Kimia
2014-03-25Adding match status after solving conflictsguntasgrewal
2014-03-25Match Status addedguntasgrewal