| 
						
					 | 
					
						
						
						
						
							
						
						
							56450cf319
							
						
					 | 
					
						
						
							
							Adding postal code to users
						
						
						
						
						
						
					 | 
					
						2014-02-08 21:06:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aa29f30f30
							
						
					 | 
					
						
						
							
							Allowing users to see member activity
						
						
						
						
						
						
					 | 
					
						2014-01-23 17:50:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							008ceaed9e
							
						
					 | 
					
						
						
							
							Updating emailer
						
						
						
						
						
						
					 | 
					
						2013-10-06 05:51:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							15836b4f4e
							
						
					 | 
					
						
						
							
							Adding zombie report
						
						
						
						
						
						
					 | 
					
						2013-10-06 05:17:24 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25c0d1e1cb
							
						
					 | 
					
						
						
							
							Finalized payments and CSVs and inactivity
						
						
						
						
						
						
					 | 
					
						2013-08-28 08:19:01 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac66cb0cbe
							
						
					 | 
					
						
						
							
							Added "how did you hear about us" to user.
						
						
						
						
						
						
					 | 
					
						2013-02-09 03:47:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1239d6682b
							
						
					 | 
					
						
						
							
							Added mailer to notify on new user
						
						
						
						
						
						
					 | 
					
						2013-02-01 04:44:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1865123201
							
						
					 | 
					
						
						
							
							Lots of styling; avatars, payment methods, and more.
						
						
						
						
						
						
					 | 
					
						2013-01-26 02:21:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ab6fa10ea
							
						
					 | 
					
						
						
							
							Trying to get dynamic helptext for selecting payment methods
						
						
						
						
						
						
					 | 
					
						2013-01-25 22:30:05 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2327340b71
							
						
					 | 
					
						
						
							
							More UI tweaks and sorting
						
						
						
						
						
						
					 | 
					
						2013-01-25 11:11:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95374a8c1f
							
						
					 | 
					
						
						
							
							Moving password field and fixing a nil error in appcontroller
						
						
						
						
						
						
					 | 
					
						2013-01-25 08:45:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d0a7b165a
							
						
					 | 
					
						
						
							
							Made some changes to the css and asset compiling settings
						
						
						
						
						
						
					 | 
					
						2013-01-25 07:48:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bb7b2aeca5
							
						
					 | 
					
						
						
							
							Updated some more form styling
						
						
						
						
						
						
					 | 
					
						2013-01-25 07:23:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7cadcabdce
							
						
					 | 
					
						
						
							
							Updated routes and user form to avoid user-create conflicts with devise
						
						
						
						
						
						
					 | 
					
						2013-01-25 07:11:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							63b1b05010
							
						
					 | 
					
						
						
							
							Updating styling, fixing some errors, and adding cert logging
						
						
						
						
						
						
					 | 
					
						2013-01-25 06:52:19 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0254f9aa2c
							
						
					 | 
					
						
						
							
							Moved card stuff from users model to new card model
						
						
						
						
						
						
					 | 
					
						2012-10-14 05:46:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							152d6e4e03
							
						
					 | 
					
						
						
							
							Got auto-detection in logs working, improved user index readability
						
						
						
						
						
						
					 | 
					
						2012-09-16 02:53:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5174b4c50c
							
						
					 | 
					
						
						
							
							Added password change option
						
						
						
						
						
						
					 | 
					
						2012-09-16 02:27:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cd4f689400
							
						
					 | 
					
						
						
							
							Getting mailer working
						
						
						
						
						
						
					 | 
					
						2012-09-15 23:43:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							921ba21a40
							
						
					 | 
					
						
						
							
							Had to modify door log model and add config.yml to avoid storing password in git
						
						
						
						
						
						
					 | 
					
						2012-09-15 20:41:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							93e77b692f
							
						
					 | 
					
						
						
							
							Got abilities working on index; next need to separate users from members from cards.
						
						
						
						
						
						
					 | 
					
						2012-09-15 18:41:55 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e4dcfd9f3
							
						
					 | 
					
						
						
							
							Finished adding user profile stuff
						
						
						
						
						
						
					 | 
					
						2012-09-03 21:56:37 -07:00 | 
					
					
						
						
							
							
							
						
					 |