summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-06make the join tables not have modelsLuke Shumaker
2014-03-06Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb db/migrate/20140306024707_create_servers.rb db/migrate/20140306024711_create_matches.rb db/migrate/20140306024713_create_teams.rb db/migrate/20140306024715_create_alerts.rb db/migrate/20140306024718_create_pms.rb db/migrate/20140306024722_create_users.rb db/migrate/20140306024724_create_sessions.rb db/migrate/20140306024729_create_server_settings.rb db/migrate/20140306024731_create_user_team_pairs.rb db/migrate/20140306024733_create_team_match_pairs.rb db/migrate/20140306024735_create_tournament_options.rb db/migrate/20140306024744_add_hidden_attrs_to_user.rb db/migrate/20140306202154_create_servers.rb db/migrate/20140306202156_create_tournaments.rb db/migrate/20140306202158_create_matches.rb db/migrate/20140306202200_create_teams.rb db/migrate/20140306202202_create_alerts.rb db/migrate/20140306202204_create_pms.rb db/migrate/20140306202207_create_games.rb db/migrate/20140306202209_create_users.rb db/migrate/20140306202211_create_sessions.rb db/migrate/20140306202213_create_game_attributes.rb db/migrate/20140306202215_create_server_settings.rb db/migrate/20140306202217_create_tournament_options.rb db/migrate/20140306202219_create_user_team_pairs.rb db/migrate/20140306202224_create_team_match_pairs.rb db/migrate/20140306202232_add_hidden_attrs_to_user.rb db/migrate/20140306222309_create_servers.rb db/migrate/20140306222320_create_matches.rb db/migrate/20140306222325_create_teams.rb db/migrate/20140306222330_create_alerts.rb db/migrate/20140306222336_create_pms.rb db/migrate/20140306222347_create_users.rb db/migrate/20140306222352_create_sessions.rb db/migrate/20140306222357_create_server_settings.rb db/migrate/20140306222402_create_tournament_options.rb db/migrate/20140306222422_create_user_team_pairs.rb db/migrate/20140306222427_create_team_match_pairs.rb db/migrate/20140306222447_add_hidden_attrs_to_user.rb db/schema.rb generate.sh
2014-03-06new generateguntasgrewal
2014-03-06add a user_tournament_pairLuke Shumaker
2014-03-05use separate migrations to make things hidden, add user#groups:integerLuke Shumaker
2014-03-05move the separate migrations into the original generatesLuke Shumaker
2014-03-05make a session model as well as controllerLuke Shumaker
2014-03-03fix index-adding migrations (I think), and fix `git add`ing schema.rbLuke Shumaker
2014-03-03Have generate.sh to tricky git stuff, run itLuke Shumaker
also, stick in a couple of missing 'bundle exec's
2014-03-03run ./generate.shLuke Shumaker
2014-03-03touch up the Gemfile, comment out alternative testing frameworksLuke Shumaker
2014-03-03fiddle with 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-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-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-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
2014-02-27give tournaments a game typeLuke Shumaker
2014-02-27add game typesLuke Shumaker
2014-02-26Possibly broke everything. Added another model for populating tournament ↵AndrewMurrell
options.
2014-02-20fix datatype names in generate.shDavisLWebb
2014-02-18Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-02-18Changes to generate.shAndrewMurrell
2014-02-18Updated generate and added basic instruction block comment.AndrewMurrell
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-19 04:13:15 +0000