Merge in 5.20
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 21 Nov 2019 01:22:13 +0000 (12:22 +1100)
committerSeamus Lee <seamuslee001@gmail.com>
Thu, 21 Nov 2019 01:22:13 +0000 (12:22 +1100)
commitbd4c91fa63ea1884bcb352aa2a27952f2a0862df
tree26b0343640d35f3e9c95fd2b1b2d952603773b93
parenteda4c5942ca6c0f3f394957acac921b9d3d9854e
parent448b2c0fd2e355d8784660d2586430b88ae1ae3c
Merge in 5.20
26 files changed:
CRM/Campaign/BAO/Query.php
CRM/Campaign/Form/Survey/Main.php
CRM/Campaign/Page/AJAX.php
CRM/Contact/BAO/SavedSearch.php
CRM/Contact/Page/AJAX.php
CRM/Contact/Page/SavedSearch.php
CRM/Contribute/Form/ContributionPage/Amount.php
CRM/Core/BAO/PrevNextCache.php
CRM/Core/BAO/WordReplacement.php
CRM/Core/Config.php
CRM/Core/DAO.php
CRM/Core/Menu.php
CRM/Member/BAO/Membership.php
CRM/Report/Form.php
CRM/Utils/API/HTMLInputCoder.php
CRM/Utils/String.php
Civi/API/SelectQuery.php
Civi/Api4/Generic/Traits/DAOActionTrait.php
Civi/Api4/Query/Api4SelectQuery.php
Civi/Api4/Service/Spec/FieldSpec.php
Civi/Api4/Service/Spec/SpecFormatter.php
Civi/Api4/Utils/FormattingUtil.php
Civi/Core/SettingsBag.php
composer.json
composer.lock
tests/phpunit/api/v4/Action/ContactApiKeyTest.php