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

Age	Commit message (Collapse)	Author
2014-04-23	updated views for tournament and seeds	AndrewMurrell

2014-04-23	clean up the javascript everywhere	Luke Shumaker

2014-04-22	Merge 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-22	run ./generate.sh	Luke Shumaker

2014-04-06	how 2 spell tournament?	tkimia

2014-04-03	fixed some of andrews weird stuff with starting a tournament	tkimia

2014-04-03	footer clears on both sides, has top-margin of 10. Tournament show screen ↵	tkimia
	repetitive info fixed
2014-04-03	small 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-03	Merge 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-03	do things to avoid merge conflicts with clean2	shumakl

2014-04-02	now ran generate without ger	AndrewMurrell

2014-04-01	AJAX is now working in the tournament loading page	Tomer Kimia

2014-04-01	oops, removed ger	AndrewMurrell

2014-04-01	players can now leave tournaments	Tomer Kimia

2014-04-01	Re-ran generate.	AndrewMurrell

2014-03-27	Merge branch 'master' of https://github.com/LukeShu/leaguer	Tomer Kimia
	Conflicts: app/views/tournaments/show.html.erb
2014-03-27	New tournement start page	Tomer Kimia

2014-03-25	revert Guntas	AndrewMurrell

2014-03-25	added match status	guntasgrewal

2014-03-25	Tournament Name added	guntasgrewal

2014-03-25	Tournament has a NAME now	guntasgrewal

2014-03-07	small changes	Tomer Kimia

2014-03-07	FUCK 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-07	I changed some of the views for the tournaments and matches (like how match ↵	DavisLWebb
	creation asked for a winner)
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 '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 '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	implement tournament joining	Luke Shumaker

2014-03-06	new generate	guntasgrewal

2014-03-04	make notifications be shown an all pages	Luke Shumaker

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-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