summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04routes has redirectionTomer Kimia
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-04show errors when signing upLuke Shumaker
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-04Log buttonsguntasgrewal
2014-03-04Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/games/index.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
2014-03-04Git is telling me to commit I dont know whyDavisLWebb
2014-03-04itest gitguntasgrewal
2014-03-04oopsLuke Shumaker
2014-03-04fooLuke Shumaker
2014-03-04Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/layouts/application.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
2014-03-04Use the navbar header to demonstrate using SCSS @extendLuke Shumaker
2014-03-04fix typos in commentsLuke Shumaker
generated by cgit v1.1-4-g5e80 at 2024-07-05 13:29:12 +0000