add confirmation dialog and fix merge logic

capture status

fix issue with paginable guidance_controller throwing error when sort selected

Fix for bugs arising for Super Admins editing Departments of an Oreganisation they did not belong to. ...

Fix for issue #2088.

Merge pull request #2150 from DMPRoadmap/issue2088 ...

Issue2088 - Add functionality for School/Department for an organisation.

ensure review_plans are active

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

Fix bug with reviewer plans where non-existing id's cause issues

Fix bug with comparison of :per_page param in plans_api

add uncommitted local changes

swap pager_api for api_pagination due to jbuilder compatability

added plans fulltext api using pagination

Merge pull request #2121 from DMPRoadmap/issue/2118 ...

updated permissions and routing around public template export

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

remove auth verification on public_pages, update model accessors to ? methods

updated permissions and routing around public template export

Complete merge Development -> Master

Updated Usage page display to fix several issues. ...

- Moved mouse pointer instruction.
    - Made textual changes to "No. of plans by template"
    - The bar charts for  "No. users joined during last year" and
    "No. plans during last year" months are in ascending order. They were
    in descending order previously. Updated the count statistics methods
    in statistics_controller.rb.
    - The "No. plans by template" bar chart is now  replaced by a stacked bar chart
    as this is visually better for large data.
    - updated the by_template method in the create_or_update.rb with code from @xsrust.
    This now aggregates template counts for a month correctly.

    Fix for issue #1679.

fix bugs with API: re-add date filtering, revert assumption of last month by default, re-add instance variables, fix other minor bugs

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.