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

Age	Commit message (Collapse)	Author
2014-03-06	login fixed and some views look better	Tomer Kimia

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

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

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

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

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	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-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	I changed the user controller	DavisLWebb

2014-03-01	added new user form	Tomer Kimia

2014-03-01	changed the user section of the generate	DavisLWebb

2014-02-20	fix datatype names in generate.sh	DavisLWebb

2014-02-18	Changes to generate.sh	AndrewMurrell

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