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-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-03 | run ./generate.sh | Luke Shumaker | |
2014-03-03 | view stuff | DavisLWebb | |
2014-03-01 | changed the user section of the generate | DavisLWebb | |
2014-02-18 | Changes to generate.sh | AndrewMurrell | |
2014-02-18 | Added the generate shell command. Please do not commit the generated files. | AndrewMurrell | |