summaryrefslogtreecommitdiff
path: root/db
AgeCommit message (Collapse)Author
2014-04-28fixed the db seeds. They can now be startedtkimia
2014-04-27Alerts now have AJAX. Seeds were changed for tournaments to have sampling ↵guntasgrewal
methods.
2014-04-27clean up seeds.rbLuke Shumaker
2014-04-27clean up seeds.rbLuke Shumaker
2014-04-27fixed, seeds, roundrobin, and _show_tournAndrewMurrell
2014-04-27Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/_form.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-27ran ./generate.shLuke Shumaker
2014-04-26Updated permissions. Private messaging should now function properly.nfoy
2014-04-26Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-26run ./generate.shLuke Shumaker
2014-04-26Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-26Removed extra seeded settings.AndrewMurrell
2014-04-26brackets just get createdtkimia
2014-04-26Added 3 more teams to the tournament "3 teams per match"guntasgrewal
2014-04-24seeds and elimination small changesguntasgrewal
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-24added another tournament with 3 teams per match and 1 player per team for ↵guntasgrewal
tomer to test
2014-04-24Merge branch 'clean2'nfoy
Conflicts: app/models/pm.rb app/views/pms/index.html.erb app/views/pms/show.html.erb
2014-04-24run ./generate.shnfoy
2014-04-24TOMER WE ADDED YOUR DESIRED 5 TEAM SEEDguntasgrewal
2014-04-24Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-04-24I am Guntas and I added a bunch of seeds such as: players, tournaments, and ↵guntasgrewal
other stuff. Dont hit enter
2014-04-24Merge branch 'clean2'Luke Shumaker
2014-04-24run ./generate.shLuke Shumaker
2014-04-23Merge branch 'clean2'DavisLWebb
Conflicts: app/models/game.rb
2014-04-23run ./generate.shDavisLWebb
2014-04-23Merge branch 'clean2'DavisLWebb
2014-04-23run ./generate.shDavisLWebb
2014-04-23Merge branch 'clean2'Luke Shumaker
Conflicts: app/assets/stylesheets/static.css.scss app/controllers/static_controller.rb
2014-04-23run ./generate.shLuke Shumaker
2014-04-23updated seeds for RPSAndrewMurrell
2014-04-23updated views for tournament and seedsAndrewMurrell
2014-04-23Removed whitespace, added support for sampling_methods in view, modified seedsAndrewMurrell
2014-04-22Merge branch 'clean2'nfoy
2014-04-22run ./generate.shnfoy
2014-04-22Merge branch 'clean2'Luke Shumaker
Conflicts: app/models/team.rb app/views/matches/index.html.erb app/views/matches/show.html.erb
2014-04-22run ./generate.shLuke Shumaker
2014-04-22Merge remote-tracking branch 'origin/master'Luke Shumaker
Conflicts: app/models/match.rb
2014-04-22Merge branch 'clean2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/match.rb app/views/matches/index.html.erb app/views/matches/show.html.erb app/views/tournaments/index.html.erb app/views/tournaments/show.html.erb
2014-04-22run ./generate.shLuke Shumaker
2014-04-22migrated from stype to vartype because Luke changes my variable names ↵AndrewMurrell
without consulting me.
2014-04-21Merge branch 'clean2'Luke Shumaker
2014-04-21run ./generate.shLuke Shumaker
2014-04-21Merge branch 'clean2'Luke Shumaker
Conflicts: start.sh
2014-04-21run ./generate.shLuke Shumaker
2014-04-21simplify/correct seeds development checkLuke Shumaker
2014-04-20Made settings work for all the different types, CSS needs to be updated.AndrewMurrell
2014-04-19fix seeds.rbLuke Shumaker
2014-04-19Merge branch 'master' of github.com:LukeShu/leaguerLuke Shumaker
2014-04-19only seed sample users if in dev mode, create an admin userLuke Shumaker