Pull down
Merge branch 'master' of https://github.com/Kiwi-ET/Feedback
Merge branch 'localAK' of https://github.com/Kiwi-ET/Feedback
Merge branch 'localAK' of https://github.com/kiwi-ET/Feedback into local
Merge branch 'master' of https://github.com/kiwi-ET/Feedback
Merge branch 'localAK' of https://github.com/kiwi-ET/Feedback into local
no message
no message
no message
Changed SQL 'roles' to 'role' for consistency.
Update PHP to correspond with new SQL updates.
Corrected roles table in SQL; added extra users, one for each role; added description onto Roles
Updated stylesheet
Created tables for the form data input on manageUsers; added extra fields from updated SQL
Corrected error on menu page
Added different users access on manageModules; added: create, modify and delete for the modules
Test for Module
Added description on to role to help keep track of what the roles are for
Updates classes to use role description
Updated stylesheet
Implemented functionality control based on user role
Added functionality control SQL functions in main module edit class
Merge branch 'master' of https://github.com/Kiwi-ET/Feedback into localAK
Change DB class to allow more flexible testing and the injection of database constants. Write PHPUnit and Behat BDD test cases.
Fix menus for local system. Failing on server based system.
User and userADO class to getUser and login implemented and tested locally.
Implemented the BDD features and step definitions.
Reworked the login script so the key code can be tested.
Corrected edit user problem.