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

Merge pull request #351 from DigitalCurationCentre/vyruss/bugfixes ...

Vyruss/bugfixes

Merge pull request #353 from DigitalCurationCentre/issue_302 ...

radiobuttons question is now saving through its relation question_opt…

typo

Fixes for #311, #345.

radiobuttons question is now saving through its relation question_options rather than options. Added whitelisting attributes for mass assignment. DMPRoadmap/roadmap#302

Colon separator between Guidance Group name and Guidance name - Fixes #333 ?

Added confirmation message for guidance choices - closes #332

Closes #322. ...

Now deleting stem accounts of invited users who haven't followed invitation link and try to sign up (but their email already exists).

Fix for super admin (new annotation model)

updated syntax to allow read-only view of a plan. \n app/views/phases/_answer_form_ro.html.erb probably needs a bigger re-write as the logic is horrendus and it renders the whole thing as a form...but it's not a form because it's read only and it checks to see if it's read only a bunch of times within it. but here's the quick and dirty making it work

Integrate/resolve PR #319 - Closes #251.

Template versioning update.

Merge branch 'development' into template-publish-fix

updated template processing so that a new version is created when the user edits a published version. Updated tests to work with this new paradigm

updated tests to work after annotations changes

updated super admin to use annotations and model files accordingly