Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-03-04 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
2014-03-04 | undelete application.js | Luke Shumaker | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-03-04 | Here's to messing everything up. | AndrewMurrell | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
2014-03-04 | minor color changes | guntasgrewal | |
2014-03-04 | games no longer has conflict | Tomer Kimia | |
2014-03-04 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
Conflicts: app/controllers/sessions_controller.rb | |||
2014-03-04 | login/logout buttons | Luke Shumaker | |
2014-03-04 | fix SessionsController#create | Luke Shumaker | |
2014-03-04 | last hope | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer | |||
2014-03-04 | login works | Tomer Kimia | |
2014-03-04 | changed routes again | DavisLWebb | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | Routes | DavisLWebb | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
2014-03-04 | sign out edit 2 | guntasgrewal | |
2014-03-04 | mergin' the wizard | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer | |||
2014-03-04 | signin gives error if user cannot sign in | Tomer Kimia | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
2014-03-04 | sign out link edited | guntasgrewal | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | Changed some username validation stuff | DavisLWebb | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
2014-03-04 | Buttons fixed | guntasgrewal | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | routes has redirection | Tomer Kimia | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
2014-03-04 | show errors when signing up | Luke Shumaker | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-04 | Log buttons | guntasgrewal | |
2014-03-04 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
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-04 | Git is telling me to commit I dont know why | DavisLWebb | |
2014-03-04 | itest git | guntasgrewal | |
2014-03-04 | oops | Luke Shumaker | |
2014-03-04 | foo | Luke Shumaker | |
2014-03-04 | Merge branch 'master' of https://github.com/LukeShu/leaguer | guntasgrewal | |
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-04 | Use the navbar header to demonstrate using SCSS @extend | Luke Shumaker | |
2014-03-04 | fix typos in comments | Luke Shumaker | |
2014-03-04 | make notifications be shown an all pages | Luke Shumaker | |
2014-03-04 | indent application.html.erb | Luke Shumaker | |
2014-03-04 | simplify the sessions routing | Luke Shumaker | |
2014-03-04 | don't run generate in start.sh, ignore nohup.out | Luke Shumaker | |
2014-03-03 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb | |||
2014-03-03 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: generate.sh | |||
2014-03-03 | fix index-adding migrations (I think), and fix `git add`ing schema.rb | Luke Shumaker | |
2014-03-03 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: generate.sh | |||
2014-03-03 | Have generate.sh to tricky git stuff, run it | Luke Shumaker | |
also, stick in a couple of missing 'bundle exec's | |||
2014-03-03 | Merge branch 'clean4' | Luke Shumaker | |
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/assets/stylesheets/static.css.scss app/controllers/sessions_controller.rb app/controllers/static_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/models/game.rb app/models/user.rb app/views/games/index.html.erb app/views/tournaments/index.html.erb app/views/tournaments/new.html.erb app/views/users/_form.html.erb app/views/users/index.html.erb app/views/users/index.json.jbuilder app/views/users/new.html.erb app/views/users/show.html.erb app/views/users/show.json.jbuilder config/routes.rb generate.sh |