summaryrefslogtreecommitdiff
path: root/app/views/tournaments/show.html.erb
AgeCommit message (Collapse)Author
2014-04-06how 2 spell tournament?tkimia
2014-04-03fixed some of andrews weird stuff with starting a tournamenttkimia
2014-04-03footer clears on both sides, has top-margin of 10. Tournament show screen ↵tkimia
repetitive info fixed
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-01AJAX is now working in the tournament loading pageTomer Kimia
2014-04-01oops, removed gerAndrewMurrell
2014-04-01players can now leave tournamentsTomer Kimia
2014-04-01Re-ran generate.AndrewMurrell
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
Conflicts: app/views/tournaments/show.html.erb
2014-03-27New tournement start pageTomer Kimia
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-25Tournament Name addedguntasgrewal
2014-03-25Tournament has a NAME nowguntasgrewal
2014-03-07small changesTomer Kimia
2014-03-07FUCK IT WAS THE DAMN PERCENT IT COMES AFTER THE NUMBER NOT BEFORE WTF. the ↵Tomer Kimia
progress bar in the tournament is up
2014-03-07I changed some of the views for the tournaments and matches (like how match ↵DavisLWebb
creation asked for a winner)
2014-03-06Fixed some merge errors in show.html.erbAndrewMurrell
2014-03-06Redirection works as does the close tournament button.AndrewMurrell
2014-03-06Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb
2014-03-06make the join tables not have modelsLuke Shumaker
2014-03-06tournament controller to matches redirectAndrewMurrell
2014-03-06fix joining a tournamentLuke Shumaker
2014-03-06Merge branch 'clean'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/views/teams/show.html.erb app/views/tournaments/index.html.erb config/routes.rb
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06new generateguntasgrewal
2014-03-04make notifications be shown an all pagesLuke Shumaker
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-02-27give tournaments a game typeLuke Shumaker
2014-02-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell