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

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

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

Merge pull request #1990 from DMPRoadmap/issue-1164 ...

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

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

1. stat_created_plan.to_csv with option for details by template. ...

2. details attribute for stats table #1679
3. create_created_plan_service extended with details by template
4. create_last_month_created_plan_service extended with details by
template.
5. create_or_update strategy for generating stats
6. StatCreatedPlanByTemplateController#index for graphs usage
7. month_start_date and month_end_date for OrgDateRangeable class

[RD-1679] Usage view including date input for plans by template

[#1679] monthly_range query updated

[#1679] client-side chart for plans by template

[#1679] Time picker for plans by template chart

[#1679] Download plans by template action.

deleted spec

merge conflicts fixed

[#1679] Removed JS linter warnings

[#1679] Rubocop conforming code. Drying out stat services

Issue #1161 - Display tooltip below form fields on Create plan page. ...

- Required modification for the intiialization of Bootstrap tooltips in the javascript file
      /utils/tooltipHelper.js. The default behaviour is placement of tooltip to the right of element
      with attribute data-toggle='tooltip'. Now if the attribute data-placement attribute is set,
      then the placement of the tootip will be as specfied in the attribute and not on the right (the default behaviour).
    - The accessible combob-box now takes an optional property 'placement' which if present sets data-placement
      attribute to the value of the placement property.
    - Now all Create Plan page tooltips are below the input as requested.

Fix for #1161.

Fix for ensuring that Questions that are option based must have atleast one non-blank text entry. ...

- Validation added for option based questions to ensure text field non-blank.
    - Validation message OPTION_PRESENCE_MESSAGE added to app/models/concerns/validation_messages.rb.
    - Added ':allow_nil => true' to
            delegate :option_based?, to: :question_format, :allow_nil => true
     in Question model to prevent NoMethodError if question_format is nil.

    Fix for #1725

Merge pull request #1982 from DMPRoadmap/fix-karma ...

Moved JS tests and added karma/jasmine for JS tests

moved JS tests to the spec dir and fixed issues with karma/webpack/jasmine ...

added lint and updated bundle task to use yarn

added lint and updated bundle task to use yarn

Changed links to icons for file download. ...

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

    Fix for Issue #1164

renamed yml examples. added them to bin/setup and added eslint init to travis ...

added eslintrc.json back

moved eslintrc to loaders dir

removed eslint init statement

fixed up eslinter

updated rack and destructured array and object assignments in js. updated release portion of readme

added eslintrc back to gitignore

fixed issue with create plan JS, fixed some warnings in specs

removed console.log statements and updated linter task in travis

Add support for AWS file storage with Dragonfly ...

Fixes #1976