|
|
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 |
|
|
|
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 |
|
|
|
2d0735e914
|
Replaced "authok" with "ok" on OAC-Ethernet API, changing to match
|
2013-02-09 02:08:43 -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 |
|
|
|
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 |
|
|
|
a7e999614c
|
Adding pamela but I'm dumb and messed up routing
|
2013-01-31 20:33:40 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
03d99741e5
|
Trying to get ability filtering down but failing on collections
|
2012-09-03 23:20:00 -07:00 |
|
|
|
f3a05d64c1
|
Adding ability authorizing in cancan
|
2012-09-02 04:45:42 -07:00 |
|
|
|
c80c3bbe5c
|
Added cancan
|
2012-09-02 04:37:34 -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 |
|
|
|
8b775d9172
|
Got door logs working
|
2012-08-24 23:28:00 -07:00 |
|
|
|
b28efe046c
|
Got uploading working
|
2012-08-24 21:14:51 -07:00 |
|
