summaryrefslogtreecommitdiff
path: root/app/models/user.rb
AgeCommit message (Expand)Author
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-04Merge branch 'master' into lukeLuke Shumaker
2014-04-04Implement the new security mechanismLuke Shumaker
2014-04-03Merge branch 'master' of https://github.com/LukeShu/LeaguerDavisLWebb
2014-04-03CaptchaDavisLWebb
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-03normalize to tab indentshumakl
2014-03-07tournaments table is betterTomer Kimia
2014-03-07I think I fixed the issue with permissions.AndrewMurrell
2014-03-06add all the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06let anyone always create a tourneyLuke Shumaker
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-06fix the has_and_belongs_to_many relationsLuke Shumaker
2014-03-06use had_and_belongs_to_manyLuke Shumaker
2014-03-06fix joining a tournamentLuke Shumaker
2014-03-06Merge branch 'master2'Luke Shumaker
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06Here's Luke's stuff because he doesn't have wifi.AndrewMurrell
2014-03-05User model: implement #join_groups and #leave_groupsLuke Shumaker
2014-03-05User model: implement #in_group?Luke Shumaker
2014-03-04Changed some username validation stuffDavisLWebb
2014-03-04oopsLuke Shumaker
2014-03-04fooLuke Shumaker
2014-03-04fix typos in commentsLuke Shumaker
2014-03-03app/models/user.rb: indentLuke Shumaker
2014-03-03More documentation changesDavisLWebb
2014-03-03DOCUMENTATION FOR USER.RBDavisLWebb
2014-03-03I added a lot of documentation to user.rbDavisLWebb
2014-03-02I changed the user controllerDavisLWebb
2014-03-02Added Session controller and helper. Also update user to have a remember_tokenDavisLWebb
2014-03-01user modelDavisLWebb