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

Age	Commit message (Collapse)	Author
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	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	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	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	Added Tournament Name.	AndrewMurrell

2014-03-02	I changed the user controller	DavisLWebb

2014-03-02	Made the button on the homepage redirect to the signup page.	AndrewMurrell

2014-03-02	the users helper wasnt being push	DavisLWebb

2014-03-02	added debug info to bottom of views	Tomer Kimia

2014-03-02	container around body in html	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 new user form	Tomer Kimia

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

2014-02-27	Added the Games Attributes stuff.	AndrewMurrell

2014-02-27	give tournaments a game type	Luke Shumaker

2014-02-27	add game types	Luke Shumaker

2014-02-25	Search bar and footer html.	Tomer Kimia

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

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