Merged with DMPRoadmap:master

updated call to Plan.readable_by? (#2019)

added table prefix to column sorts (#2017)

Issue #1164 - Styling for Download and Date columns in table. ...

- Used an existing class .date-column to fix date column min-width and
   added it to all the table date columns.
 - Added a  class .download-column for download column min-width

 Fix for #1164

Changed links to icons for file download. ...

- Using fontawesome icons file-pdf-o and file-word-o

    Fix for Issue #1164

accessibility fix - add 'new window' text for screen readers when links has target=_blank (#1901) ...

added sr logic to download_plan submit button

Refactor how Template upgrade customization works (#1856) ...

* Refactor how Template upgrade customization works

- Added position_in_parent to child-records Phase, Section, and Questions
- Extracted upgrade_customization! into its own service object

wip: rebasing on development

wip: pushing to Ghub

wip: Template upgrade customisation service working

Add migration to update versionable_id for records

* Fix bug in org swaps test

Test was failing because JS wasn't executing fast enough in test browser

* Refactor how locales are set in specs

* Fix bug in plan exports caused by git merge

The routes weren't merged properly which seems to have caused a regression error

* Add documentation for SectionSorter

* Update rubyzip and re-instate Bundle Audit

This was disabled because it was failing the Travis CI script. Since there wasn't a
new version of the rubyzip gem to upgrade to, we couldn't turn the error off.

* Add length constraints to versionable_id

* Add length constraints to versionable_id

* Fix bug in ActsAsSortable module

... I have no idea why those issues haven't popped up before now!?

* Fix random bug in I18n

* Move versioning ID migration into own rake task

Fix broken test in plan exports

Fix bug preventing plans from downloading

Refactor plan exports. Extract into own resource

Refactor how section ordering is handled (#1837) ...

* Extract template customizations into own controller

* Refactor Template model methods

* Fix view logic in draggable sections

* Add button for customising phase

* Fix rubocop violations in GuidanceService

* Rename GuidanceService to GuidancePresenter

* Fix bug in phase preview order sections

* Refactor preview action/controller code

* Fix Section ordering in various views

* Fix rubocop violations

* Fix bug forcing Phases to be modifiable

* Fix broken tests

* Update method to check if section is draggable

* Extract copy action into its own resource

* Extract customization transfers to own controller

* Remove redundant routing condition

* Fix Rubocop violation issues

* Change condition for section draggable

* Refactor instance variable in PlansController

* Fix broken tests

* Add test support for 'de' locale

* Fix merge issue in plans controller

* Fix broken specs in plan#request_feedback

Issue 532 (#1847) ...

* Replaced instances of `raw` with `sanitize`

* Updated Brakeman ignores

* Remove unnecessary sanitation

* Add support for TinyMCE tags

Merge branch 'dmpopidor_branding' into feature/org_nb_users

Added "users" column to orgs index

Merge roadmap/master into dmpopidor_branding

Configurable plan access (#1828) ...

* added configuration options to branding.yml for plan access, updated links to be dependant on access

* updated spec to expect multiple calls to branding

Merge pull request #78 from OPIDoR/feature/template_links ...

Ability to create a plan from a link

Refactor template index views to use instance vars

Add tests to check that Template copying works

Replace deprecated methods with their new alaises

Added template link copy to admin area (organisation templates)

Improved modal style and moved it to a partial

Added JS for link copy

Added modal for link copy

Moved link generation to helper

Added direct link for plan creation from templates list

Added Plan Owner in DMP List

Add Screen reader text for sort columns, adding scope to <th> tags

Merge branch 'dmpopidor_branding' into master

Accessibility - Form fields missing labels #1445