|
|
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 |
|
