|
|
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 |
|
|
|
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 |
|
|
|
1e4dcfd9f3
|
Finished adding user profile stuff
|
2012-09-03 21:56:37 -07:00 |
|
|
|
72f5a1202a
|
Added notice and alert to application layout
|
2012-09-02 02:59:29 -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 |
|
