summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Expand)Author
2014-03-06matches routednfoy
2014-03-06defaults now come inTomer Kimia
2014-03-06Here's Luke's stuff because he doesn't have wifi.AndrewMurrell
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-06noDavisLWebb
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06tournaments table only shows if tournaments exitsTomer Kimia
2014-03-06login fixed and some views look betterTomer Kimia
2014-03-06Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-06Users can now log in with user_name and email but I could not make one text b...DavisLWebb
2014-03-06Minor visual changesguntasgrewal
2014-03-06fix missing question-marksLuke Shumaker
2014-03-05User model: implement #join_groups and #leave_groupsLuke Shumaker
2014-03-05add access control to the controllers for alerts, servers, and tournamentsLuke Shumaker
2014-03-05users_controller: check permissions for doing thingsLuke Shumaker
2014-03-05User model: implement #in_group?Luke Shumaker
2014-03-05undelete more files that Davis accidentally deletedLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
2014-03-05move the separate migrations into the original generatesLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
2014-03-05make a session model as well as controllerLuke Shumaker
2014-03-05simplify with css moreLuke Shumaker
2014-03-05undo my kludgery from when JS was brokenLuke Shumaker
2014-03-05css is simpler than html (remove the hr above the footer, do it with css)Luke Shumaker
2014-03-04dynamic formgit add app/views/tournaments/new.html.erb app/views/tournaments/...Tomer Kimia
2014-03-04fixed css conflictTomer Kimia
2014-03-04I REALLY hope I'm not overwriting anythingTomer Kimia
2014-03-04some error stylingTomer Kimia
2014-03-04Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-04undelete application.jsLuke Shumaker
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-04Here's to messing everything up.AndrewMurrell
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04minor color changesguntasgrewal
2014-03-04games no longer has conflictTomer Kimia
2014-03-04Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-04login/logout buttonsLuke Shumaker
2014-03-04fix SessionsController#createLuke Shumaker
2014-03-04last hopeTomer Kimia
2014-03-04login worksTomer Kimia
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04sign out edit 2guntasgrewal
2014-03-04mergin' the wizardTomer Kimia
2014-03-04signin gives error if user cannot sign inTomer Kimia
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04sign out link editedguntasgrewal
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb