summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Expand)Author
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
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-07small changesTomer Kimia
2014-03-07such progress, very barTomer Kimia
2014-03-07FUCK IT WAS THE DAMN PERCENT IT COMES AFTER THE NUMBER NOT BEFORE WTF. the pr...Tomer Kimia
2014-03-07Foy found my error '!=' not '==' in tournament model.AndrewMurrell
2014-03-07tournaments table is betterTomer Kimia
2014-03-07no conflicts:Tomer Kimia
2014-03-07notices in center, league of legends seed fixedTomer Kimia
2014-03-07I think I fixed the issue with permissions.AndrewMurrell
2014-03-07I changed some of the views for the tournaments and matches (like how match c...DavisLWebb
2014-03-07It is 1:30 AMLuke Shumaker
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-07Hey guys, I made it work. Just pick max_players_per_match to be 1.AndrewMurrell
2014-03-07lukeDavisLWebb
2014-03-07Merge branch 'clean'DavisLWebb
2014-03-07Merge branch 'clean'DavisLWebb
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-07Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-07I changed a viewDavisLWebb