Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into user-profile
to catchup with upstream additions
Merge branch 'user-profile' of https://github.com/PeteBoucher/WebsiteOne into user-profile
Merge branch 'user-profile' of https://github.com/PeteBoucher/WebsiteOne into user-profile
moved Joined on text below avatar
made user avatar 20% smaller
updated scenario with new profile page avatar size; added conditional to the related step so that we can be less precise about this in future
added scenario for sad path user edit button on others profile
UserProfile: changing the Member since step
commented out pending step
UserProfile: changing the Member since step (refactored step)
comment for pending step
failing test for time since singup
pong to bryan: installed gem friendlyID to work on feature for URL ID's
create a user profile page story - working on user member for tests
added slugs entry in database for User, Project, Document models. Implemented friendly_id for Project and Document. Controllers raise exception when using numeric ids
added route to support legacy url, added minor support for slug conflict management, document_controller_spec GREEN
fixed tests in documents.feature and follow.feature
all tests GREEN
merged with upstream
Update .travis.yml