summaryrefslogtreecommitdiff
path: root/db
AgeCommit message (Collapse)Author
2014-04-28Luke did some shit I dont know if he finishednfoy
2014-04-28Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-28Luke did some shit I dont know if he finishednfoy
2014-04-28bracket changes to status 2tkimia
2014-04-28Fixed seeding issuenfoy
2014-04-28Fixed the db/seeds merge conflictnfoy
2014-04-28Added stage creation and hearthstone tournament to seedsnfoy
2014-04-28Fixed some things in seeds.rbguntasgrewal
2014-04-28Merge branch 'clean2'AndrewMurrell
2014-04-28ran the generate thingyAndrewMurrell
2014-04-28oops: fix db/seeds.rbLuke Shumaker
2014-04-28clean up db/seeds.rbLuke Shumaker
2014-04-28Merge 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-28run ./generate.shLuke Shumaker
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