will/Open-Source-Access-Control-Web-Interface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
122 Commits 7 Branches 0 Tags 1.3 MiB
880488c73e
Commit Graph

55 Commits

Author SHA1 Message Date
Will Bradley
880488c73e Adding social and exit reasons 2013-08-29 01:23:21 -07:00
Will Bradley
2231d124a6 Style tweak and stats 2013-08-28 08:40:36 -07:00
Will Bradley
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
Will Bradley
25c0d1e1cb Finalized payments and CSVs and inactivity 2013-08-28 08:19:01 -07:00
Will Bradley
10a1e4eb84 Switching to RVM, View tweaks 2013-08-28 05:15:50 -07:00
Will Bradley
211d79cbcd Adding csv import 2013-08-28 04:25:54 -07:00
Will Bradley
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -07:00
Will Bradley
0be2834a5d Minor status tweak 2013-08-27 00:39:43 -07:00
Will Bradley
ef46bf6a98 Adjusting ranking method 2013-08-27 00:09:54 -07:00
Will Bradley
45bac6cae4 Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn 2013-08-26 23:40:40 -07:00
Will Bradley
4dba2b8c3d Adding status symbols 2013-08-26 23:39:54 -07:00
Will Bradley
18bc427eb3 Adding quick-add buttons to user profiles 2013-08-26 23:01:43 -07:00
Will Bradley
98be42e9f9 Fixing nil errors 2013-08-26 22:11:04 -07:00
Will Bradley
4067477cd4 Updating icons, fixing user cert nil error 2013-08-26 22:05:53 -07:00
Will Bradley
eb782f11d5 Adding IPN validation 2013-08-24 03:40:34 -07:00
Will Bradley
a1ef8a5fd5 User cert tweaks (handling nulls) 2013-08-24 02:23:12 -07:00
Will Bradley
ec4cf4dea9 Adding IPNs 2013-08-24 02:18:37 -07:00
Will Bradley
75e4907a9c Usability tweaks, creating merges, fixing issues 2013-05-23 23:25:09 -07:00
Will Bradley
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
Will Bradley
8a7fe29f6d Changing lapsed member math to be more accurate & give more info 2013-02-18 23:29:06 -07:00
Will Bradley
ed75ea0e90 Adding payments 2013-02-12 01:58:17 -07:00
Will Bradley
ac66cb0cbe Added "how did you hear about us" to user. 2013-02-09 03:47:07 -07:00
Will Bradley
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
Will Bradley
2d0735e914 Replaced "authok" with "ok" on OAC-Ethernet API, changing to match 2013-02-09 02:08:43 -07:00
Will Bradley
1239d6682b Added mailer to notify on new user 2013-02-01 04:44:05 -07:00
Will Bradley
43e2cdba78 Finished mac filtering, display, permissions, etc 2013-02-01 03:37:30 -07:00
Will Bradley
f3498ddcac Added mac logs, improved mac editing/viewing 2013-02-01 00:06:13 -07:00
Will Bradley
04764af983 Got macs working 2013-01-31 22:39:33 -07:00
Will Bradley
998558cd30 Figured out mac saving issue 2013-01-31 21:25:54 -07:00
Will Bradley
a7e999614c Adding pamela but I'm dumb and messed up routing 2013-01-31 20:33:40 -07:00
Will Bradley
1865123201 Lots of styling; avatars, payment methods, and more. 2013-01-26 02:21:41 -07:00
Will Bradley
e9c648d36e Updating style and ordering of user index 2013-01-25 21:11:01 -07:00
Will Bradley
c547af5391 Updated permissions for deletion and styling for hidden items 2013-01-25 18:21:42 -07:00
Will Bradley
3d00bbed03 Finishing touches on abilities and registration form 2013-01-25 13:47:44 -07:00
Will Bradley
653fcc3112 Fine tuned abilities and updated how membership is tracked 2013-01-25 06:01:02 -07:00
Will Bradley
6e77b2bf68 Adding user_certifications relation, and paperclip gem 2013-01-25 03:50:53 -07:00
Will Bradley
43d949dc1d Adding certifications; messed up adding certification_users so not staging those 2013-01-25 03:12:25 -07:00
Will Bradley
fe283b051f Allowing nil waiver/orientation dates, adjusting permissions of users 2013-01-25 01:49:32 -07:00
Will Bradley
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
Will Bradley
d1ef1e7db9 Recreated user forms, updated abilities, linked cards and users 2012-10-14 06:23:35 -07:00
Will Bradley
0254f9aa2c Moved card stuff from users model to new card model 2012-10-14 05:46:19 -07:00
Will Bradley
cd4f689400 Getting mailer working 2012-09-15 23:43:19 -07:00
Will Bradley
d73ea31625 Updating user.rb with door_access_url variables 2012-09-15 22:22:58 -07:00
Will Bradley
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
Will Bradley
93e77b692f Got abilities working on index; next need to separate users from members from cards. 2012-09-15 18:41:55 -07:00
Will Bradley
0bc5858101 Merged more conflicts 2012-09-15 17:44:30 -07:00
Will Bradley
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
Will Bradley
03d99741e5 Trying to get ability filtering down but failing on collections 2012-09-03 23:20:00 -07:00
Will Bradley
f3a05d64c1 Adding ability authorizing in cancan 2012-09-02 04:45:42 -07:00