Commit Graph

31 Commits

Author SHA1 Message Date
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
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
0be2834a5d Minor status tweak 2013-08-27 00:39:43 -07:00
ef46bf6a98 Adjusting ranking method 2013-08-27 00:09:54 -07:00
4dba2b8c3d Adding status symbols 2013-08-26 23:39:54 -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
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
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
e9c648d36e Updating style and ordering of user index 2013-01-25 21:11:01 -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
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
0254f9aa2c Moved card stuff from users model to new card model 2012-10-14 05:46:19 -07:00
cd4f689400 Getting mailer working 2012-09-15 23:43:19 -07:00
d73ea31625 Updating user.rb with door_access_url variables 2012-09-15 22:22:58 -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
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
99f24fe144 Reinstalled devise to user model and migration 2012-09-02 04:12:26 -07:00
e4ff40e5a1 Surprise Rails app! 2012-08-30 23:54:25 -07:00
b28efe046c Got uploading working 2012-08-24 21:14:51 -07:00