|
|
04764af983
|
Got macs working
|
2013-01-31 22:39:33 -07:00 |
|
|
|
a7e999614c
|
Adding pamela but I'm dumb and messed up routing
|
2013-01-31 20:33:40 -07:00 |
|
|
|
3d00bbed03
|
Finishing touches on abilities and registration form
|
2013-01-25 13:47:44 -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 |
|
|
|
cc3857604b
|
Updated door logs to work with new schema
|
2012-12-15 20:37:44 -07:00 |
|
Matthew Shepard
|
4ad622e906
|
Added registration fields to users table
|
2012-10-16 14:46:21 -07:00 |
|
|
|
0254f9aa2c
|
Moved card stuff from users model to new card model
|
2012-10-14 05:46:19 -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 |
|
|
|
33a9363b0d
|
Adding admin role and devise views
|
2012-09-03 20:34:40 -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 |
|
|
|
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 |
|
