Commit Graph

9 Commits

Author SHA1 Message Date
e16e35e098 Massive chmod/chown 2014-02-09 00:56:48 -07:00
6d0a7b165a Made some changes to the css and asset compiling settings 2013-01-25 07:48:13 -07:00
f3443a3a82 Fixed merge conflict with mailer url, need to remove this from git as well 2012-09-15 21:44:06 -07:00
0bc5858101 Merged more conflicts 2012-09-15 17:44:30 -07:00
d3b8ad7222 Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface
Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/door_logs_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/door_logs/download.html.erb
	app/views/door_logs/show.html.erb
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb
	app/views/users/upload.html.erb
	app/views/users/upload_all.html.erb
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb
	db/schema.rb
2012-09-15 17:34:55 -07:00
62fb513491 Installed Devise and created a home controller/route 2012-09-02 02:57:34 -07:00
6df97cc3a7 Updated gitignore and production env to work on hsl-web 2012-09-02 02:40:41 -07:00
e4ff40e5a1 Surprise Rails app! 2012-08-30 23:54:25 -07:00
b28efe046c Got uploading working 2012-08-24 21:14:51 -07:00