summaryrefslogtreecommitdiff
path: root/db
AgeCommit message (Collapse)Author
2014-03-06merge ready?guntasgrewal
2014-03-06new generateguntasgrewal
2014-03-06add a user_tournament_pairLuke Shumaker
2014-03-05Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05Merge 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-05move the separate migrations into the original generatesLuke Shumaker
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-03Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-03Merge branch 'clean'Luke Shumaker
Conflicts: generate.sh
2014-03-03fix index-adding migrations (I think), and fix `git add`ing schema.rbLuke Shumaker
2014-03-03Merge branch 'clean'Luke Shumaker
Conflicts: generate.sh
2014-03-03Have generate.sh to tricky git stuff, run itLuke Shumaker
also, stick in a couple of missing 'bundle exec's
2014-03-03Merge 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-03run ./generate.shLuke Shumaker
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03Made it possible to log in from the sign up page. As in I put a link under ↵AndrewMurrell
the mess I made.
2014-03-03Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-03Some 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-02Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-02changed the generate.shDavisLWebb
2014-03-02Added Tournament Name.AndrewMurrell
2014-03-02Added --force flags for parts of the generator.AndrewMurrell
2014-03-02The start script is less obnoxious now.AndrewMurrell
2014-03-02THIS SHOULD COMMIT THE SESSION FILESDavisLWebb
2014-03-02Finished sessions and updated user modelDavisLWebb
2014-03-02app html still hereTomer Kimia
2014-03-02currently adding Session controller and viewDavisLWebb
2014-03-02Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb
2014-03-02Gemfile.lockDavisLWebb
2014-03-02Not sure what this merge is... will investigateTomer Kimia
Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-02added preliminary homepageTomer Kimia
2014-03-01Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-01doc/.gitignore: ignore generated documentationLuke Shumaker
2014-03-01mv docs docLuke Shumaker
2014-03-01quick and dirty cssTomer Kimia
2014-03-01changed the gemfile to include rspecy testing and a security name i cant ↵DavisLWebb
remember the name of
2014-03-01changed the user section of the generateDavisLWebb
2014-03-01Added some stuff in db/migrateDavisLWebb
2014-03-01Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-03-01Made the start script sent 2> to a file called server.talk for later reference.AndrewMurrell
2014-03-01I added a start.sh file so that you can just type ./start.sh to both ↵AndrewMurrell
generate and start the server.
2014-02-28fixed db/seeds.rb and tried to get the game... did not succeedTomer Kimia
2014-02-27Merge branch 'master' of http://github.com/LukeShu/leaguerDavisLWebb
2014-02-27Booted the strapDavisLWebb
2014-02-27Added the seeding to generation.AndrewMurrell
2014-02-27Added the Games Attributes stuff.AndrewMurrell
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-18 13:05:40 +0000