fixed placeholder text on search form

add confirmation dialog and fix merge logic

Fix for providing a text alternative for tooltips for assistive technologies. ...

The fix consists of adding the current tooltip text to a <em> tag with the bootstrap class
sr-only that is made only available to assitive technologies.

Fix for issue #2174.

Fix to improve screen visibility when using zoomText or Windows Magnifier. ...

Changed default font-family for body ans Bootstrap tooltips and popovers t
  font-family: Verdana, Trebuchet, "Helvetica Neue", Helvetica, Arial, sans-serif;

Fix for #2172.

Added functionality to give warnings when links open in new windows. ...

The solution is based on the recommendation in "Techniques for WCAG 2.0" section
"G201: Giving users advanced warning when opening a new window":
"Example 2: Using CSS to provide a warning before opening a new window"
(cf., https://www.w3.org/TR/WCAG20-TECHS/G201.html)

Changes:

- any link in the views with target="_blank" has had css class "has-new-window-popup-info" to the link together with the span   <span class="new-window-pop-info"><%= _('Opens in new window') %></span>.
- The javascript script externalLink.js is used for external links that don't have the target="_blank" in the view.

Fix for issue #2175.

fixes an issue where annotations were being added to removed questions

capture status

Merge pull request #2206 from DMPRoadmap/issue2170 ...

Fix for providing a highly visible highlighting mechanism for links o…

Merge pull request #2210 from DMPRoadmap/master ...

Sync Development with Bugfixes/Patches from Master

fixed js logic to initilize the my_org partial when the org is the other_org (#2208)

Fix for providing a highly visible highlighting mechanism for links or controls when they receive keyboard focus. ...

(WCAG 2.0, Additional Techniques (Advisory) for Sucess Criterion 2.4.3, https://www.w3.org/TR/UNDERSTANDING-WCAG20/navigation-mechanisms-focus-order.html)

Changes:

- Added an outline to links, buttons, select menus and other bootstrap form controls.
- The outline colour was set to #107896 (Darkest Alice Blue) which is the default colour for links.
- The default outline with set to 2px, except for buttons where it is set to 3px
to improve visiblity.

Fix for #2170.

Merge pull request #2204 from aninder/fix_api_token_tests ...

Fix some inconsistencies in api token tests,introduce local variable for storing a token

Merge pull request #2202 from DMPRoadmap/issue2169 ...

Enable spellcheck for text fields:

fix issue with paginable guidance_controller throwing error when sort selected

store new token in a local variable

Enable spellcheck for text fields: ...

Changes:
 - added HTML 5 attribute spellcheck= "true" to text_field tag by adding
        spellcheck: true.
 - Did not add this attribute to text_fields for:
    firstname,
    surname,
    principal_investigator_name &
    data_contact.
   (it is irritating for folk to have a spellchecker say your name is incorrectly spelt.)

Fix for issue #2169.

fix template published date

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

changed tooltip text to use app name from branding

added gettext markup

updated plan sharing form according to #2111, also added text to the email field to clarify what happens if the user is not in our system

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

Fixed link for UC3 at footer since the page was previously not found.

Merge pull request #2167 from DMPRoadmap/issue2157 ...

Add template version to Plan view.

Merge pull request #2163 from DMPRoadmap/issue2093 ...

Re-introduced the drag feature for the TinyMCE editors.

Add template version to Plan view. ...

Changes added template version to plan overview.

Fix for issue #2157.

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

Fix for issue #2088.

Fix for issue associated with super-admins and department affiliation in a given organisation. (#2165) ...

Changes made:
  - Department policies now allow both org admins and super admins to
    create update and delete departments, whilst org_admins can only do this
    for their own org. Super admins can do it for any org department.
  - When a super admin switches organisation their department_id is cleared.

Fix for issue #2088.

Re-introduced the drag feature for the TinyMCE editors. ...

Note that we only allow re-sizing vertically. Resizing horizontally would allow the editor to stretch over
other elements in the flow.

Fix for Issue #2093.

Merge pull request #2155 from DMPRoadmap/issue1743 ...

Fix for humanizing the attribute name for feedback_email_msg in error…