Commit Graph

76 Commits

Author SHA1 Message Date
d156edd683 Updating how macs are stored/viewed 2013-02-09 02:08:29 -07:00
1b64a6b931 Changing email to 2013-02-01 05:03:18 -07:00
1239d6682b Added mailer to notify on new user 2013-02-01 04:44:05 -07:00
50171effad Allowing JSON 2013-02-01 03:58:26 -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
048ce52111 Renaming pamela to macs 2013-01-31 20:48:27 -07:00
a7e999614c Adding pamela but I'm dumb and messed up routing 2013-01-31 20:33:40 -07:00
6673573e36 Updated front page stats to fix dupes 2013-01-31 19:15:35 -07:00
75851ed88d Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into members 2013-01-26 02:46:21 -07:00
a022b72eb9 Update README.rdoc 2013-01-26 02:42:27 -07:00
37106f65e0 Added the logo 2013-01-26 02:40:30 -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
7193ec832c Making user certs collapsible, adding a recompilation script 2013-01-25 20:31:23 -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
0b6975a655 Minor UI tweaks 2013-01-25 09:28:32 -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
cc3857604b Updated door logs to work with new schema 2012-12-15 20:37:44 -07:00
4fc18013d9 Merge branch 'members' of github.com:Geekner/Open-Source-Access-Control-Web-Interface into members 2012-12-01 23:51:52 -07:00
31f220e121 Merge branch 'members' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into members 2012-12-01 23:10:19 -07:00
257c1e5a8b Updated email address 2012-12-01 23:09:35 -07:00
Matthew Shepard
0b5978d4ef Add active status to user show/edit. 2012-10-16 22:59:35 -07:00
1a9c77fbce Merge pull request #1 from Geekner/members
Added registration fields to users table
2012-10-16 21:52:33 -07:00
Matthew Shepard
4ad622e906 Added registration fields to users table 2012-10-16 14:46:21 -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
ccd432a67d Changed timezone to Arizona, added log guide 2012-09-16 21:01:21 -07:00
dc0586045f Created auto-download ability 2012-09-16 03:24:54 -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
daa202131c Reversed order of door log, added date column 2012-09-15 22:52:17 -07:00
d73ea31625 Updating user.rb with door_access_url variables 2012-09-15 22:22:58 -07:00
f3443a3a82 Fixed merge conflict with mailer url, need to remove this from git as well 2012-09-15 21:44:06 -07:00
ed8d284619 Added card number interpretation to log 2012-09-15 21:41:11 -07:00