v2.2.0 release candidate

[briri]

Organizational Admins

• You can now make some checkboxes, dropdown lists or radio buttons on your templates trigger conditional logic. For example if a user selects a particular value from a dropdown then logic can be triggered to send an email or hide other questions related to their response. Allow conditional fields / question logic / ordering #1772 Amend "Add conditions" button once one condition is added #2476 Conditional questions - editing template on test site  #2405 Conditional questions on customisable templates #2451
• The Usage Statistics page now allows you to filter out test plans and the filters now apply to the same graphs instead of the static plan and user counts (which have been removed) Usage statistics - differentiating between the test plans and real plans #2158 Improvements to the Usage Statistics page and graphs  #2343
• You can now click on one of the bars in the bar charts on the Usage Dashboard page which will drill into the results.
• You can now filter the results of the Plans and Users pages by month and year Add a filter to the user / plans page tables #2450
• You can now provide us with a Google Analytics code that you can then use to monitor your user's activity within the system. Google Analytics integration  #2344
• Updated the API to allow you to update your User's departmental affiliations. See the wiki documentation for more details Supporting unis to tag existing users with dept/school/faculty affiliation #2235
• Fixed a bug that prevented you from viewing historical versions of your templates Unable to view a historical version of a template #2509
• Fixed a bug that was giving new templates the incorrect visibility selection by default. This was preventing published templates from being used. Institutional Templates marked Publicly Visible after creation or update #2518
• Fixed a bug that was prevent users from creating more than 5 templates Bug with creating additional custom templates #2458
• Fixed a bug that was preventing you from deleting questions from a published template Question Edit bug in template creation #2304
• ORCID and Shibboleth ids now appear on the Users page Add Orcid/Shibboleth display to admin display of user-accounts #2353

Researchers

• You can now provide Project Start and End Dates on the Project Details tab when editing your DMP. Add Start and End dates to Project Details #2409
• You can now provide information on your Project's collaborators / contributors on the new 'Contributors' tab when editing your project. For example, you can identify more than one PI, project administrators and data curators. Support for multiple contributors #2349 Update Project Details to accommodate contributors #2408
• The new 'Contributors' tab provides a typeahead box for organizational affiliation. This box searches the Research Organization Registry (ROR) as you type. Build integration with ROR identifiers  #2339
• Fixed a bug that was sometimes confusing the funder and template names on PDF exports plan.funder_name not specified for all funder templates #2419

Super Admins

• You can now deactivate a notification Add an deactivate option to the notification system #2382
• You now have the ability to export all plans Create a super admin view of the Plans report  #2346
• Added filter by permission level to the Users page Additional filters for super-admin user index #2352

Developers

• Introduced the 1st half of the RDA metadata standard for DMP compliant API api/v1/. The API currently only allows for the following: templates#index, plans#index (no filters yet), plans#show and plans#create Build out API v1 - Phase one #2390 (Note that the 2nd half of the API work is scheduled for late summer / early fall)

[briri]

fixed merge conflicts in sessions and registrations controllers.
ran bundle updateand yarn upgrade