summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-03modify generate.sh to use tab-indent in the app/ directoryshumakl
2014-04-03Move things around between users and sessionsshumakl
2014-04-02Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-02now ran generate without gerAndrewMurrell
2014-04-01fixed generate -- not run yetAndrewMurrell
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-29Added remote login table for handling remote usernames.AndrewMurrell
2014-03-27Updated GenerateAndrewMurrell
2014-03-27ROUGH listing of tournamentsTomer Kimia
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-27DogDavisLWebb
2014-03-27Doing this to see if it worksDavisLWebb
2014-03-27New tournement start pageTomer Kimia
2014-03-25Adding match status after solving conflictsguntasgrewal
2014-03-25Match Status addedguntasgrewal
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-25Tournament Name addedguntasgrewal
2014-03-25Tournament has a NAME nowguntasgrewal
2014-03-25Merge branch 'clean'guntasgrewal
2014-03-25Changes to generate.shguntasgrewal
2014-03-10Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-10Final upload of files.AndrewMurrell
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-10User story additions and specifications.nfoy
2014-03-10write about the permissions systemLuke Shumaker
2014-03-10Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-10fix bad mergeLuke Shumaker