Need to commit to pull
Conflict fixes
WIP
FIX TO THE MOST EPIC BUG EVER (HOPEFULLY)
-Admin can now see and remove comments
-Admin may sign up a user with a non-ufl email address
-Buttons for Admin deactivating/reactivating an account created in view user profile
-Admins can view inactive and hidden profiles
-Admins may edit/remove databases
Merge branch 'master' of github.com:YfLn/CEN3031FA14
commit to pull
conflict fixes
-Fixed single quotation mark error.
-Admin now has 'Add User' option in dropdown menu on top right.
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14
Hopeful fix for Richard
Hopeful fix for Richard
Fix for possible future errors for Admin Add User
-Added groundwork for open/closed registration. This variable needs to be saved in the back end somehow, so the functionality is currently not working.
-Deactivate/Reactivate user functions now call a user update. I cannot verify if these functions work until the userByID problem is fixed.
-Added option in admin dropdown so admin may see the current value of registration and toggle it.
Merge branch 'master' of github.com:YfLn/CEN3031FA14
-Fixed 'View User' page to display proper user.
-Working on updating the user when Admin clicks "deactivate"/"reactivate" buttons, but running into the 400 error we had before. Can't use authentication.user this time
pushing updates