John N. Milner
|
c5b16139f5
|
Merge branch 'master' into denney-new-user-form
Conflicts:
db/schema.rb
|
2013-05-30 22:03:53 -04:00 |
|
John N. Milner
|
b25a4520f9
|
Correct log criteria for Check Ins view
|
2013-05-30 19:52:57 -04:00 |
|
John N. Milner
|
adeca0e08a
|
Corrected Check Ins view to show the checked-in user, not the user who logged the check in
|
2013-05-30 19:30:40 -04:00 |
|
John N. Milner
|
b67062fb32
|
New view to show the current day's check ins
|
2013-05-23 23:56:18 -04:00 |
|
John N. Milner
|
8f988b2cf1
|
Use self.table_name = instead of set_table_name to avoid deprecation warning
|
2013-05-10 03:21:13 -04:00 |
|
John N. Milner
|
a3fcdec10c
|
WIP adding user roles view; adding end datetime to user roles
|
2013-04-18 22:16:13 -04:00 |
|
John N. Milner
|
59e45fa4d3
|
Initial work on permissions with cancan
|
2013-04-11 21:14:27 -04:00 |
|
John N. Milner
|
6a29eda8d9
|
WIP: cancan permissions; it breaks stuff!
|
2013-04-07 20:44:53 -04:00 |
|
John N. Milner
|
941f7a267b
|
Add migration to accompany 55fbd06305
|
2013-04-07 16:50:53 -04:00 |
|
John N. Milner
|
55fbd06305
|
Closes #1
|
2013-04-04 22:27:54 -04:00 |
|
John N. Milner
|
a7b8651314
|
Updated to Rails 3.2.13
|
2013-04-04 19:57:59 -04:00 |
|