Commit Graph

9 Commits

Author SHA1 Message Date
0254f9aa2c Moved card stuff from users model to new card model 2012-10-14 05:46:19 -07:00
cd4f689400 Getting mailer working 2012-09-15 23:43:19 -07:00
d73ea31625 Updating user.rb with door_access_url variables 2012-09-15 22:22:58 -07:00
921ba21a40 Had to modify door log model and add config.yml to avoid storing password in git 2012-09-15 20:41:17 -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
99f24fe144 Reinstalled devise to user model and migration 2012-09-02 04:12:26 -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