first commit towards users branch
ongoing temporary tweaks to allow templates to design user interfaces
ongoing temporary tweaks to allow templates to design user interfaces
merge conflict resolved
ongoing users login work
conflict resolved
login page
Merge branch 'master' into users
finished login screen
more improvements
Merge branch 'develop' into users
move login test screen to /admin/users/logintest/
add users index
Add create-user page
Student profile importer now sets degree subject
Merge branch 'develop' of github.com:torchbox/verdant-rca into develop
Removed student counter
add 'edit user' view
minor changes to staff index filters
Add administrator checkbox to add/edit user forms