summaryrefslogtreecommitdiff
path: root/app/models
AgeCommit message (Expand)Author
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
2014-03-05User model: implement #in_group?Luke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
2014-03-05make a session model as well as controllerLuke Shumaker
2014-03-04Changed some username validation stuffDavisLWebb
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Git is telling me to commit I dont know whyDavisLWebb
2014-03-04oopsLuke Shumaker
2014-03-04fooLuke Shumaker
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04fix typos in commentsLuke Shumaker
2014-03-03Merge branch 'clean4'Luke Shumaker
2014-03-03Log out buttonguntasgrewal
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-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-01changed the user section of the generateDavisLWebb
2014-03-01user modelDavisLWebb