summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 ↵DavisLWebb
box for both
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
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/show.json.jbuilder db/migrate/20140306014123_add_index_to_users_email.rb db/migrate/20140306014125_add_index_to_users_user_name.rb db/migrate/20140306014128_add_password_digest_to_users.rb db/migrate/20140306014130_add_remember_token_to_users.rb db/schema.rb
2014-03-05move the separate migrations into the original generatesLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb config/routes.rb
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 ↵Tomer Kimia
app/views/tournaments/_selected.html.erb
2014-03-04fixed css conflictTomer Kimia
2014-03-04I REALLY hope I'm not overwriting anythingTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss
2014-03-04start.sh:Tomer 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
Conflicts: app/controllers/sessions_controller.rb
2014-03-04login/logout buttonsLuke Shumaker
2014-03-04fix SessionsController#createLuke Shumaker
2014-03-04last hopeTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-04login worksTomer Kimia
2014-03-04changed routes againDavisLWebb
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04RoutesDavisLWebb
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04sign out edit 2guntasgrewal
2014-03-04mergin' the wizardTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
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
2014-03-04Changed some username validation stuffDavisLWebb
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-04Buttons fixedguntasgrewal
generated by cgit v1.1-4-g5e80 at 2024-07-02 23:48:22 +0000