Lisa Marie Maginnis [Mon, 21 Sep 2015 17:18:43 +0000 (13:18 -0400)]
Removed cache rebuild from the GroupContact
Lisa Marie Maginnis [Mon, 21 Sep 2015 17:15:03 +0000 (13:15 -0400)]
RT#765026, patch for null values in civicrm_acl_cache
Ruben Rodriguez [Thu, 10 Sep 2015 22:24:23 +0000 (18:24 -0400)]
Added the current uncommited changes to production code, and rebased to 4.6.8
Lisa Marie Maginnis [Thu, 1 May 2014 21:29:27 +0000 (17:29 -0400)]
Additional files for PDF/Latex
Lisa Marie Maginnis [Thu, 1 May 2014 21:04:18 +0000 (17:04 -0400)]
Our changes
CiviCRM [Wed, 20 Nov 2019 22:34:27 +0000 (22:34 +0000)]
Set version to 5.19.2
CiviCRM [Wed, 20 Nov 2019 22:33:01 +0000 (22:33 +0000)]
Merge remote-tracking branch 'security/security-fixes' into 5.19
Seamus Lee [Wed, 20 Nov 2019 22:17:37 +0000 (09:17 +1100)]
Merge pull request #15897 from seamuslee001/dev_core_1409_519
dev/core#1409 Remove net_amount from Addtional Payment form
totten [Wed, 20 Nov 2019 21:53:34 +0000 (21:53 +0000)]
Merge branch 'security_release_release_notes' into 'security-fixes'
Release notes for 5.19.2 Release
See merge request security/core!89
eileen [Wed, 20 Nov 2019 04:54:22 +0000 (17:54 +1300)]
dev/core#1409 Remove net_amount from Addtional Payment form
This is causing a validation problem. We used to have an issue on the contribution form which we eventually
resolved by removing net_amount as it's best calculated anyway
In order to make this changed I had to ensure Payment.create adds the net_amount & had
to do a couple of tweaks for the test to pass
Backport additional test functions and update API to get tests to pass
totten [Wed, 20 Nov 2019 20:10:03 +0000 (20:10 +0000)]
Merge branch 'public_release_fixes' into 'security_release_release_notes'
Update release notes for Public MRs being merged into 5.19
See merge request security/core!93
totten [Wed, 20 Nov 2019 20:09:10 +0000 (20:09 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 19:59:12 +0000 (19:59 +0000)]
Update 5.19.2.md
Seamus Lee [Wed, 20 Nov 2019 19:54:01 +0000 (06:54 +1100)]
Merge pull request #15893 from seamuslee001/cce_fix_cancel_date_5_19
dev/core#1391 - Fix contribution cancel_date not being loaded
Seamus Lee [Wed, 20 Nov 2019 19:47:12 +0000 (06:47 +1100)]
Merge pull request #15896 from seamuslee001/dev_core_1374_5_19
dev/core#1374 Fix search formValue handling on contribu…
Seamus Lee [Wed, 20 Nov 2019 19:44:58 +0000 (06:44 +1100)]
Merge pull request #15894 from seamuslee001/dev_core_1406_519
dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao…
Seamus Lee [Wed, 20 Nov 2019 19:23:24 +0000 (06:23 +1100)]
Update release notes for Public MRs being merged into 5.19
Seamus Lee [Wed, 20 Nov 2019 18:56:43 +0000 (05:56 +1100)]
dev/core#1374 dev/core#1374 Fix search formValue handling on contribution search
Seamus Lee [Wed, 20 Nov 2019 04:42:52 +0000 (15:42 +1100)]
dev/core#1406 Ensure that we use the CRM_Member_DAO_Membership as dao for the civicrm_membership table
Patrick Figel [Thu, 14 Nov 2019 13:19:04 +0000 (14:19 +0100)]
dev/core#1391 - Fix contribution cancel_date not being loaded
This fixes an issue where the contribution cancel_date is not loaded
in the contribution search, causing cancelled contributions not to be
greyed out and the cancel date not to be shown.
totten [Wed, 20 Nov 2019 08:14:02 +0000 (08:14 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 08:05:07 +0000 (08:05 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 07:35:07 +0000 (07:35 +0000)]
Update 5.19.2.md
totten [Wed, 20 Nov 2019 06:10:06 +0000 (06:10 +0000)]
Merge branch 'security_core_70' into 'security-fixes'
security/core#70 Update Symfony packages to be the latest versions
See merge request security/core!92
totten [Wed, 20 Nov 2019 05:54:08 +0000 (05:54 +0000)]
Merge branch 'security_core_62_apiv4_join' into 'security-fixes'
Ensure that APIv4 Properly filters out permissable fields when no permission to view field exists
See merge request security/core!91
Tim Otten [Wed, 20 Nov 2019 03:50:11 +0000 (19:50 -0800)]
ContactApiKeyTest - Add additional test-case
This case was failing before but now passes with the update
Seamus Lee [Wed, 20 Nov 2019 03:14:16 +0000 (14:14 +1100)]
Ensure that APIv4 Properly filters out permissable fields when no permission to view field exists
Seamus Lee [Wed, 20 Nov 2019 02:13:35 +0000 (13:13 +1100)]
Update to latest versions of polyfill-ctype and polyfill-iconv
Seamus Lee [Wed, 20 Nov 2019 02:03:22 +0000 (13:03 +1100)]
securiry/core#70 Upgrade Symfony version to 2.8.50
Seamus Lee [Tue, 19 Nov 2019 22:18:42 +0000 (09:18 +1100)]
Minor update to release notes
Seamus Lee [Mon, 18 Nov 2019 05:38:23 +0000 (16:38 +1100)]
Update release notes as per Tim's copy editing of the SA
Seamus Lee [Mon, 18 Nov 2019 05:34:14 +0000 (16:34 +1100)]
Release notes for 5.19.2 Release
seamuslee [Tue, 12 Nov 2019 04:31:42 +0000 (04:31 +0000)]
Merge branch 'security_core_46' into 'security-fixes'
Implement xKerman/restricted-unserialize package to guard against unsafe unserialize
See merge request security/core!87
Jenkins [Sat, 9 Nov 2019 07:16:07 +0000 (07:16 +0000)]
Update unit test to match the output of the CRM_Utils_String function
Tim Otten [Tue, 29 Oct 2019 01:55:18 +0000 (18:55 -0700)]
SavedSearch API - Only accept safe inputs
Tim Otten [Tue, 29 Oct 2019 01:53:03 +0000 (18:53 -0700)]
CRM_Utils_String::unserialize() - Add wrapper for parsing safe exprs (int/string/array/etc)
Seamus Lee [Sun, 3 Nov 2019 06:20:31 +0000 (17:20 +1100)]
[NFC] Update Doc block as per Patrick
Seamus Lee [Tue, 29 Oct 2019 22:34:55 +0000 (09:34 +1100)]
Revert changes in CRM/Core/BAO{Cache|ConfigSetting}.php CRM/Extension/ClassLoader.php CRM/Queue and CRM/Utils/Cache
Seamus Lee [Tue, 29 Oct 2019 04:26:57 +0000 (15:26 +1100)]
Return FALSE instead of throwing Exception if package throws Exception
Seamus Lee [Tue, 29 Oct 2019 04:21:06 +0000 (15:21 +1100)]
Implement xKerman/restricted-unserialize package to guard against unsafe unserialize
Tim Otten [Thu, 31 Oct 2019 06:00:21 +0000 (23:00 -0700)]
ContactInterchangeTest - Add coverage for APIv4 joins/chains
Tim Otten [Fri, 25 Oct 2019 03:59:08 +0000 (20:59 -0700)]
(security/core#67) Port APIv3's escaping scheme to APIv4
Tim Otten [Fri, 25 Oct 2019 03:57:34 +0000 (20:57 -0700)]
HTMLInputCoder - Add more variants for encoding arrays
Seamus Lee [Wed, 9 Oct 2019 09:24:42 +0000 (20:24 +1100)]
Fix unit test for APIv4 format
Coleman Watts [Mon, 1 Jul 2019 00:47:47 +0000 (20:47 -0400)]
Fix api_key handling from joins
Patrick Figel [Wed, 9 Oct 2019 10:45:33 +0000 (12:45 +0200)]
security/core#65 - Fix XSS in Dashboard Report Title
This fixes an XSS in report titles displayed on the dashboard page
by escaping the title on output.
Seamus Lee [Thu, 8 Aug 2019 21:38:06 +0000 (07:38 +1000)]
security/core#65 Fix Display of Report title that contains XSS in it when shown on dashboard
Patrick Figel [Fri, 5 Jul 2019 18:49:44 +0000 (20:49 +0200)]
security/core#59 - Fix SQL injection in civicrm/ajax/dedupefind
This fixes an SQL injection in civicrm/ajax/dedupefind by validating
the order direction parameter.
Fixes #59
Tim Otten [Sat, 9 Nov 2019 02:33:35 +0000 (18:33 -0800)]
Merge pull request #15788 from seamuslee001/5_19_1_version_bump_release_notes
Bump version and add in release notes for a 5.19.1 drop
Tim Otten [Sat, 9 Nov 2019 02:32:54 +0000 (18:32 -0800)]
Update 5.19.1.md
Seamus Lee [Sat, 9 Nov 2019 01:39:44 +0000 (12:39 +1100)]
Add in release notes for 5.19.1 drop
Seamus Lee [Sat, 9 Nov 2019 01:31:12 +0000 (12:31 +1100)]
Set version to 5.19.1
Seamus Lee [Fri, 8 Nov 2019 23:33:36 +0000 (10:33 +1100)]
Merge pull request #15780 from seamuslee001/dev_mailing_56_5_19
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namesp…
Seamus Lee [Fri, 8 Nov 2019 21:27:41 +0000 (08:27 +1100)]
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields when building the row array for mailing reports
Eileen McNaughton [Fri, 8 Nov 2019 02:19:56 +0000 (15:19 +1300)]
Merge pull request #15766 from seamuslee001/dev_core_1376_5_19
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4…
Seamus Lee [Thu, 7 Nov 2019 23:35:30 +0000 (10:35 +1100)]
Merge pull request #15763 from seamuslee001/dev_core_1371_5_19
dev/core#1371 Fix e-notice caused by trying to pass in known info to …
Seamus Lee [Thu, 7 Nov 2019 23:07:32 +0000 (10:07 +1100)]
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services
Seamus Lee [Thu, 7 Nov 2019 20:20:21 +0000 (07:20 +1100)]
dev/core#1371 Fix e-notice caused by trying to pass in known info to the extension downloader when checking requirements
Tim Otten [Thu, 7 Nov 2019 01:39:32 +0000 (17:39 -0800)]
Set version to 5.19.0
Tim Otten [Thu, 7 Nov 2019 01:32:18 +0000 (17:32 -0800)]
Merge pull request #15752 from agh1/5.19.0-releasenotes-final
5.19.0 release notes: added late changes
Tim Otten [Thu, 7 Nov 2019 01:31:27 +0000 (17:31 -0800)]
Update 5.19.0.md
Andrew Hunt [Thu, 7 Nov 2019 01:16:33 +0000 (20:16 -0500)]
5.19.0 release notes: added late changes
Seamus Lee [Wed, 6 Nov 2019 19:18:37 +0000 (06:18 +1100)]
Merge pull request #15741 from totten/5.19-volinst
(dev/core#1093) Fix regression during extension activation
Tim Otten [Wed, 6 Nov 2019 07:50:16 +0000 (23:50 -0800)]
(dev/core#1093) Fix permission error when activating extension
Overview
--------
This fixes a recent/unreleased regression from #15726 in which the D7 demo build fails.
Before
------
When running `civibuild reinstall ...` on a `drupal-demo` site, it fails at this step:
```
+++ drush -y cvapi extension.install key=org.civicrm.volunteer debug=1
Authorization failed [error]
Array
(
[error_code] => unauthorized
[entity] => Extension
[action] => install
[trace] => #0 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(166): Civi\API\Kernel->authorize(Object(Civi\Api4\Provider\ActionObjectProvider), Object(Civi\Api4\Generic\DAOSaveAction))
1 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php(235): Civi\API\Kernel->runRequest(Object(Civi\Api4\Generic\DAOSaveAction))
2 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(374): Civi\Api4\Generic\AbstractAction->execute()
3 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(82): CRM_Utils_Migrate_Import->customFields(Object(SimpleXMLElement), Array)
4 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(836): CRM_Utils_Migrate_Import->runXmlElement(Object(SimpleXMLElement))
5 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(48): CRM_Volunteer_Upgrader->executeCustomDataTemplateFile('volunteer-custo...')
6 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader/Base.php(306): CRM_Volunteer_Upgrader->install()
7 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.civix.php(131): CRM_Volunteer_Upgrader_Base->onInstall()
8 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.php(204): _volunteer_civix_civicrm_install()
9 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(76): volunteer_civicrm_install()
10 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(48): CRM_Extension_Manager_Module->callHook(Object(CRM_Extension_Info), 'install')
11 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager.php(264): CRM_Extension_Manager_Module->onPreInstall(Object(CRM_Extension_Info))
12 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/v3/Extension.php(58): CRM_Extension_Manager->install(Array)
13 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Provider/MagicFunctionProvider.php(101): civicrm_api3_extension_install(Array)
14 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(168): Civi\API\Provider\MagicFunctionProvider->invoke(Array)
15 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(99): Civi\API\Kernel->runRequest(Array)
16 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/api.php(23): Civi\API\Kernel->runSafe('extension', 'install', Array, NULL)
17 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/drupal/drush/civicrm.drush.inc(1557): civicrm_api('extension', 'install', Array)
18 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(422): drush_civicrm_api('extension.insta...', 'key=org.civicrm...', 'debug=1')
19 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(231): _drush_invoke_hooks(Array, Array)
20 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(199): drush_command('extension.insta...', 'key=org.civicrm...', 'debug=1')
21 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/lib/Drush/Boot/BaseBoot.php(67): drush_dispatch(Array)
22 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/preflight.inc(66): Drush\Boot\BaseBoot->bootstrap_and_dispatch()
23 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(465): drush_main()
24 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(369): drush_run_main(false, '/', 'Phar detected. ...')
25 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/drush(114): drush_startup(Array)
26 /Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar(10): require('phar:///Users/t...')
27 {main}
[is_error] => 1
[error_message] => Authorization failed
)
```
After
-----
It works again.
Eileen McNaughton [Mon, 4 Nov 2019 21:00:06 +0000 (10:00 +1300)]
Merge pull request #15726 from MiyaNoctem/dev-core-1093-fix-installation-of-custom-fields-with-option-values
dev/core#1093: Fix Installation of Custom Fields with Option Values From XML
Seamus Lee [Mon, 4 Nov 2019 19:32:35 +0000 (06:32 +1100)]
Merge pull request #15724 from MiyaNoctem/dev-core-1360-fix-programatic-installation-of-extensions-v519
dev/core#1360: Fix Programatic Installation Of Multiple Extensions on v5.19
Camilo Rodriguez [Mon, 4 Nov 2019 16:40:36 +0000 (16:40 +0000)]
dev/core#1093: Fix Installation of Custom Fields with Option Values From XML
Camilo Rodriguez [Fri, 1 Nov 2019 15:03:39 +0000 (15:03 +0000)]
dev/core#1360: Fix Programatic Installation Of Multiple Extensions
Seamus Lee [Fri, 1 Nov 2019 05:42:46 +0000 (16:42 +1100)]
Merge pull request #15690 from seamuslee001/nfc_authorize_test_fix
[NFC] Fix AuthorizeNet Test failure due to credit card being expired
Seamus Lee [Fri, 1 Nov 2019 04:50:46 +0000 (15:50 +1100)]
[NFC] Fix AuthorizeNet Test failure due to credit card being expired
Eileen McNaughton [Tue, 29 Oct 2019 23:35:51 +0000 (12:35 +1300)]
Merge pull request #15657 from demeritcowboy/pledge-search-backport
dev/core#1348 - pledge search not working backport of 15656
Seamus Lee [Tue, 29 Oct 2019 22:08:27 +0000 (09:08 +1100)]
Merge pull request #15655 from demeritcowboy/activity-search-form-values
dev/core#1348 - backport of PR 15654
DemeritCowboy [Tue, 29 Oct 2019 21:44:00 +0000 (17:44 -0400)]
pledge search not working
DemeritCowboy [Tue, 29 Oct 2019 21:08:31 +0000 (17:08 -0400)]
activity search not working at all
Eileen McNaughton [Mon, 28 Oct 2019 19:32:36 +0000 (08:32 +1300)]
Merge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc
dev/core#1093: Bckport Fix to v.5.19 to Add Custom Fields to Logging Tables
Camilo Rodríguez [Thu, 24 Oct 2019 18:34:54 +0000 (13:34 -0500)]
dev/core#1093: Add Custom Fields to Logging Tables
BulkSave method was adding fields to custom group table, but not to custom
group logging table. If these tables were updated on installation, before all
the schema is synced bewtween main and logging tables, fatal errors would be
thrown, as triggers tried to insert info into log tables missing required
fields.
Fixed by building log table after all fields are added to main table, and
before rebuilding triggers.
Seamus Lee [Thu, 24 Oct 2019 19:35:46 +0000 (06:35 +1100)]
Merge pull request #15598 from alifrumin/rn5.19
5.19 Release Notes - first pass of sorting, annotating and editing
Alice Frumin [Fri, 18 Oct 2019 00:14:02 +0000 (20:14 -0400)]
5.19 Release Notes - first pass
Tim Otten [Wed, 23 Oct 2019 00:08:02 +0000 (17:08 -0700)]
Merge pull request #15583 from seamuslee001/5.19
5.18.4 Release notes
Tim Otten [Tue, 22 Oct 2019 23:53:11 +0000 (16:53 -0700)]
Update 5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:48:52 +0000 (16:48 -0700)]
5.18.4.md
There was some ambiguity between original problem-report and PR-description.
Update per MM.
Tim Otten [Tue, 22 Oct 2019 23:38:47 +0000 (16:38 -0700)]
release-notes/5.18.4.md
Seamus Lee [Mon, 21 Oct 2019 23:52:51 +0000 (10:52 +1100)]
Merge pull request #15569 from eileenmcnaughton/pay_notice
Enotice fix (unreleased enotice)
Seamus Lee [Mon, 21 Oct 2019 23:47:54 +0000 (10:47 +1100)]
Merge pull request #15537 from eileenmcnaughton/pay_check
Fix a regression whereby payment details are not saved from the AdditionalPayment form
eileen [Mon, 21 Oct 2019 21:56:59 +0000 (10:56 +1300)]
Enotice fix
per https://github.com/civicrm/civicrm-core/pull/15545#issuecomment-
544531438
eileen [Fri, 18 Oct 2019 04:20:40 +0000 (17:20 +1300)]
Support payment related fields on Payment.Create
On some digging I found that various payment related fields like pan_truncation & card_type_id were
being quietly ignored rather than saved by Payment.create
The additional payment form now uses this api so it is a regression on that form.
This fixes the metadata, tests & support for payment-related trxn fields
Seamus Lee [Mon, 21 Oct 2019 06:59:09 +0000 (17:59 +1100)]
Merge pull request #15561 from eileenmcnaughton/payment_amount
dev/core#1333 Fix incorrect balance amount on fully paid payment
Eileen McNaughton [Mon, 21 Oct 2019 03:35:59 +0000 (16:35 +1300)]
Merge pull request #15558 from eileenmcnaughton/report_page519
(dev/core#1252) Fix paging on contact summary
eileen [Mon, 21 Oct 2019 00:46:55 +0000 (13:46 +1300)]
dev/core#1333 Fix incorrect balance amount on fully paid payment
Per https://lab.civicrm.org/dev/core/issues/1333 this is resulting in an incorrect balance.
The code was previously marked as highly dubious
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary
Matthew Wire [Sun, 20 Oct 2019 18:04:44 +0000 (19:04 +0100)]
Merge pull request #15539 from eileenmcnaughton/pay_back
Rename balanceTrxnParams to paymentTrxnParams [REF]
Eileen McNaughton [Sat, 19 Oct 2019 23:20:57 +0000 (12:20 +1300)]
Merge pull request #15545 from eileenmcnaughton/pay_email_p
dev/core#1322 Fix regression whereby Additional Payment Form not setting from when sending email confirmations
eileen [Fri, 18 Oct 2019 22:27:23 +0000 (11:27 +1300)]
Ensure a default FROM address is used when sending email confirmations
Eileen McNaughton [Fri, 18 Oct 2019 21:08:29 +0000 (10:08 +1300)]
Merge pull request #15538 from eileenmcnaughton/ppal_std
Regression fix on Paypal Std with memberships not being finalised correctly.
eileen [Fri, 18 Oct 2019 03:53:13 +0000 (16:53 +1300)]
Rename balanceTrxnParams to paymentTrxnParams [REF]
This array needs some fixes but I wanted to rename the parameter first as balanceTrxnParams is misleading.
The parameters are for the financial_trxn entry corresponding to the payment
eileen [Fri, 18 Oct 2019 06:46:47 +0000 (19:46 +1300)]
Regression fix on Paypal Std with memberships not being finalised correctly.
Per https://github.com/civicrm/civicrm-core/pull/15053#issuecomment-
542770130
Seamus Lee [Thu, 17 Oct 2019 04:43:21 +0000 (06:43 +0200)]
Merge pull request #15527 from eileenmcnaughton/merge
Fix default mode on Contact.merge api
Eileen McNaughton [Thu, 17 Oct 2019 03:58:07 +0000 (16:58 +1300)]
Merge pull request #15521 from agh1/5.19.0-releasenotes-initial
5.19.0 release notes initial run
Eileen McNaughton [Thu, 17 Oct 2019 03:57:59 +0000 (16:57 +1300)]
Merge branch '5.19' into 5.19.0-releasenotes-initial
eileen [Wed, 16 Oct 2019 23:09:36 +0000 (12:09 +1300)]
Fix default mode on Contact.merge api
I believe this was a change I made in error & only the Contact.get_merge_conflicts api should
receive an array for 'mode'. The mode is part of a loop within that api