leaguer - mirror of https://github.com/LukeShu/leaguer.git

Age	Commit message (Collapse)	Author
2014-03-06	Fixed some merge errors in show.html.erb	AndrewMurrell

2014-03-06	Redirection works as does the close tournament button.	AndrewMurrell

2014-03-06	Merge branch 'master' of github.com:LukeShu/leaguer	Luke Shumaker
	Conflicts: config/routes.rb
2014-03-06	Merge branch 'clean'	Luke Shumaker
	Conflicts: app/controllers/tournaments_controller.rb
2014-03-06	make the join tables not have models	Luke Shumaker

2014-03-06	tournament controller to matches redirect	AndrewMurrell

2014-03-06	fix joining a tournament	Luke Shumaker

2014-03-06	Merge 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-06	Merge 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-06	defaults now come in	Tomer Kimia

2014-03-06	implement tournament joining	Luke Shumaker

2014-03-06	Here's Luke's stuff because he doesn't have wifi.	AndrewMurrell

2014-03-06	merge ready?	guntasgrewal

2014-03-06	new generate	guntasgrewal

2014-03-06	tournaments table only shows if tournaments exits	Tomer Kimia

2014-03-06	login fixed and some views look better	Tomer Kimia

2014-03-06	tournaments: fix game selection	Luke Shumaker

2014-03-06	Minor visual changes	guntasgrewal

2014-03-04	dynamic formgit add app/views/tournaments/new.html.erb ↵	Tomer Kimia
	app/views/tournaments/_selected.html.erb
2014-03-04	Here's to messing everything up.	AndrewMurrell

2014-03-04	Merge branch 'master' of http://github.com/LukeShu/leaguer	DavisLWebb
	Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/games/index.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
2014-03-04	make notifications be shown an all pages	Luke Shumaker

2014-03-03	Merge 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-03	Added some partial rendering.	AndrewMurrell

2014-03-03	Changed the views for tournament a little more.	AndrewMurrell

2014-03-03	What was broken has been reforged.	AndrewMurrell

2014-03-03	Oops, also forgot this one.	AndrewMurrell

2014-03-03	Some of the stuff I forgot to commit last night. Updated and cleaned up some ↵	AndrewMurrell
	pages as well as getting the gameType listing to work.
2014-03-02	currently adding Session controller and view	DavisLWebb

2014-03-02	Merge branch 'master' of http://github.com/LukeShu/leaguer	DavisLWebb
	Conflicts: Gemfile.lock app/views/layouts/application.html.erb config/routes.rb
2014-03-01	quick and dirty css	Tomer Kimia

2014-02-27	give tournaments a game type	Luke Shumaker

2014-02-18	Added the generate shell command. Please do not commit the generated files.	AndrewMurrell