Merging changes from /branches/redesign up to r690.
Showing
- application/modules/auth/controllers/IndexController.php 9 additions, 3 deletionsapplication/modules/auth/controllers/IndexController.php
- application/modules/auth/models/UserModel.php 34 additions, 1 deletionapplication/modules/auth/models/UserModel.php
- application/modules/courses/controllers/PublicViewController.php 2 additions, 2 deletions...tion/modules/courses/controllers/PublicViewController.php
- application/modules/courses/models/CourseModel.php 13 additions, 6 deletionsapplication/modules/courses/models/CourseModel.php
- application/modules/courses/views/scripts/queue-manager/request-table.phtml 42 additions, 0 deletions...s/courses/views/scripts/queue-manager/request-table.phtml
- application/modules/default/views/scripts/error/error.phtml 3 additions, 3 deletionsapplication/modules/default/views/scripts/error/error.phtml
- application/modules/default/views/scripts/layout.phtml 1 addition, 1 deletionapplication/modules/default/views/scripts/layout.phtml
- application/modules/default/views/scripts/menu.phtml 25 additions, 2 deletionsapplication/modules/default/views/scripts/menu.phtml
- application/modules/requests/controllers/IndexController.php 0 additions, 1 deletionapplication/modules/requests/controllers/IndexController.php
- application/modules/requests/controllers/QueueManagerController.php 50 additions, 2 deletions...n/modules/requests/controllers/QueueManagerController.php
- application/modules/requests/models/ApprovalActionQueueModel.php 90 additions, 15 deletions...tion/modules/requests/models/ApprovalActionQueueModel.php
- application/modules/requests/models/ApprovalActionVoteModel.php 66 additions, 77 deletions...ation/modules/requests/models/ApprovalActionVoteModel.php
- application/modules/requests/models/ApproverVoteModel.php 15 additions, 8 deletionsapplication/modules/requests/models/ApproverVoteModel.php
- application/modules/requests/models/RequestModel.php 7 additions, 2 deletionsapplication/modules/requests/models/RequestModel.php
- application/modules/requests/views/scripts/approval-body-admin/edit-role.phtml 2 additions, 2 deletions...equests/views/scripts/approval-body-admin/edit-role.phtml
- application/modules/requests/views/scripts/queue-manager/view.phtml 13 additions, 5 deletions...n/modules/requests/views/scripts/queue-manager/view.phtml
- application/modules/ucc/controllers/ReportsController.php 8 additions, 34 deletionsapplication/modules/ucc/controllers/ReportsController.php
- document_root/css/courses/queue-manager/request-table.css 4 additions, 0 deletionsdocument_root/css/courses/queue-manager/request-table.css
- document_root/javascript/requests/queue-manager.js 10 additions, 0 deletionsdocument_root/javascript/requests/queue-manager.js
- document_root/schema/courses.xsd 1 addition, 1 deletiondocument_root/schema/courses.xsd
Loading
Please register or sign in to comment