will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

Browse Source 
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
This commit is contained in:
Will Bradley
2012-09-15 17:34:55 -07:00
parent 7f623cf2ec 03d99741e5
commit d3b8ad7222
39 changed files with 757 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/door_logs/download.html.erb
View File

@@ -1,4 +1,7 @@
<<<<<<< HEAD
<p id="notice"><%= notice %></p>
=======
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
<p>
<b>Download results:</b>

3
app/views/door_logs/show.html.erb
View File

@@ -1,4 +1,7 @@
<<<<<<< HEAD
<p id="notice"><%= notice %></p>
=======
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
<p>
<b>Key:</b>