Merge pull request #2128 from DMPRoadmap/feature/research-grant-id ...

Add typeahead field for Research Grant ID

Merge pull request #2129 from DigitalCurationCentre/feature/reviewer_role ...

Feature/reviewer role

remove log statement from controller

Merge branch 'development' into feature/research-grant-id

Merge pull request #2127 from DMPRoadmap/issue2090 ...

Allow org admins to view 'share plan' page.

Add typeahead field for Grant ID

Merge pull request #2039 from DMPRoadmap/issue1872 ...

Update the text of the Comment notification email.

Merge pull request #2042 from DMPRoadmap/issue1182 ...

Make Template names an actionable link like  Project title in My Dash…

Make Template names an actionable link like Project title in My Dashboard. ...

The Template Name column links have been made the same as the corresponding link in the dropdown menu link of the Template tables with except we use the template title for the link name.

    Fix for #1182.

Merge pull request #2051 from DMPRoadmap/issue1749 ...

Added a customised error message for the case where personal details …

fixed pagination issues (#2045) ...

fixed issue with public plans template sort

Added a customised error message for the case where personal details update of the email fails because of its use already. ...

Fix for #1749.

Added UTF8 ecoding to renderer for pdf export. ...

The fix was suggested by Benjamin Faure  @benjaminfaure
https://github.com/DMPRoadmap/roadmap/issues/73#issuecomment-380854181

Fix for issue #73.

Update the text of the Comment notification email. ...

Fix for issue #1872.

Improved formatting of plan downloads. (#2035) ...

Fix for issue #1893

- Cleaned some of the formatting issues for the html, pdf and docx format
that used the partial app/views/shared/export/_plan.erb.

Fix for the scenario a plan with a question checkboxes where the a single checkbox has been checked and saved, then unchecked and saved. The bug is that the checkbox still appears. (#2034) ...

The fix was suggested by Y Chieh Henry Yang. It resets the permitted question_option_ids array to an empty array.

Fix for #1999

Merge pull request #2015 from DMPRoadmap/issue/2014 ...

issue/2014: Issues Preventing Shiboleth account creation or linking from the homescreen

updated ref (#2010)

fixed query (#2008)

updated sessions controller to no longer set shibboleth_id field on user account, changed devise registrations/new so the js could find the create-account-form.

Patch issue with share plans on development ...

Devise circumvents running validations on the user models when invite! is called.
I updated this call to adhere to validations, and I've updated the form to request the name,org of the user when a plan is shared with them.
This should fix the issue for both newly created share-plan users, and those with previous, bad data in the system.

You may want to consider re-running your validations(or fixup) scripts for users as you can have some invalid ones that you'll need to set a default name/org

made recommended adjustments

removed debug statements

finished up changes to controllers

Merge branch 'development' into issue1663

updated Role, Plan logic and fixed tests

Updated api stats controller to use Org model's method (#1995) ...

* updated api stats controller to use Org model's  method

* updated org.plans to check role.active flag

* updated other api stats endpoints to use org.plans

refactor plan/role functionality to use flagshihtzu properly

moved deactivate logic to Role model and added specs

Issue #1931 - Share plan emails updated. ...

- The inviter name is added to the devise file app/views/devise/mailer/invitation_instructions.html.erb
- The name of person invited the plan is shared with is added to the greeting if it exists for both the devise
and non-devise emails (repectively app/views/devise/mailer/invitation_instructions.html.erb and app/views/user_mailer/sharing_notification.html.erb).
Otherwise, the invited person's email is displayed in the greetings.

Fix for #1931