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-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 | |||
2014-03-03 | run ./generate.sh | Luke Shumaker | |
2014-03-03 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-03-03 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-03 | Made it possible to log in from the sign up page. As in I put a link under ↵ | AndrewMurrell | |
the mess I made. | |||
2014-03-03 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-03 | Some of the stuff I forgot to commit last night. Updated and cleaned up some ↵ | AndrewMurrell | |
pages as well as getting the gameType listing to work. | |||
2014-03-02 | Merge branch 'master' of http://github.com/LukeShu/leaguer | AndrewMurrell | |
2014-03-02 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-02 | changed the generate.sh | DavisLWebb | |
2014-03-02 | Added Tournament Name. | AndrewMurrell | |
2014-03-02 | Added --force flags for parts of the generator. | AndrewMurrell | |
2014-03-02 | The start script is less obnoxious now. | AndrewMurrell | |
2014-03-02 | THIS SHOULD COMMIT THE SESSION FILES | DavisLWebb | |
2014-03-02 | Finished sessions and updated user model | DavisLWebb | |
2014-03-02 | app html still here | Tomer Kimia | |
2014-03-02 | currently adding Session controller and view | DavisLWebb | |
2014-03-02 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb | |||
2014-03-02 | Gemfile.lock | DavisLWebb | |
2014-03-02 | Not sure what this merge is... will investigate | Tomer Kimia | |
Merge branch 'master' of https://github.com/LukeShu/leaguer | |||
2014-03-02 | added preliminary homepage | Tomer Kimia | |
2014-03-01 | Merge branch 'master' of github.com:LukeShu/leager | Luke Shumaker | |
2014-03-01 | doc/.gitignore: ignore generated documentation | Luke Shumaker | |
2014-03-01 | mv docs doc | Luke Shumaker | |
2014-03-01 | quick and dirty css | Tomer Kimia | |
2014-03-01 | changed the gemfile to include rspecy testing and a security name i cant ↵ | DavisLWebb | |
remember the name of | |||
2014-03-01 | changed the user section of the generate | DavisLWebb | |
2014-03-01 | Added some stuff in db/migrate | DavisLWebb | |
2014-03-01 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-03-01 | Made the start script sent 2> to a file called server.talk for later reference. | AndrewMurrell | |
2014-03-01 | I added a start.sh file so that you can just type ./start.sh to both ↵ | AndrewMurrell | |
generate and start the server. | |||
2014-02-28 | fixed db/seeds.rb and tried to get the game... did not succeed | Tomer Kimia | |
2014-02-27 | Merge branch 'master' of http://github.com/LukeShu/leaguer | DavisLWebb | |
2014-02-27 | Booted the strap | DavisLWebb | |
2014-02-27 | Added the seeding to generation. | AndrewMurrell | |
2014-02-27 | Added the Games Attributes stuff. | AndrewMurrell | |
2014-02-27 | Added the Games Attributes stuff. | AndrewMurrell | |
2014-02-27 | give tournaments a game type | Luke Shumaker | |
2014-02-27 | add game types | Luke Shumaker | |
2014-02-26 | Possibly broke everything. Added another model for populating tournament ↵ | AndrewMurrell | |
options. | |||
2014-02-20 | fix datatype names in generate.sh | DavisLWebb | |