UserManagement - setting up devise …
- added registrations and sessions controller
- setup routes
- moved view for sign-in, sign-up and edit to users folder
UserManagement - UI for user details edit page
Merge remote-tracking branch 'yaro/develop' into develop
982890-63047068 Users can have avatars - 1 iteration
Merge remote-tracking branch 'yaro/avatar' into develop
implemented gravatar image
Mercury editor integration: - added gem to Gemfile
a couple of simple tests for mercury
few changes
Merge remote-tracking branch 'thomas/develop' into develop
update to tests
still working on solutions...
Merge branch 'develop' into HEAD
982890-63061202 Add Mercury for Document editing
Happy path for mercury editing scenarios complete!!
merged with upstream/develop
merged with upstream and refactored some steps and the documents/show view
issues with rspec views/documents/show. Conflict with mercury changes???
resolved cuke isse by adding yet another 'click_button' step definition
982890-63061202 Add Mercury for Document editing
Mercury testing scenarios complete, proper sanitization of html
982890-63061202 Add Mercury for Document editing
All tests passing