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

Age	Commit message (Collapse)	Author
2014-03-04	minor color changes	guntasgrewal

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

2014-03-04	Changed some username validation stuff	DavisLWebb

2014-03-04	Buttons fixed	guntasgrewal

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	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-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	small things	Tomer Kimia

2014-03-03	Log out button	guntasgrewal

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

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-02	new homepage, better css	Tomer Kimia

2014-03-02	added preliminary homepage	Tomer Kimia

2014-03-01	quick and dirty css	Tomer Kimia

2014-03-01	Added bootstrap and games to routes	Tomer Kimia

2014-02-27	add game types	Luke Shumaker

2014-02-18	Changes to generate.sh	AndrewMurrell

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

2014-02-18	Run `rails new`	Luke Shumaker