| 
						
					 | 
					
						
						
						
						
							
						
						
							9fb2507aa1
							
						
					 | 
					
						
						
							
							Updating coin
						
						
						
						
						
						
					 | 
					
						2013-08-27 23:06:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0be2834a5d
							
						
					 | 
					
						
						
							
							Minor status tweak
						
						
						
						
						
						
					 | 
					
						2013-08-27 00:39:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef46bf6a98
							
						
					 | 
					
						
						
							
							Adjusting ranking method
						
						
						
						
						
						
					 | 
					
						2013-08-27 00:09:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45bac6cae4
							
						
					 | 
					
						
						
							
							Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
						
						
						
						
						
						
					 | 
					
						2013-08-26 23:40:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4dba2b8c3d
							
						
					 | 
					
						
						
							
							Adding status symbols
						
						
						
						
						
						
					 | 
					
						2013-08-26 23:39:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							18bc427eb3
							
						
					 | 
					
						
						
							
							Adding quick-add buttons to user profiles
						
						
						
						
						
						
					 | 
					
						2013-08-26 23:01:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							810ff6b034
							
						
					 | 
					
						
						
							
							De-duplicating cert view
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:32:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae031838dc
							
						
					 | 
					
						
						
							
							Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:15:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							59b6e3c838
							
						
					 | 
					
						
						
							
							Updating nav
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:12:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							98be42e9f9
							
						
					 | 
					
						
						
							
							Fixing nil errors
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:11:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b5d9514914
							
						
					 | 
					
						
						
							
							Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:09:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							125ad76a1c
							
						
					 | 
					
						
						
							
							Hacks to allow 1.8.7
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:07:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4067477cd4
							
						
					 | 
					
						
						
							
							Updating icons, fixing user cert nil error
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:05:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e4b79a353
							
						
					 | 
					
						
						
							
							Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
						
						
						
						
						
						
					 | 
					
						2013-08-26 15:39:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f8f11e3d7e
							
						
					 | 
					
						
						
							
							Adjust IPN security
						
						
						
						
						
						
					 | 
					
						2013-08-26 15:34:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							805148ee40
							
						
					 | 
					
						
						
							
							Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
						
						
						
						
						
						
					 | 
					
						2013-08-24 03:44:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f111769b20
							
						
					 | 
					
						
						
							
							Remove debug, update schema
						
						
						
						
						
						
					 | 
					
						2013-08-24 03:43:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb782f11d5
							
						
					 | 
					
						
						
							
							Adding IPN validation
						
						
						
						
						
						
					 | 
					
						2013-08-24 03:40:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a1ef8a5fd5
							
						
					 | 
					
						
						
							
							User cert tweaks (handling nulls)
						
						
						
						
						
						
					 | 
					
						2013-08-24 02:23:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec4cf4dea9
							
						
					 | 
					
						
						
							
							Adding IPNs
						
						
						
						
						
						
					 | 
					
						2013-08-24 02:18:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75e4907a9c
							
						
					 | 
					
						
						
							
							Usability tweaks, creating merges, fixing issues
						
						
						
						
						
						
					 | 
					
						2013-05-23 23:25:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							20a007cac5
							
						
					 | 
					
						
						
							
							Instructors can delete their own certs; hidden users are hidden in drop-downs; admins can see last user login; prepping for postgres
						
						
						
						
						
						
					 | 
					
						2013-05-03 00:16:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							719b9447ab
							
						
					 | 
					
						
						
							
							Merge branch 'pamela' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into pamela
						
						
						
						
						
						
					 | 
					
						2013-02-18 23:29:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a7fe29f6d
							
						
					 | 
					
						
						
							
							Changing lapsed member math to be more accurate & give more info
						
						
						
						
						
						
					 | 
					
						2013-02-18 23:29:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e630c81298
							
						
					 | 
					
						
						
							
							Resolving nil error for access cards / logs
						
						
						
						
						
						
					 | 
					
						2013-02-14 23:00:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cefd4b3878
							
						
					 | 
					
						
						
							
							Added nice front page stuff, fixing sqlite issues, adding user payments to profiles
						
						
						
						
						
						
					 | 
					
						2013-02-14 00:29:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed75ea0e90
							
						
					 | 
					
						
						
							
							Adding payments
						
						
						
						
						
						
					 | 
					
						2013-02-12 01:58:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3fb774d057
							
						
					 | 
					
						
						
							
							Adding note to macs json feed
						
						
						
						
						
						
					 | 
					
						2013-02-09 05:05:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0ced399651
							
						
					 | 
					
						
						
							
							Adjusted profile page to make avatar more clear
						
						
						
						
						
						
					 | 
					
						2013-02-09 04:21:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							02920837e2
							
						
					 | 
					
						
						
							
							Updated new user email to include survey and link to user
						
						
						
						
						
						
					 | 
					
						2013-02-09 04:11:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							63913c0be3
							
						
					 | 
					
						
						
							
							Forgot migration from previous commit. Also added links to home page
						
						
						
						
						
						
					 | 
					
						2013-02-09 04:01:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac66cb0cbe
							
						
					 | 
					
						
						
							
							Added "how did you hear about us" to user.
						
						
						
						
						
						
					 | 
					
						2013-02-09 03:47:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1f63709887
							
						
					 | 
					
						
						
							
							Reporting door access logs on each card's page; also card access stats for last 7 days
						
						
						
						
						
						
					 | 
					
						2013-02-09 03:32:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3f3eb1ed65
							
						
					 | 
					
						
						
							
							Allowed admins to see hidden users, added "no orientation" message to main page and hid new people from non-oriented people
						
						
						
						
						
						
					 | 
					
						2013-02-09 02:51:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f1b752a4c4
							
						
					 | 
					
						
						
							
							Updating homepage to display cooler door/mac stats
						
						
						
						
						
						
					 | 
					
						2013-02-09 02:40:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d0735e914
							
						
					 | 
					
						
						
							
							Replaced "authok" with "ok" on OAC-Ethernet API, changing to match
						
						
						
						
						
						
					 | 
					
						2013-02-09 02:08:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d156edd683
							
						
					 | 
					
						
						
							
							Updating how macs are stored/viewed
						
						
						
						
						
						
					 | 
					
						2013-02-09 02:08:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b64a6b931
							
						
					 | 
					
						
						
							
							Changing email to
						
						
						
						
						
						
					 | 
					
						2013-02-01 05:03:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1239d6682b
							
						
					 | 
					
						
						
							
							Added mailer to notify on new user
						
						
						
						
						
						
					 | 
					
						2013-02-01 04:44:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							50171effad
							
						
					 | 
					
						
						
							
							Allowing JSON
						
						
						
						
						
						
					 | 
					
						2013-02-01 03:58:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43e2cdba78
							
						
					 | 
					
						
						
							
							Finished mac filtering, display, permissions, etc
						
						
						
						
						
						
					 | 
					
						2013-02-01 03:37:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3498ddcac
							
						
					 | 
					
						
						
							
							Added mac logs, improved mac editing/viewing
						
						
						
						
						
						
					 | 
					
						2013-02-01 00:06:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							04764af983
							
						
					 | 
					
						
						
							
							Got macs working
						
						
						
						
						
						
					 | 
					
						2013-01-31 22:39:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							998558cd30
							
						
					 | 
					
						
						
							
							Figured out mac saving issue
						
						
						
						
						
						
					 | 
					
						2013-01-31 21:25:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							048ce52111
							
						
					 | 
					
						
						
							
							Renaming pamela to macs
						
						
						
						
						
						
					 | 
					
						2013-01-31 20:48:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7e999614c
							
						
					 | 
					
						
						
							
							Adding pamela but I'm dumb and messed up routing
						
						
						
						
						
						
					 | 
					
						2013-01-31 20:33:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6673573e36
							
						
					 | 
					
						
						
							
							Updated front page stats to fix dupes
						
						
						
						
						
						
					 | 
					
						2013-01-31 19:15:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75851ed88d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into members
						
						
						
						
						
						
					 | 
					
						2013-01-26 02:46:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a022b72eb9
							
						
					 | 
					
						
						
							
							Update README.rdoc
						
						
						
						
						
						
					 | 
					
						2013-01-26 02:42:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37106f65e0
							
						
					 | 
					
						
						
							
							Added the logo
						
						
						
						
						
						
					 | 
					
						2013-01-26 02:40:30 -07:00 | 
					
					
						
						
							
							
							
						
					 |