Fixed problem when creating a question. Fixed JS to display/hide default answer. Fixed tinymce problem for example answer. DMPRoadmap/roadmap#337 ...

fixed create_a_new_question test. DMPRoadmap/roadmap#337

Changed error text - closes #382.

added default answer text according to #388, fixed bug introduced yesterday from guidance fix

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

updated org-admin customization of templates according to #373

Default ordering for Phase, Question becomes .number - closes #402

Changed guidance tooltip - Closes #333

Made invitation email title same as sharing email title - related to #271

remove add phase button from customized templated

fixes no route error when trying to customize a template

fixes bug where guidance dropdowns have duplicate id's so are unable to be expanded

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

Table formatting toolbar without obscuring the view. DMPRoadmap/roadmap#272

Updated translation strings & added :migrated attribute access to template model

Merge branch 'development' of https://github.com/DMPRoadmap/roadmap into vyruss/bugfixes

Re-enable attr_accessible for Dragonfly gem (logo uploads) - closes #375

Added method to validate answer according to each question format. Partial view for section progress. Eager loading of resources needed to calculate plan and section progress. Refactoring of code for progress plan. DMPRoadmap/roadmap#382 ...

Fixed merge conflict. DMPRoadmap/roadmap#382

onChange event for tinymce at plan answers. Removed unnecessary options passed to tinymce. DMPRoadmap/roadmap#382

We don't need .live here but just a template name for @based_on - Should fix #385, #389.

Merge remote-tracking branch 'upstream/development' into xsrust/bugfixes

updated routes from put to get for admin_customize, addresses part of #370

Merge pull request #386 from DigitalCurationCentre/xsrust/bugfixes ...

Xsrust/bugfixes

changed text for example answers, fixes #277

fixes issue with some template guidance not displaying

Co-owner shouldn't be able to adjust their own rights

Replaced funky iteration logic which broke for non-sequential section/question numbers - Fixes #331.

Merge pull request #380 from DigitalCurationCentre/issue355 ...

Fixed timeago problem for when a new answer is created. Refactored Ja…

Merge pull request #379 from DigitalCurationCentre/xsrust/bugfixes ...

fixed display issues with guidance/suggested_answers

Fixed timeago problem for when a new answer is created. Refactored JavaScript logic into its own file. Created a partial to handle answer status. DMPRoadmap/roadmap#355

fixed display issues with guidance/suggested_answers

Merge pull request #365 from DigitalCurationCentre/xsrust/bugfixes ...

updated org-admin and plan create pages to reflect schema change