| 
						
					 | 
					
						
						
						
						
							
						
						
							7bfd45a163
							
						
					 | 
					
						
						
							
							Added more_info notice and fixed payments cancan bug
						
						
						
						
						
						
					 | 
					
						2013-09-28 19:34:08 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42679aa410
							
						
					 | 
					
						
						
							
							Updating settings & fixing auth of objects through other objects cancan bug?
						
						
						
						
						
						
					 | 
					
						2013-09-28 19:31:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e08a0d036
							
						
					 | 
					
						
						
							
							Updated stats and privacy
						
						
						
						
						
						
					 | 
					
						2013-09-28 18:55:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c204a8f9d
							
						
					 | 
					
						
						
							
							Adding wysiwyg and settings
						
						
						
						
						
						
					 | 
					
						2013-09-28 04:59:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b267da7b37
							
						
					 | 
					
						
						
							
							Style
						
						
						
						
						
						
					 | 
					
						2013-09-28 04:18:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec84d8f5e0
							
						
					 | 
					
						
						
							
							Button style
						
						
						
						
						
						
					 | 
					
						2013-09-28 04:13:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e002907da7
							
						
					 | 
					
						
						
							
							Fixed graph
						
						
						
						
						
						
					 | 
					
						2013-09-28 04:12:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5acb3cd272
							
						
					 | 
					
						
						
							
							Updating payment graph
						
						
						
						
						
						
					 | 
					
						2013-09-28 03:33:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							16e5e8d584
							
						
					 | 
					
						
						
							
							Adding payment graph
						
						
						
						
						
						
					 | 
					
						2013-09-28 02:42:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1985dae12
							
						
					 | 
					
						
						
							
							Adding payment stats
						
						
						
						
						
						
					 | 
					
						2013-09-28 01:30:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4631489eba
							
						
					 | 
					
						
						
							
							Changing card stats to month and adding runner up
						
						
						
						
						
						
					 | 
					
						2013-09-27 01:19:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e61ac5d32e
							
						
					 | 
					
						
						
							
							Adding most active mac and runner up stats
						
						
						
						
						
						
					 | 
					
						2013-09-27 00:56:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c02724488
							
						
					 | 
					
						
						
							
							Fixing string comparison on member level
						
						
						
						
						
						
					 | 
					
						2013-09-23 23:55:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec139a97a8
							
						
					 | 
					
						
						
							
							Separating certs into columns
						
						
						
						
						
						
					 | 
					
						2013-09-23 20:24:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c5e02a51be
							
						
					 | 
					
						
						
							
							Making it possible for users to easily register existing MACs
						
						
						
						
						
						
					 | 
					
						2013-09-23 18:51:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cad46e45c5
							
						
					 | 
					
						
						
							
							Adding users without cards report, fixing mac registration for existing macs
						
						
						
						
						
						
					 | 
					
						2013-09-23 18:34:18 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c61b8ac8d4
							
						
					 | 
					
						
						
							
							Adding recent users report
						
						
						
						
						
						
					 | 
					
						2013-08-29 02:50:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8820dc4986
							
						
					 | 
					
						
						
							
							Adding activity and form fields for user profiles
						
						
						
						
						
						
					 | 
					
						2013-08-29 02:27:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37aba522cf
							
						
					 | 
					
						
						
							
							Profile tweaks
						
						
						
						
						
						
					 | 
					
						2013-08-29 01:42:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1ba469767
							
						
					 | 
					
						
						
							
							Adjusting profile display
						
						
						
						
						
						
					 | 
					
						2013-08-29 01:38:40 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e8e024c042
							
						
					 | 
					
						
						
							
							Adding CSV show
						
						
						
						
						
						
					 | 
					
						2013-08-28 05:14:10 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							59b6e3c838
							
						
					 | 
					
						
						
							
							Updating nav
						
						
						
						
						
						
					 | 
					
						2013-08-26 22:12:45 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d156edd683
							
						
					 | 
					
						
						
							
							Updating how macs are stored/viewed
						
						
						
						
						
						
					 | 
					
						2013-02-09 02:08:29 -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 | 
					
					
						
						
							
							
							
						
					 |