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

Age	Commit message (Collapse)	Author
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	matches now belong to tournament	nfoy

2014-03-06	Merge branch 'master' of https://github.com/LukeShu/leaguer	nfoy
	Conflicts: config/routes.rb
2014-03-06	matches routed	nfoy

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 branch 'master' of http://github.com/LukeShu/leaguer	DavisLWebb
	Conflicts: app/controllers/sessions_controller.rb app/views/sessions/new.html.erb
2014-03-06	no	DavisLWebb

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	Merge branch 'master' of http://github.com/LukeShu/leaguer	DavisLWebb

2014-03-06	Users can now log in with user_name and email but I could not make one text ↵	DavisLWebb
	box for both
2014-03-06	Minor visual changes	guntasgrewal

2014-03-05	users_controller: check permissions for doing things	Luke Shumaker

2014-03-05	undelete more files that Davis accidentally deleted	Luke Shumaker

2014-03-05	Merge branch 'clean'	Luke Shumaker
	Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
2014-03-05	use separate migrations to make things hidden, add user#groups:integer	Luke Shumaker

2014-03-05	Merge branch 'clean'	Luke Shumaker
	Conflicts: app/controllers/users_controller.rb app/views/users/show.json.jbuilder db/migrate/20140306014123_add_index_to_users_email.rb db/migrate/20140306014125_add_index_to_users_user_name.rb db/migrate/20140306014128_add_password_digest_to_users.rb db/migrate/20140306014130_add_remember_token_to_users.rb db/schema.rb
2014-03-05	move the separate migrations into the original generates	Luke Shumaker

2014-03-05	make a session model as well as controller	Luke Shumaker

2014-03-05	simplify with css more	Luke Shumaker

2014-03-05	undo my kludgery from when JS was broken	Luke Shumaker

2014-03-05	css is simpler than html (remove the hr above the footer, do it with css)	Luke Shumaker

2014-03-04	dynamic formgit add app/views/tournaments/new.html.erb ↵	Tomer Kimia
	app/views/tournaments/_selected.html.erb
2014-03-04	I REALLY hope I'm not overwriting anything	Tomer Kimia
	Merge branch 'master' of https://github.com/LukeShu/leaguer Conflicts: app/assets/stylesheets/custom.css.scss
2014-03-04	some error styling	Tomer Kimia

2014-03-04	Merge branch 'master' of http://github.com/LukeShu/leaguer	AndrewMurrell

2014-03-04	Here's to messing everything up.	AndrewMurrell

2014-03-04	Merge branch 'master' of https://github.com/LukeShu/leaguer	guntasgrewal

2014-03-04	minor color changes	guntasgrewal

2014-03-04	games no longer has conflict	Tomer Kimia

2014-03-04	login/logout buttons	Luke Shumaker

2014-03-04	Merge branch 'master' of https://github.com/LukeShu/leaguer	guntasgrewal

2014-03-04	sign out edit 2	guntasgrewal

2014-03-04	mergin' the wizard	Tomer Kimia
	Merge branch 'master' of https://github.com/LukeShu/leaguer
2014-03-04	signin gives error if user cannot sign in	Tomer Kimia

2014-03-04	Merge branch 'master' of https://github.com/LukeShu/leaguer	guntasgrewal

2014-03-04	sign out link edited	guntasgrewal

2014-03-04	Merge branch 'master' of http://github.com/LukeShu/leaguer	DavisLWebb

2014-03-04	Merge branch 'master' of https://github.com/LukeShu/leaguer	guntasgrewal