summaryrefslogtreecommitdiff
path: root/app/views/tournaments
AgeCommit message (Collapse)Author
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-24more fixes to the SVGtkimia
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-23started with advanced searchtkimia
2014-04-23tournaments: unify params[:game] and params[:tournament][:game_id]Luke Shumaker
2014-04-23updated views for tournament and seedsAndrewMurrell
2014-04-23Fixed the Damned-able radio buttonsAndrewMurrell
2014-04-23Merge branch 'master' of https://github.com/LukeShu/leaguerLuke Shumaker
2014-04-23clean up the javascript everywhereLuke Shumaker
2014-04-23Removed whitespace, added support for sampling_methods in view, modified seedsAndrewMurrell
2014-04-22basic search completetkimia
2014-04-22prelim searchtkimia
2014-04-22Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-22not exactly sure what's wrong with the labels, but fixed true/falseAndrewMurrell
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-22Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-22redesign of tournaments index and matches indextkimia
2014-04-21Merge branch 'clean2'Luke Shumaker
Conflicts: start.sh
2014-04-20Made settings work for all the different types, CSS needs to be updated.AndrewMurrell
2014-04-19redirect is slightly more intelligentAndrewMurrell
2014-04-07stuffLuke Shumaker
2014-04-07new graphics of the daytkimia
2014-04-07Made settings work for league.AndrewMurrell
2014-04-06Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-06A few bug fixes, and a bunch of code that almost works.AndrewMurrell
2014-04-06matches are given teams correctlytkimia
2014-04-06how 2 spell tournament?tkimia
2014-04-05Updated Settings, renaming, tournament views and misc.AndrewMurrell
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguertkimia
2014-04-03fixed some of andrews weird stuff with starting a tournamenttkimia
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-03footer clears on both sides, has top-margin of 10. Tournament show screen ↵tkimia
repetitive info fixed
2014-04-03Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-04-03Added Gravatar support for tournament's index view.nfoy
2014-04-03small change in form (Set Rounds no longer viewable). AJAX fixed so that ↵tkimia
start tournament button enables or disables based on players here.
2014-04-03Merge branch 'clean2'shumakl
Conflicts: app/controllers/alerts_controller.rb app/controllers/application_controller.rb app/controllers/matches_controller.rb app/controllers/servers_controller.rb app/controllers/sessions_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/models/match.rb app/models/team.rb app/models/tournament.rb app/views/sessions/_form.html.erb app/views/sessions/index.html.erb app/views/sessions/index.json.jbuilder app/views/sessions/show.html.erb app/views/sessions/show.json.jbuilder app/views/tournaments/index.html.erb config/routes.rb generate.sh
2014-04-03do things to avoid merge conflicts with clean2shumakl
2014-04-02now ran generate without gerAndrewMurrell
2014-04-01Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-04-01AJAX is now working in the tournament loading pageTomer Kimia
2014-04-01Removed gerAndrewMurrell
2014-04-01oops, removed gerAndrewMurrell
2014-04-01Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-04-01Settled Merge Conflicts.AndrewMurrell
2014-04-01players can now leave tournamentsTomer Kimia
2014-04-01Re-ran generate.AndrewMurrell
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-03 23:49:47 +0000