| 
						
					 | 
					
						
						
						
						
							
						
						
							d2434be109
							
						
					 | 
					
						
						
							
							Moving spaceapi endpoint and OAC door status checking here
						
						
						
						
						
						
					 | 
					
						2013-12-01 19:32:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d1894d6e8
							
						
					 | 
					
						
						
							
							Updating payment and front page status alerts to work properly
						
						
						
						
						
						
					 | 
					
						2013-10-10 20:58:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							57e6ac1fc5
							
						
					 | 
					
						
						
							
							Adding user email feature
						
						
						
						
						
						
					 | 
					
						2013-10-06 04:09:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							04bab84293
							
						
					 | 
					
						
						
							
							Adding new member report
						
						
						
						
						
						
					 | 
					
						2013-10-05 19:53:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f11d5ebe1e
							
						
					 | 
					
						
						
							
							Adding individual statistics/data-dumps
						
						
						
						
						
						
					 | 
					
						2013-10-02 04:31:10 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42679aa410
							
						
					 | 
					
						
						
							
							Updating settings & fixing auth of objects through other objects cancan bug?
						
						
						
						
						
						
					 | 
					
						2013-09-28 19:31:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c204a8f9d
							
						
					 | 
					
						
						
							
							Adding wysiwyg and settings
						
						
						
						
						
						
					 | 
					
						2013-09-28 04:59:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c5e02a51be
							
						
					 | 
					
						
						
							
							Making it possible for users to easily register existing MACs
						
						
						
						
						
						
					 | 
					
						2013-09-23 18:51:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							faaeb2b4a2
							
						
					 | 
					
						
						
							
							Allowing nil social media urls
						
						
						
						
						
						
					 | 
					
						2013-08-29 16:28:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							880488c73e
							
						
					 | 
					
						
						
							
							Adding social and exit reasons
						
						
						
						
						
						
					 | 
					
						2013-08-29 01:23:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2231d124a6
							
						
					 | 
					
						
						
							
							Style tweak and stats
						
						
						
						
						
						
					 | 
					
						2013-08-28 08:40:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							accec4edb1
							
						
					 | 
					
						
						
							
							Merge branch 'csv'
						
						
						
						
						
						
						
						Conflicts:
	app/models/user_certification.rb
	app/views/user_certifications/index.html.erb
	app/views/user_certifications/show.html.erb 
						
						
					 | 
					
						2013-08-28 08:21:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25c0d1e1cb
							
						
					 | 
					
						
						
							
							Finalized payments and CSVs and inactivity
						
						
						
						
						
						
					 | 
					
						2013-08-28 08:19:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							10a1e4eb84
							
						
					 | 
					
						
						
							
							Switching to RVM, View tweaks
						
						
						
						
						
						
					 | 
					
						2013-08-28 05:15:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							211d79cbcd
							
						
					 | 
					
						
						
							
							Adding csv import
						
						
						
						
						
						
					 | 
					
						2013-08-28 04:25:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c662be6dc0
							
						
					 | 
					
						
						
							
							IPN improvements
						
						
						
						
						
						
					 | 
					
						2013-08-28 03:18:47 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							98be42e9f9
							
						
					 | 
					
						
						
							
							Fixing nil errors
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:11:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4067477cd4
							
						
					 | 
					
						
						
							
							Updating icons, fixing user cert nil error
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:05:53 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a7fe29f6d
							
						
					 | 
					
						
						
							
							Changing lapsed member math to be more accurate & give more info
						
						
						
						
						
						
					 | 
					
						2013-02-18 23:29:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed75ea0e90
							
						
					 | 
					
						
						
							
							Adding payments
						
						
						
						
						
						
					 | 
					
						2013-02-12 01:58:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac66cb0cbe
							
						
					 | 
					
						
						
							
							Added "how did you hear about us" to user.
						
						
						
						
						
						
					 | 
					
						2013-02-09 03:47:07 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d0735e914
							
						
					 | 
					
						
						
							
							Replaced "authok" with "ok" on OAC-Ethernet API, changing to match
						
						
						
						
						
						
					 | 
					
						2013-02-09 02:08:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1239d6682b
							
						
					 | 
					
						
						
							
							Added mailer to notify on new user
						
						
						
						
						
						
					 | 
					
						2013-02-01 04:44:05 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7e999614c
							
						
					 | 
					
						
						
							
							Adding pamela but I'm dumb and messed up routing
						
						
						
						
						
						
					 | 
					
						2013-01-31 20:33:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1865123201
							
						
					 | 
					
						
						
							
							Lots of styling; avatars, payment methods, and more.
						
						
						
						
						
						
					 | 
					
						2013-01-26 02:21:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e9c648d36e
							
						
					 | 
					
						
						
							
							Updating style and ordering of user index
						
						
						
						
						
						
					 | 
					
						2013-01-25 21:11:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c547af5391
							
						
					 | 
					
						
						
							
							Updated permissions for deletion and styling for hidden items
						
						
						
						
						
						
					 | 
					
						2013-01-25 18:21:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3d00bbed03
							
						
					 | 
					
						
						
							
							Finishing touches on abilities and registration form
						
						
						
						
						
						
					 | 
					
						2013-01-25 13:47:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							653fcc3112
							
						
					 | 
					
						
						
							
							Fine tuned abilities and updated how membership is tracked
						
						
						
						
						
						
					 | 
					
						2013-01-25 06:01:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e77b2bf68
							
						
					 | 
					
						
						
							
							Adding user_certifications relation, and paperclip gem
						
						
						
						
						
						
					 | 
					
						2013-01-25 03:50:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43d949dc1d
							
						
					 | 
					
						
						
							
							Adding certifications; messed up adding certification_users so not staging those
						
						
						
						
						
						
					 | 
					
						2013-01-25 03:12:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fe283b051f
							
						
					 | 
					
						
						
							
							Allowing nil waiver/orientation dates, adjusting permissions of users
						
						
						
						
						
						
					 | 
					
						2013-01-25 01:49:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d44ae6a69f
							
						
					 | 
					
						
						
							
							Halfway done with adding new user fields
						
						
						
						
						
						
					 | 
					
						2013-01-10 23:11:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Shepard
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b5978d4ef
							
						
					 | 
					
						
						
							
							Add active status to user show/edit.
						
						
						
						
						
						
					 | 
					
						2012-10-16 22:59:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1ef1e7db9
							
						
					 | 
					
						
						
							
							Recreated user forms, updated abilities, linked cards and users
						
						
						
						
						
						
					 | 
					
						2012-10-14 06:23:35 -07:00 | 
					
					
						
						
							
							
							
						
					 |