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

made docx title correspond to plan title, filename correspond to filename

Merge pull request #445 from DigitalCurationCentre/kmcgre/bugfixes ...

Remove guidances api controller and show action from guidance_groups …

Remove guidances api controller and show action from guidance_groups api controller

updated other controller actions shown to throw error by test, we render phases/admin show from other controllers, so need same instance variables defined

funder guidance now displays on customized templates

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

api updates

Fixed problem when changing question format for editing. Implemented default answer for textfield and textarea. Example answer now loads tinymce for editing too. DMPRoadmap/roadmap#414

updated admin_index for templates to not bug for some orgs, reimplimented logic for transfering customizations, changed text according to #338

fixed bug where org not set by update function

enforce manditory fields on edit profile page

Filtering funders with published templates only - Closes #387

Merge pull request #404 from DigitalCurationCentre/issue337 ...

Fixed problem when creating a question. Fixed JS to display/hide defa…

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

updated org-admin customization of templates according to #373

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

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

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.

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

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

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

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

Check that user role doesn't already exist before sharing. Fixes #362

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

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

Now pre-selecting all institutional (themed) guidance which is not optional on plan creation. Closes #326

Should take care of shibboleth_enabled = false case for #359

Using touch for timestamp for when only answer.question_options is updated. DMPRoadmap/roadmap#355

Checkbox using rails FormHelper. Helper method at answer model for determining if an option should be selected. DMPRoadmap/roadmap#354