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

Age	Commit message (Collapse)	Author
2014-03-04	Merge branch 'master' of http://github.com/LukeShu/leaguer	DavisLWebb

2014-03-04	Merge branch 'master' of github.com:LukeShu/leager	Luke Shumaker

2014-03-04	show errors when signing up	Luke Shumaker

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

2014-03-04	Log buttons	guntasgrewal

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	Git is telling me to commit I dont know why	DavisLWebb

2014-03-04	itest git	guntasgrewal

2014-03-04	oops	Luke Shumaker

2014-03-04	foo	Luke Shumaker

2014-03-04	Merge branch 'master' of https://github.com/LukeShu/leaguer	guntasgrewal
	Conflicts: app/assets/stylesheets/scaffolds.css.scss app/views/layouts/application.html.erb db/migrate/20140304043618_create_servers.rb db/migrate/20140304043622_create_matches.rb db/migrate/20140304043631_create_games.rb
2014-03-04	Use the navbar header to demonstrate using SCSS @extend	Luke Shumaker

2014-03-04	fix typos in comments	Luke Shumaker

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

2014-03-04	indent application.html.erb	Luke Shumaker

2014-03-04	simplify the sessions routing	Luke Shumaker

2014-03-03	Merge branch 'master' of github.com:LukeShu/leager	Luke Shumaker
	Conflicts: app/controllers/users_controller.rb app/views/users/index.html.erb
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	run ./generate.sh	Luke Shumaker

2014-03-03	Logout reconfigured	guntasgrewal

2014-03-03	small things	Tomer Kimia

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

2014-03-03	links no longer look like shit	Tomer Kimia

2014-03-03	signed in people see a link to make a new tournament	Tomer Kimia

2014-03-03	dont see log in if logged in	Tomer Kimia

2014-03-03	users_controller: indent	Luke Shumaker

2014-03-03	fixed users table	Tomer Kimia

2014-03-03	Changed password input to password type so that passwords are hidden as *** ↵	Tomer Kimia
	when typed, also why are we using an html form?
2014-03-03	made two distinct buttons on homepage	Tomer Kimia

2014-03-03	app/models/user.rb: indent	Luke Shumaker

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

2014-03-03	Added some partial rendering.	AndrewMurrell

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

2014-03-03	view stuff	DavisLWebb

2014-03-03	Made it possible to log in from the sign up page. As in I put a link under ↵	AndrewMurrell
	the mess I made.
2014-03-03	More documentation changes	DavisLWebb

2014-03-03	DOCUMENTATION FOR USER.RB	DavisLWebb

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

2014-03-03	Made it so 'log out' only appears if you're logged in.	AndrewMurrell

2014-03-03	I added a lot of documentation to user.rb	DavisLWebb

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

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

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

2014-03-03	I HAVE THE WEBSITE RENDER THE USER'S USER NAME	DavisLWebb

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

2014-03-02	Since I don't know how to do stuff with forms, I edited the actual HTML to ↵	AndrewMurrell
	fix where the form submits to. Tomer should help correct it.
2014-03-02	Users work 1000000000000% but there is a path issue with the html	DavisLWebb