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
root
4f28cbe65f
Gave non-admins access to lock/unlock.
2011-07-04 02:58:35 -06:00
Ryan Rix
9a7af27b55
Convert password storage to SHA.
...
So, ya, after much wailing and gnashing of teeth, I have emerged victorious from combat
with introductory ruby. It was a fearful battle, and Ruby fought well, but the passwords
are now safe from the likes of anyone who might have access to the server.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: cgi-bin/access.rb
# modified: index.html
#
2011-06-22 18:06:25 -06:00
root
e077c8f1f2
F1rst commit
2011-06-22 17:01:16 -06:00
