| 
						
					 | 
					
						
						
						
						
							
						
						
							3ce0d3c45a
							
						
					 | 
					
						
						
							
							Adding door alert emails (test mode) and adjusting door log graph view
						
						
						
						
						
						
					 | 
					
						2014-09-04 19:24:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							57a5a00352
							
						
					 | 
					
						
						
							
							Adding graph to door log (open/closed)
						
						
						
						
						
						
					 | 
					
						2014-04-14 18:09:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e16e35e098
							
						
					 | 
					
						
						
							
							Massive chmod/chown
						
						
						
						
						
						
					 | 
					
						2014-02-09 00:56:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							73833dd2bf
							
						
					 | 
					
						
						
							
							Updating door log key
						
						
						
						
						
						
						
						Adding reboot logging 
						
						
					 | 
					
						2014-01-31 18:41:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							41a8431be5
							
						
					 | 
					
						
						
							
							Adding direct door access commands and interface
						
						
						
						
						
						
					 | 
					
						2013-12-02 02:03:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2434be109
							
						
					 | 
					
						
						
							
							Moving spaceapi endpoint and OAC door status checking here
						
						
						
						
						
						
					 | 
					
						2013-12-01 19:32:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d61289abaf
							
						
					 | 
					
						
						
							
							Adding analytics, adjusting door log issues
						
						
						
						
						
						
					 | 
					
						2013-10-04 02:59:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1865123201
							
						
					 | 
					
						
						
							
							Lots of styling; avatars, payment methods, and more.
						
						
						
						
						
						
					 | 
					
						2013-01-26 02:21:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cc3857604b
							
						
					 | 
					
						
						
							
							Updated door logs to work with new schema
						
						
						
						
						
						
					 | 
					
						2012-12-15 20:37:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ccd432a67d
							
						
					 | 
					
						
						
							
							Changed timezone to Arizona, added log guide
						
						
						
						
						
						
					 | 
					
						2012-09-16 21:01:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dc0586045f
							
						
					 | 
					
						
						
							
							Created auto-download ability
						
						
						
						
						
						
					 | 
					
						2012-09-16 03:24:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							152d6e4e03
							
						
					 | 
					
						
						
							
							Got auto-detection in logs working, improved user index readability
						
						
						
						
						
						
					 | 
					
						2012-09-16 02:53:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							daa202131c
							
						
					 | 
					
						
						
							
							Reversed order of door log, added date column
						
						
						
						
						
						
					 | 
					
						2012-09-15 22:52:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed8d284619
							
						
					 | 
					
						
						
							
							Added card number interpretation to log
						
						
						
						
						
						
					 | 
					
						2012-09-15 21:41:11 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							72f5a1202a
							
						
					 | 
					
						
						
							
							Added notice and alert to application layout
						
						
						
						
						
						
					 | 
					
						2012-09-02 02:59:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e4ff40e5a1
							
						
					 | 
					
						
						
							
							Surprise Rails app!
						
						
						
						
						
						
					 | 
					
						2012-08-30 23:54:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b775d9172
							
						
					 | 
					
						
						
							
							Got door logs working
						
						
						
						
						
						
					 | 
					
						2012-08-24 23:28:00 -07:00 | 
					
					
						
						
							
							
							
						
					 |