summaryrefslogtreecommitdiff
path: root/app/models
AgeCommit message (Expand)Author
2014-04-03Use the null object pattern for current_user when not logged inshumakl
2014-04-03fix login with tokens belonging to sessionsshumakl
2014-04-03Merge branch 'clean2'shumakl
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
2014-03-07I think I fixed the issue with permissions.AndrewMurrell
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-07Merge branch 'clean'DavisLWebb
2014-03-07Merge branch 'clean'DavisLWebb
2014-03-06add all the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06let anyone always create a tourneyLuke Shumaker
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-06Fixed the registration in the tourney model and fixed a lint int the controller.AndrewMurrell
2014-03-06fix thing againLuke Shumaker
2014-03-06Fixed some merge errors in show.html.erbAndrewMurrell
2014-03-06Redirection works as does the close tournament button.AndrewMurrell
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06fix the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06tournaments setup started. NOT FINISHEDTomer Kimia
2014-03-06use had_and_belongs_to_manyLuke Shumaker
2014-03-06Merge branch 'clean'Luke Shumaker
2014-03-06make the join tables not have modelsLuke Shumaker
2014-03-06Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-06matches routednfoy
2014-03-06fix joining a tournamentLuke Shumaker
2014-03-06Merge branch 'master2'Luke Shumaker
2014-03-06Merge branch 'clean' into master2Luke Shumaker
2014-03-06Merge branch 'clean'Luke Shumaker
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06Here's Luke's stuff because he doesn't have wifi.AndrewMurrell
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-06Merge branch 'clean'Luke Shumaker
2014-03-06add a user_tournament_pairLuke Shumaker
2014-03-05User model: implement #join_groups and #leave_groupsLuke Shumaker