|
|
2231d124a6
|
Style tweak and stats
|
2013-08-28 08:40:36 -07:00 |
|
|
|
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 |
|
|
|
25c0d1e1cb
|
Finalized payments and CSVs and inactivity
|
2013-08-28 08:19:01 -07:00 |
|
|
|
e8e024c042
|
Adding CSV show
|
2013-08-28 05:14:10 -07:00 |
|
|
|
10a1e4eb84
|
Switching to RVM, View tweaks
|
2013-08-28 05:15:50 -07:00 |
|
|
|
211d79cbcd
|
Adding csv import
|
2013-08-28 04:25:54 -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 |
|
|
|
45bac6cae4
|
Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
|
2013-08-26 23:40:40 -07:00 |
|
|
|
4dba2b8c3d
|
Adding status symbols
|
2013-08-26 23:39:54 -07:00 |
|
|
|
18bc427eb3
|
Adding quick-add buttons to user profiles
|
2013-08-26 23:01:43 -07:00 |
|
|
|
810ff6b034
|
De-duplicating cert view
|
2013-08-26 22:32:08 -07:00 |
|
|
|
ae031838dc
|
Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
|
2013-08-26 22:15:54 -07:00 |
|
|
|
59b6e3c838
|
Updating nav
|
2013-08-26 22:12:45 -07:00 |
|
|
|
98be42e9f9
|
Fixing nil errors
|
2013-08-26 22:11:04 -07:00 |
|
|
|
b5d9514914
|
Merge branch 'ipn' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into ipn
|
2013-08-26 22:09:37 -07:00 |
|
|
|
125ad76a1c
|
Hacks to allow 1.8.7
|
2013-08-26 22:07:41 -07:00 |
|
|
|
4067477cd4
|
Updating icons, fixing user cert nil error
|
2013-08-26 22:05:53 -07:00 |
|
|
|
f8f11e3d7e
|
Adjust IPN security
|
2013-08-26 15:34:10 -07:00 |
|
|
|
eb782f11d5
|
Adding IPN validation
|
2013-08-24 03:40:34 -07:00 |
|
|
|
a1ef8a5fd5
|
User cert tweaks (handling nulls)
|
2013-08-24 02:23:12 -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 |
|
|
|
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 |
|
|
|
719b9447ab
|
Merge branch 'pamela' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface into pamela
|
2013-02-18 23:29:44 -07:00 |
|
|
|
8a7fe29f6d
|
Changing lapsed member math to be more accurate & give more info
|
2013-02-18 23:29:06 -07:00 |
|
|
|
e630c81298
|
Resolving nil error for access cards / logs
|
2013-02-14 23:00:01 -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 |
|
|
|
3fb774d057
|
Adding note to macs json feed
|
2013-02-09 05:05:06 -07:00 |
|
|
|
0ced399651
|
Adjusted profile page to make avatar more clear
|
2013-02-09 04:21:42 -07:00 |
|
|
|
02920837e2
|
Updated new user email to include survey and link to user
|
2013-02-09 04:11:58 -07:00 |
|
|
|
63913c0be3
|
Forgot migration from previous commit. Also added links to home page
|
2013-02-09 04:01:21 -07:00 |
|
|
|
ac66cb0cbe
|
Added "how did you hear about us" to user.
|
2013-02-09 03:47:07 -07:00 |
|
|
|
1f63709887
|
Reporting door access logs on each card's page; also card access stats for last 7 days
|
2013-02-09 03:32:26 -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 |
|
|
|
f1b752a4c4
|
Updating homepage to display cooler door/mac stats
|
2013-02-09 02:40:38 -07:00 |
|
|
|
2d0735e914
|
Replaced "authok" with "ok" on OAC-Ethernet API, changing to match
|
2013-02-09 02:08:43 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
ed8d284619
|
Added card number interpretation to log
|
2012-09-15 21:41:11 -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 |
|
|
|
1e4dcfd9f3
|
Finished adding user profile stuff
|
2012-09-03 21:56:37 -07:00 |
|
|
|
33a9363b0d
|
Adding admin role and devise views
|
2012-09-03 20:34:40 -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 |
|
|
|
8c36b67cfb
|
Require user account
|
2012-09-02 04:19:13 -07:00 |
|
|
|
99f24fe144
|
Reinstalled devise to user model and migration
|
2012-09-02 04:12:26 -07:00 |
|
|
|
72f5a1202a
|
Added notice and alert to application layout
|
2012-09-02 02:59:29 -07:00 |
|
|
|
62fb513491
|
Installed Devise and created a home controller/route
|
2012-09-02 02:57:34 -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 |
|
