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

Age	Commit message (Collapse)	Author
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	users_controller: indent	Luke Shumaker

2014-03-03	fixed users table	Tomer Kimia

2014-03-02	Users work 1000000000000% but there is a path issue with the html	DavisLWebb

2014-03-02	I changed the user controller	DavisLWebb

2014-03-02	fixed an issue in user controller	DavisLWebb

2014-03-02	Added Session controller and helper. Also update user to have a remember_token	DavisLWebb

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	Gemfile.lock	DavisLWebb

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

2014-03-01	users_controller.rb	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