summaryrefslogtreecommitdiff
path: root/app/views/tournaments/new.html.erb
AgeCommit message (Collapse)Author
2014-03-06Merge branch 'master2'Luke Shumaker
Conflicts: app/controllers/tournaments_controller.rb app/models/tournament.rb app/views/tournaments/_selected.html.erb app/views/tournaments/new.html.erb config/routes.rb
2014-03-06implement tournament joiningLuke Shumaker
2014-03-06Here's Luke's stuff because he doesn't have wifi.AndrewMurrell
2014-03-06tournaments: fix game selectionLuke Shumaker
2014-03-06Minor visual changesguntasgrewal
2014-03-04dynamic formgit add app/views/tournaments/new.html.erb ↵Tomer Kimia
app/views/tournaments/_selected.html.erb
2014-03-04Here's to messing everything up.AndrewMurrell
2014-03-03Merge branch 'clean4'Luke Shumaker
Conflicts: app/assets/stylesheets/scaffolds.css.scss app/assets/stylesheets/static.css.scss app/controllers/sessions_controller.rb app/controllers/static_controller.rb app/controllers/tournaments_controller.rb app/controllers/users_controller.rb app/helpers/sessions_helper.rb app/models/game.rb app/models/user.rb app/views/games/index.html.erb app/views/tournaments/index.html.erb app/views/tournaments/new.html.erb app/views/users/_form.html.erb app/views/users/index.html.erb app/views/users/index.json.jbuilder app/views/users/new.html.erb app/views/users/show.html.erb app/views/users/show.json.jbuilder config/routes.rb generate.sh
2014-03-03Added some partial rendering.AndrewMurrell
2014-03-03Changed the views for tournament a little more.AndrewMurrell
2014-03-03What was broken has been reforged.AndrewMurrell
2014-03-03Oops, also forgot this one.AndrewMurrell
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-18Added the generate shell command. Please do not commit the generated files.AndrewMurrell