|
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 |
|
|
1f74d13ba7
|
Created readme and made config.yml.example match Open_Access_Control_Ethernet
|
2012-09-15 20:50:03 -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 |
|
|
6df97cc3a7
|
Updated gitignore and production env to work on hsl-web
|
2012-09-02 02:40:41 -07:00 |
|
|
e4ff40e5a1
|
Surprise Rails app!
|
2012-08-30 23:54:25 -07:00 |
|
|
d6f1909591
|
In this branch, we DELETE EVERYTHING AND START OVER
|
2012-08-30 23:50:59 -07:00 |
|
|
7f623cf2ec
|
Remove db seeds
|
2012-08-30 23:38:13 -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 |
|
hsl-access
|
ca711a7f1e
|
Set up Open Access API
|
2011-12-22 22:22:07 -07:00 |
|
hsl-access
|
60c2d681e2
|
Made the serial loop run twice because sometimes it doesn't catch on the first try.
|
2011-07-04 03:14:20 -06:00 |
|
root
|
2b4f5dde6e
|
Added users.json example
|
2011-07-04 03:03:55 -06:00 |
|