added table prefix to column sorts (#2017)

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

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

added check to feedback_requested (#2012)

added externalLink.js back to application.js (#2013)

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.

updated organisational plans query to only include completed plans to match logic of plan export (#2004) ...

refactored plan.visibility_allowed? to call underlying method on phases

refactored plan.visibility_allowed? to call underlying method on phases

fixed tests

Removed twitter url from footer

Further changes for Text field should be mandatory for option based questions. ...

Fix for issue #1725

The question_options field on the Customisable Phase template has the
following changes:
- the 'Text' label has the asterick for required.
- the error message for missing question option now reads
 "You must have at least one option with accompanying text."
- Corrected some Rubocop errors on the files added.

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

Merge pull request #1997 from DMPRoadmap/issue1663 ...

Moved deactivate logic to Role model and added specs

made recommended adjustments

removed debug statements

Merge pull request #1998 from DMPRoadmap/roadmap_styling_tweaks ...

refactoring css variables to be more descriptive when re-branding the site

finished up changes to controllers

Merge branch 'development' into issue1663

Merge pull request #1994 from DigitalCurationCentre/issue1391 ...

Issue1391

Added number type field

Fixes to French translation

Plan creation form is back to default & put form V2 in beta

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

refactoring css variables to be more descriptive when re-branding the site

refactor plan/role functionality to use flagshihtzu properly

updated deactivate logic

Updated JS for requiredField to allow for dynamically loaded DOM elements (#1996) ...

* IssueID #1725 - Updated messages Question text and option presence messages.

* updated requiredField.js to allow for dynamically loaded DOM elements

* fixed broken tests

moved deactivate logic to Role model and added specs

#1371 More specific selector for usage statistics export button

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