updates for pt_BR issues (#2298)

fixed issue with archiving users (#2286)

Merge pull request #2282 from DMPRoadmap/issue2240 ...

These feature are part of the request for improving the Admin view of

These feature are part of the request for improving the Admin view of ...

users.

Changes:
- on the Editing profile of a user the School or Department dropdown
menu has been made the same horizontal size as other inputs.
- A link has been created on the Users page from Plans (i.e, no. of
plans) to a Plans page for the user.

Fix for #2240.

Merge pull request #2266 from DMPRoadmap/issue2240 ...

Updated functionality for Admin View of Users.

Merge pull request #2268 from DMPRoadmap/issue2147 ...

Fix for the formatting issues with bullet points for exported docx plans

Added functionality to allow Org admins to export their org's templates. ...

Re-used the template_export templates template_export.docx.erb
and template_export.pdf.erb.

Changes:
 - Moved templates template_export.docx.erb and template_export.pdf.erb
to a separate view folder template_exports.
- Added functionality for Org admins to export both current and historic
templates for their organisation. The version name has been appended to
the templates, e.g., My_Template_v0.docx or  My_Template_v5.pdf.

Fix for issue #2091.

Fix for the formatting issues with bullet points for exported docx plans ...

when viewed in an old Word editor.

The fix follows the solution suggested in  the HtmlToWord bug "List item
bullets corrupted in Microsoft Word"
https://github.com/karnov/htmltoword/issues/73 suggested by David
Verhasselt @dv.

Changes:
   - Firstly, removed earlier attempted fix in commit
     5ef7e05 (Fix for format issues for
     bullet points in Plan docx exports).
   - Made a copy of Htmltoword (1.1.0) xslt stylesheets functions.xslt
     and numbering.xslt and made changes suggested by https://github.com/karnov/htmltoword/issues/73
   - Prepended the Htmltoword library XSLTHelper method xslt_path() in
     config/initializers/htmlto_word_xslt_helper.rb. This method ensures
     the Htmltoword library picks up the changed  numbering.xslt template instead of
     the library's version.
   - pinned version of htmltoword to 1.1.0

Fix for issue #2147.

The Plans 'Request Feedback' has been relocated from the Share form to a ...

separate form.

Changes:
 - Removed "Request feedback" from the _share_form.html.erb partial and
created a new partial _request_feedback_form.html.erb.
- Added a tab to Plan _navigation.html.erb for 'Request feedback'.

Fix for #2234

Updated functionality for Admin View of Users. ...

Changes:
 - for Super Admins: Added user department and plans.
 - for Org Admins:
        (1) The user view now has a clickable link for opening up
            a view of a user's profile and plans.
        (2) In a user's profile view the Department if it exists for the
            organisation is editable. The Organisation must have
            departments in systerm to avail of this functionality.

Fix for #2240.

updated cookie serialization from hybrid to json, fixes #2255

capture status

Fix for making links have a higher color contrast to other text in blocks. (#2192) ...

The changes were based on the article  https://www.viget.com/articles/color-contrast/

Changes:
 - Link color has been  changed from #337ab7 to #107896.
According to https://webaim.org/resources/linkcontrastchecker/?fcolor=000000&bcolor=FFFFFF&lcolor=107896 (the "Link to Body Text" ratio is 4.14:1 and passes WCAG A test and "Link to Background" ratio is 5.06 and passes the 5.06:1 which satisfies WCAG AA test.)
- The TinyMce editor required new stylesheets to be created.

Fix for issue #1457

updated gems and yarn dependencies (#2179) ...

* updated gems and yarn dependencies

* updated yarn

* added csrf gem to deal with omniauth vulnerability

* add in explicit disable of non-post omniauth methods, add ignore statement tobundle audit so Travis can run the remaining tests

* replaced depricated Faker::StarWars with new Faker::Movies::StarWars

* downgrading timeago.js to 4.0.0beta.1 from *beta.2

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

Fix for issue #2088.

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.

swap pager_api for api_pagination due to jbuilder compatability

added plans fulltext api using pagination

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

Add typeahead field for Grant ID

Changed date format of footer in the Plans pdf export to a more human readable date, ...

e.g., "Last modified 26 April 2019".

Changes:
  - added :readable date format to language locales
  - used this date for the footer in the Plans pdf export.
    Note, changed " formats" to "format" and use :readable in footer date
     From  "date: l(@plan.updated_at.to_date, formats: :short)" -->
     to    "date: l(@plan.updated_at.to_date, format: :readable)"
  - to pass Rspec test spec/features/plans/exports_spec.rb we needed to add
    a locale file en.yml  which is a copy of en-GB.yml to avoid error
    "1) PlansExports User downloads their plan as PDF
     Failure/Error: date: l(@plan.updated_at.to_date, format: :readable)

     I18n::MissingTranslationData:
       translation missing: en.date.formats.readable"

Fix for Issue #2094.

Complete merge Development -> Master

updated webpack configuration to add a babel-loader to transpile to es5

Merge pull request #2076 from DMPRoadmap/bug/fast-gettext-path ...

Fix bug in FastGettext initializer

Fix bug in FastGettext initializer

Merge branch 'development' into issue1158

Notification Preferences for checkbox for "A new comment has been added to my DMP" is unticked for new users to the system: (#2066) ...

- The branding.yml will need to be altered to set the following item to false:
        preferences:
          email:
            users:
              new_comment: false

Fix for issue #2059

pulled down jquery-ui custom theme for datepicker to try and get icons to work

Merge branch 'master' into development

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