Age | Commit message (Collapse) | Author | |
---|---|---|---|
2014-03-05 | Merge 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-05 | move the separate migrations into the original generates | Luke Shumaker | |
2014-03-05 | Merge branch 'clean' | Luke Shumaker | |
Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb config/routes.rb | |||
2014-03-05 | make a session model as well as controller | Luke Shumaker | |
2014-03-05 | simplify with css more | Luke Shumaker | |
2014-03-05 | undo my kludgery from when JS was broken | Luke Shumaker | |
2014-03-05 | css is simpler than html (remove the hr above the footer, do it with css) | Luke Shumaker | |
2014-03-04 | dynamic formgit add app/views/tournaments/new.html.erb ↵ | Tomer Kimia | |
app/views/tournaments/_selected.html.erb | |||
2014-03-04 | fixed css conflict | Tomer Kimia | |
2014-03-04 | I REALLY hope I'm not overwriting anything | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss | |||
2014-03-04 | start.sh: | Tomer Kimia | |
2014-03-04 | some error styling | Tomer Kimia | |
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 |