updated to development

Merge pull request #1911 from DMPRoadmap/issue-1771 ...

The allowed QuestionFormats when adding a new question to a customisa…

The allowed QuestionFormats when adding a new question to a customisable template ...

no longer includes the "Multi select box" option in the view.

Fix for #1771

Repositioned the "Download Csv" button on the "User accounts" page. ...

Fix #1754

updated calls to old paginable_base_url_with_query_params (#1907)

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

added sr logic to download_plan submit button

Merge pull request #1904 from DMPRoadmap/issue-1771 ...

Change to remove multi select box as an answer format.

Add a button to download a list of users by Org admins in CSV format. ...

- Super admins currently do not get the download option (as this would involve all users the can view and will be slow (over 20 min for 31K+ users))

    Issue #1754

Change to remove multi select box as an answer format. ...

- Removed test multiselectbox_questions_spec.rb, as multi-select
functionality no longer used.

Fix for issue #1771

Merge pull request #1902 from DMPRoadmap/bug/org-form ...

Fix form validations on Orgs form

Merge pull request #1900 from DMPRoadmap/issue-1730 ...

Issue 1730

Merge pull request #1896 from DMPRoadmap/issue-1861 ...

Fix bug in paginable table sorting

Change validation requirements for orgs form

Fix for broken exportable plans csv download (#1730) ...

* Csv export of plan:
  - When plan empty and 'question text and section heading' checked,
    then questions and headings shown. If 'unanswered question' checked,
    then 'Not Answered' now added to Answer column.
  - Answers with options now displayed (previously appeared empty).
  - If 'supplementary section(s) not requested by funding organisation' checked,    then  the section is now displayed.

* Also changed code in exportable_plan.rb to pass Rubocop requirements.

Update paginable.rb

Update paginable to make sort span translatable

added default for feedback email subject. updated JS toggle to enable/disable feddback message appropriately (#1895) ...

added default for feedback email subject. updated JS toggle to enable/disable feddback message appropriately

Merge pull request #1882 from DMPRoadmap/issue-1760 ...

Display total Org users and total Org plans statistics on the Usage s…

Fix bug in paginable table sorting ...

- Wasn't flipping direction when clicked
- JS was loading multiple nested duplicate .paginable objects

Display total Org users and total Org plans statistics on the Usage statistics page. ...

Feature for issue #1760

Merge pull request #1887 from DMPRoadmap/issue-1880 ...

Change success message on permission change

Update users controller to ensure perm present

Updating notes (#1889) ...

* updated layout to show note text

* updated layout to show note text

* updated note display order

Fix bug preventing admin from creating orgs (#1884) ...

- Add default language to new Org
- Refactor Language.default to a method (misuse of scope)

updated section/question export logic in helper (#1888)

updated section/question export logic in helper

Fix bug in table pagination (#1885)

Fix broken tests caused by locale configuration (#1875) ...

* Fix broken tests caused by locale configuration

- Add LocaleSet
- Add LocaleFormatter to force proper string formats
- Rename I18n formats to use hyphen
- Add rake task for updating existing languages on DB
- Fix instances of US english in the templates

* Fix FastGettext initializer loader

* Add Amazon S3 creds for Travis

* Revert "Add Amazon S3 creds for Travis"

This reverts commit 366c1a7.

* Fix Faker localization for rake tasks

Was breaking rake db:seed file

Change success message on permission change

Repair broken or pending specs (#1874) ...

- Fix pending Template model specs

- Fix pending model specs

- Fix broken/pending specs, including random "errors" bug