civicrm-core.git
5 years agoMerge pull request #14572 from seamuslee001/dev_core_1052
Eileen McNaughton [Fri, 21 Jun 2019 12:09:31 +0000 (08:09 -0400)]
Merge pull request #14572 from seamuslee001/dev_core_1052

Fix dev/core#1052 Activities causing a fatal error if target_contact is not accessable to logged in user

5 years agodev/core#1052 fix fatal error when first target contact is not visible to the logged...
Seamus Lee [Tue, 18 Jun 2019 02:14:58 +0000 (12:14 +1000)]
dev/core#1052 fix fatal error when first target contact is not visible to the logged in user and update test appropriately

5 years agoAdd in unit test demonstrating the fatal error generated
Seamus Lee [Tue, 18 Jun 2019 01:52:34 +0000 (11:52 +1000)]
Add in unit test demonstrating the fatal error generated

5 years agoMerge pull request #14575 from seamuslee001/5_14_1_release_notes
Eileen McNaughton [Tue, 18 Jun 2019 21:33:45 +0000 (17:33 -0400)]
Merge pull request #14575 from seamuslee001/5_14_1_release_notes

Add release-notes for 5.14.1

5 years agoAdd release-notes/5.14.1.md
Tim Otten [Tue, 18 Jun 2019 03:55:00 +0000 (20:55 -0700)]
Add release-notes/5.14.1.md

5 years agoMerge pull request #14573 from seamuslee001/5.15
Seamus Lee [Tue, 18 Jun 2019 06:45:47 +0000 (16:45 +1000)]
Merge pull request #14573 from seamuslee001/5.15

Update http_timeout setting version to match the fact it is being bac…

5 years agoUpdate http_timeout setting version to match the fact it is being backported to 5.14
Seamus Lee [Tue, 18 Jun 2019 03:53:58 +0000 (13:53 +1000)]
Update http_timeout setting version to match the fact it is being backported to 5.14

5 years agoMerge pull request #14565 from vingle/patch-6
Eileen McNaughton [Mon, 17 Jun 2019 14:30:52 +0000 (10:30 -0400)]
Merge pull request #14565 from vingle/patch-6

Resolve a conflict with Wordpress CSS

5 years agoResolve a conflict with Wordpress CSS
Nicol [Mon, 17 Jun 2019 12:20:57 +0000 (13:20 +0100)]
Resolve a conflict with Wordpress CSS

Issue was affecting menu item wrap/overflow, described here: https://github.com/veda-consulting/uk.co.vedaconsulting.gdpr/issues/192.

5 years agoMerge pull request #14545 from demeritcowboy/temp-remove-submit-once
Eileen McNaughton [Sun, 16 Jun 2019 13:53:57 +0000 (09:53 -0400)]
Merge pull request #14545 from demeritcowboy/temp-remove-submit-once

Temporarily remove activity submit once pending PR 14519

5 years agoMerge pull request #14525 from seamuslee001/feature_timeout_setting
Seamus Lee [Sat, 15 Jun 2019 01:44:25 +0000 (11:44 +1000)]
Merge pull request #14525 from seamuslee001/feature_timeout_setting

dev/core#1035 Add in new setting http_timeout to set how long in seco…

5 years agodev/core#1035 Add in new setting http_timeout to set how long in seconds should HTTP...
Seamus Lee [Fri, 14 Jun 2019 02:31:14 +0000 (12:31 +1000)]
dev/core#1035 Add in new setting http_timeout to set how long in seconds should HTTP requests last for to fix dev/core#1035

Handle situations where a 0 timeout is passed in

Remove from form

Update variable name as per EIleen

5 years agoMerge pull request #14544 from totten/5.15-JPG
Seamus Lee [Fri, 14 Jun 2019 22:32:23 +0000 (08:32 +1000)]
Merge pull request #14544 from totten/5.15-JPG

(dev/core#1044) Extension/MIME matching should be case insensitive

5 years agotemporarily remove activity submit once pending PR 14519
DemeritCowboy [Fri, 14 Jun 2019 21:10:17 +0000 (17:10 -0400)]
temporarily remove activity submit once pending PR 14519

5 years ago(dev/core#1044) Extension/MIME matching should be case insensitive
Tim Otten [Fri, 14 Jun 2019 20:57:55 +0000 (16:57 -0400)]
(dev/core#1044) Extension/MIME matching should be case insensitive

Overview
--------

For CIVI-SA-2019-15, the delivery of file attachments was tightened to
ensure that the file-extension and mime-type were in agreement.  However,
the check yields a false-negative in the common case where the filename has
been capitalized.  It should treat `foo.jpg`, `foo.JPG`, and `FOO.JPG` as
equally valid.

Before
------

* When viewing a contact profile image ending with `.JPG`, there is an error
  message, `Supplied mime-type does not match file extension`.

After
-----

* When viewing a contact profile image ending with `.JPG`, the image is
  delivered.

Comments
--------

See also:

* https://civicrm.org/advisory/civi-sa-2019-15-xss-via-forged-mime-type
* https://lab.civicrm.org/dev/core/issues/1044

5 years agoMerge pull request #14539 from totten/5.15-tap-yaml
Eileen McNaughton [Fri, 14 Jun 2019 20:07:53 +0000 (16:07 -0400)]
Merge pull request #14539 from totten/5.15-tap-yaml

Civi/Test/TAP - Replace Symfony YAML dependency

5 years agoCivi/Test/TAP - Replace Symfony YAML dependency
Tim Otten [Fri, 14 Jun 2019 18:23:37 +0000 (14:23 -0400)]
Civi/Test/TAP - Replace Symfony YAML dependency

This allows two paths:

1. If you have the YAML PECL extension, then that will be used.
   To get the best output, you can install it.
2. If you don't, then it'll output JSON. JSON is considered valid YAML.
   It's not clear that everyone reading the document will handle
   the full range YAML (incl JSON), but... we don't actually have any
   listeners that care to parse the TAP output...

5 years agotools/scripts/phpunit - Flip back to preferring 'php' for subprocess
Tim Otten [Fri, 14 Jun 2019 18:21:47 +0000 (14:21 -0400)]
tools/scripts/phpunit - Flip back to preferring 'php' for subprocess

Rationale:

* On the test servers, `php` is wrapper script.
* Outside the test servers, you should be able to use `phpunit` directly
  (rather than calling `tools/scripts/phpunit`), and then it's
  not our problem.

5 years agoMerge pull request #14511 from eileenmcnaughton/jungle
Eileen McNaughton [Fri, 14 Jun 2019 17:16:50 +0000 (13:16 -0400)]
Merge pull request #14511 from eileenmcnaughton/jungle

Add Unit test for testing smart group flow

5 years agoAdd Unit test for testing smart group flow
eileen [Thu, 13 Jun 2019 17:01:40 +0000 (13:01 -0400)]
Add Unit test for testing smart group flow

5 years agoMerge pull request #14527 from totten/5.15-yaml-dg
Seamus Lee [Fri, 14 Jun 2019 03:55:23 +0000 (13:55 +1000)]
Merge pull request #14527 from totten/5.15-yaml-dg

(REF) Convert YAML fixtures to JSON. Reset symfony/yaml dependency.

5 years ago(REF) Convert YAML fixtures to JSON fixtures. Reset symfony/yaml dependency.
Tim Otten [Fri, 14 Jun 2019 02:48:01 +0000 (22:48 -0400)]
(REF) Convert YAML fixtures to JSON fixtures. Reset symfony/yaml dependency.

Overview
--------

The test suite includes some tests that read fixture data files (i.e. YAML files). This patch
provides a safer way to address a dependency-management issue with parsing YAML files.

Before
------

* In the last public release (`5.14`), the `symfony/yaml` package was not included with `civicrm-core`.
  However, it was loaded during testing by virtue of running `phpunit6`.
* In the `5.15` RC code, `symfony/yaml` was added -- so that the test suite worked in `phpunit6`.
  However, this also added `symfony/yaml` to the general runtime distribution - which is liable to create conflicts
  with Civi extensions and CMS modules that also bundle `symfony/yaml`. (It's a popular package.)

After
-----

* The test suite no longer uses YAML, and the build no longer requires `symfony/yaml`. Instead, it uses JSON.

5 years agoMerge pull request #14516 from eileenmcnaughton/except
Tim Otten [Thu, 13 Jun 2019 20:32:19 +0000 (16:32 -0400)]
Merge pull request #14516 from eileenmcnaughton/except

[test] Add PrematureExitException to support unit testing where the code would otherwise exit

5 years agoAdd PrematureExitException to support unit testing where the code would otherwise...
eileen [Thu, 13 Jun 2019 18:53:17 +0000 (14:53 -0400)]
Add PrematureExitException to support unit testing where the code would otherwise exit

5 years agoMerge pull request #14468 from seamuslee001/e2e_asset_builder_test_wordpress
Seamus Lee [Sat, 8 Jun 2019 10:06:26 +0000 (20:06 +1000)]
Merge pull request #14468 from seamuslee001/e2e_asset_builder_test_wordpress

Add CRM_Utils_System::sendResponse(). Fix AssetBuilder's status-code on WP.

5 years agoIncorporate Tim's Cleanup
Seamus Lee [Sat, 8 Jun 2019 08:57:11 +0000 (18:57 +1000)]
Incorporate Tim's Cleanup

5 years agoMerge pull request #14482 from seamuslee001/update_exception_dao
Seamus Lee [Sat, 8 Jun 2019 08:55:23 +0000 (18:55 +1000)]
Merge pull request #14482 from seamuslee001/update_exception_dao

[NFC] Update Exception DAO class

5 years agoUpdate Exception DAO class
Seamus Lee [Sat, 8 Jun 2019 07:40:27 +0000 (17:40 +1000)]
Update Exception DAO class

5 years agoSlimplify functions down as per Tim's review comments
Seamus Lee [Sat, 8 Jun 2019 03:07:16 +0000 (13:07 +1000)]
Slimplify functions down as per Tim's review comments

5 years agoUpdate to use PSR HTTP Message Response Interface as per @totten
Seamus Lee [Fri, 7 Jun 2019 00:06:28 +0000 (10:06 +1000)]
Update to use PSR HTTP Message Response Interface as per @totten

5 years agoMove content of returning response into CRM_Utils_System and have user_system based...
Seamus Lee [Thu, 6 Jun 2019 22:37:10 +0000 (08:37 +1000)]
Move content of returning response into CRM_Utils_System and have user_system based method to set HTTP Status code

5 years agoSet version to 5.15.beta1
CiviCRM [Fri, 7 Jun 2019 23:34:14 +0000 (23:34 +0000)]
Set version to 5.15.beta1

5 years agoMerge pull request #14472 from eileenmcnaughton/from_to_test
colemanw [Fri, 7 Jun 2019 13:03:13 +0000 (09:03 -0400)]
Merge pull request #14472 from eileenmcnaughton/from_to_test

[nfc] [test] Skip testGetFromTo on date transition

5 years agoMerge pull request #14470 from eileenmcnaughton/alike
colemanw [Fri, 7 Jun 2019 13:02:34 +0000 (09:02 -0400)]
Merge pull request #14470 from eileenmcnaughton/alike

[NFC][test-fix] centralise use of assertLike for comparing sql

5 years agoMerge pull request #14448 from eileenmcnaughton/exception2
Eileen McNaughton [Fri, 7 Jun 2019 09:24:36 +0000 (21:24 +1200)]
Merge pull request #14448 from eileenmcnaughton/exception2

Fix Exception api to save lower id number as contact 1

5 years agoMerge pull request #14473 from eileenmcnaughton/custom_filter
Seamus Lee [Fri, 7 Jun 2019 08:49:18 +0000 (18:49 +1000)]
Merge pull request #14473 from eileenmcnaughton/custom_filter

dev/core#1025 fix unreleased regression on contact.get with custom fields

5 years agoFix Exception api to save lower id number as contact 1
eileen [Thu, 6 Jun 2019 05:16:28 +0000 (17:16 +1200)]
Fix Exception api to save lower id number as contact 1

This is already actioned (& tested) via ajax fn markNonDuplicates - this moves the functionality from
the ajax layer to the BAO layer & stdises it under unit tests

5 years agoMerge pull request #14447 from eileenmcnaughton/exception
Seamus Lee [Fri, 7 Jun 2019 08:14:34 +0000 (18:14 +1000)]
Merge pull request #14447 from eileenmcnaughton/exception

Fix Exception to remove result from duplicates

5 years agoMerge pull request #14475 from eileenmcnaughton/contact_def
Monish Deb [Fri, 7 Jun 2019 06:41:00 +0000 (12:11 +0530)]
Merge pull request #14475 from eileenmcnaughton/contact_def

Permit sort_name as a url parameter on advanced search

5 years agoConvert sort_name to use search form methodology to pass by url
eileen [Fri, 7 Jun 2019 03:01:16 +0000 (15:01 +1200)]
Convert sort_name to use search form methodology to pass by url

5 years agoMerge pull request #14476 from eileenmcnaughton/basic_search
Eileen McNaughton [Fri, 7 Jun 2019 04:34:06 +0000 (16:34 +1200)]
Merge pull request #14476 from eileenmcnaughton/basic_search

[REF] Move retrieval of basicSearchFields to 'get' fn

5 years agoMove retrieval of basicSearchFields to 'get' fn
eileen [Fri, 7 Jun 2019 02:41:43 +0000 (14:41 +1200)]
Move retrieval of basicSearchFields to 'get' fn

This is a partial of https://github.com/civicrm/civicrm-core/pull/14418

5 years agodev/core#1025 fix unreleased regression on contact.get with custom fields
eileen [Fri, 7 Jun 2019 00:51:25 +0000 (12:51 +1200)]
dev/core#1025 fix unreleased regression on contact.get with custom fields

Fixes a bug where contact.get does not retrieve results if a custom field is requested and an activity custom field exists

This bug came about because a recent fix made metadata more consistent but it turns out this class was filtering the
metadata by the passed in  - and then iterating through the metadata. Now it iterates the ids instead.

5 years agoMerge pull request #14469 from eileenmcnaughton/pledge_msg
Eileen McNaughton [Fri, 7 Jun 2019 00:40:17 +0000 (12:40 +1200)]
Merge pull request #14469 from eileenmcnaughton/pledge_msg

Fix version for pledge message update, also remove 'please print'

5 years agoSkip testGetFromTo on date transition
eileen [Fri, 7 Jun 2019 00:37:24 +0000 (12:37 +1200)]
Skip testGetFromTo on date transition

This avoids fails when the expectations were calculated right at the end of a day but then are compared with the new day's values.

Results in this case look like

CRM_Report_FormTest::testGetFromTo with data set #1 ('20190606000000', '20190606235959', 'this.day', '', '')
fail on data set [ this.day ,  ,  ]. Local php time is 2019-06-07 00:00:13 and mysql time is 2019-06-07 00:00:13
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
 Array (
-    0 => '20190606000000'
-    1 => '20190606235959'
+    0 => '20190607000000'
+    1 => '20190607235959'

5 years ago[NFC][test-fix] centralise use of assertLike for comparing sql
eileen [Thu, 6 Jun 2019 23:36:07 +0000 (11:36 +1200)]
[NFC][test-fix] centralise use of assertLike for comparing sql

This function makes the tests cope with minor changes to whitespace in sql strings being compared

5 years agoMerge pull request #14461 from colemanw/displayPrefsStyle
Eileen McNaughton [Thu, 6 Jun 2019 23:26:57 +0000 (11:26 +1200)]
Merge pull request #14461 from colemanw/displayPrefsStyle

Use crm-checkbox-list styling in display prefs tpl

5 years agoMerge pull request #14450 from eileenmcnaughton/pay_rs
Mathieu Lu [Thu, 6 Jun 2019 23:24:48 +0000 (19:24 -0400)]
Merge pull request #14450 from eileenmcnaughton/pay_rs

Wrap titles in metadata in ts on payment.create api

5 years agoMerge pull request #14433 from eileenmcnaughton/mailin_settings
colemanw [Thu, 6 Jun 2019 23:17:17 +0000 (19:17 -0400)]
Merge pull request #14433 from eileenmcnaughton/mailin_settings

[Outbound mail admin form] fix some more notices resulting from recent change

5 years agoMerge pull request #14427 from eileenmcnaughton/search_upgrade
Seamus Lee [Thu, 6 Jun 2019 23:04:19 +0000 (09:04 +1000)]
Merge pull request #14427 from eileenmcnaughton/search_upgrade

Fix upgrade on participant_register date

5 years agoFix version for pledge message update, also remove 'please print'
eileen [Thu, 6 Jun 2019 22:46:44 +0000 (10:46 +1200)]
Fix version for pledge message update, also remove 'please print'

5 years agoMerge pull request #14467 from mlutfy/ts-fixes-5-16
Seamus Lee [Thu, 6 Jun 2019 22:46:14 +0000 (08:46 +1000)]
Merge pull request #14467 from mlutfy/ts-fixes-5-16

Misc translation 'ts' fixes

5 years agoMerge pull request #14465 from philmb/dev/core#1010
Eileen McNaughton [Thu, 6 Jun 2019 22:43:08 +0000 (10:43 +1200)]
Merge pull request #14465 from philmb/dev/core#1010

dev/core#1010 pledge_acknowledge template - capitalization and greeting

5 years agoMerge pull request #14442 from colemanw/drupal8jquery
Eileen McNaughton [Thu, 6 Jun 2019 22:11:36 +0000 (10:11 +1200)]
Merge pull request #14442 from colemanw/drupal8jquery

Conditionally use Drupal's jQuery only if available

5 years agoMerge pull request #14464 from mattwire/smartgroupeditcriteria
Eileen McNaughton [Thu, 6 Jun 2019 22:07:23 +0000 (10:07 +1200)]
Merge pull request #14464 from mattwire/smartgroupeditcriteria

Don't run search when editing smartgroup criteria

5 years agoMisc translation 'ts' fixes
Mathieu Lutfy [Thu, 6 Jun 2019 20:51:36 +0000 (16:51 -0400)]
Misc translation 'ts' fixes

5 years agodev/core#1010 pledge_acknowledge template - capitalization and greeting
PhilMB [Thu, 6 Jun 2019 17:51:11 +0000 (12:51 -0500)]
dev/core#1010 pledge_acknowledge template - capitalization and greeting

Pledge Acknowledgements have incorrect capitalization in greetings, and greetings do not use email_greeting.

5 years agoConditionally use Drupal's jQuery only if available
Coleman Watts [Thu, 6 Jun 2019 00:54:47 +0000 (20:54 -0400)]
Conditionally use Drupal's jQuery only if available

5 years agoDon't search before showing smartgroup criteria
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 15:11:29 +0000 (16:11 +0100)]
Don't search before showing smartgroup criteria

5 years agoWhitespace formatting in CRM/Group/Form/Edit.tpl
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 14:57:35 +0000 (15:57 +0100)]
Whitespace formatting in CRM/Group/Form/Edit.tpl

5 years agoMerge pull request #14463 from seamuslee001/5_14_master
Seamus Lee [Thu, 6 Jun 2019 13:57:08 +0000 (23:57 +1000)]
Merge pull request #14463 from seamuslee001/5_14_master

5.14

5 years agoMerge in 5.14
Seamus Lee [Thu, 6 Jun 2019 13:55:06 +0000 (23:55 +1000)]
Merge in 5.14

5 years agoUse crm-checkbox-list styling in display prefs tpl
Coleman Watts [Thu, 6 Jun 2019 13:19:24 +0000 (09:19 -0400)]
Use crm-checkbox-list styling in display prefs tpl

5 years agoMerge pull request #14394 from eileenmcnaughton/merge_get_conflicts
Eileen McNaughton [Thu, 6 Jun 2019 12:35:42 +0000 (00:35 +1200)]
Merge pull request #14394 from eileenmcnaughton/merge_get_conflicts

Add Contact.get_merge_conflicts api

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 11:45:07 +0000 (04:45 -0700)]
Update 5.14.0.md

5 years agoinstall/index.php - Fix misleading install text
Tim Otten [Thu, 6 Jun 2019 11:39:43 +0000 (04:39 -0700)]
install/index.php - Fix misleading install text

During GUI install, there's a health-check based on the PHP version.  Now
that PHP 7 is required, this message *always* talks about PHP 7.x. But
it's presented under a bucket labeled "PHP5".

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 11:12:11 +0000 (04:12 -0700)]
Update 5.14.0.md

5 years agoSet version to 5.14.0
CiviCRM [Thu, 6 Jun 2019 10:52:41 +0000 (10:52 +0000)]
Set version to 5.14.0

5 years agoMerge pull request #14451 from eileenmcnaughton/format
Eileen McNaughton [Thu, 6 Jun 2019 10:30:17 +0000 (22:30 +1200)]
Merge pull request #14451 from eileenmcnaughton/format

[NFC] array formatting in api_v3_paymentTest class

5 years agoMerge pull request #14458 from eileenmcnaughton/cachekey
Eileen McNaughton [Thu, 6 Jun 2019 10:29:44 +0000 (22:29 +1200)]
Merge pull request #14458 from eileenmcnaughton/cachekey

Test tweaks that *might* help with intermittant test weirdness

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 10:28:58 +0000 (03:28 -0700)]
Update 5.14.0.md

5 years agoMerge pull request #14201 from seamuslee001/5.14
Tim Otten [Thu, 6 Jun 2019 10:28:37 +0000 (03:28 -0700)]
Merge pull request #14201 from seamuslee001/5.14

Fix AssetBuilderTest when running on WordPress. Use Guzzle.

5 years agoMerge pull request #14449 from demeritcowboy/bulksms-enotice
Eileen McNaughton [Thu, 6 Jun 2019 10:25:36 +0000 (22:25 +1200)]
Merge pull request #14449 from demeritcowboy/bulksms-enotice

dev/core#1023 - E_NOTICE when creating bulk SMS

5 years agoMerge pull request #14457 from civicrm/5.14
Eileen McNaughton [Thu, 6 Jun 2019 10:11:14 +0000 (22:11 +1200)]
Merge pull request #14457 from civicrm/5.14

5.14

5 years agoAssetBuilderTest - Add more assertions for Guzzle variant of test
Tim Otten [Thu, 6 Jun 2019 09:34:50 +0000 (02:34 -0700)]
AssetBuilderTest - Add more assertions for Guzzle variant of test

5 years agoTest tweaks that *might* help with intermittant test weirdness
eileen [Thu, 6 Jun 2019 09:27:52 +0000 (21:27 +1200)]
Test tweaks that *might* help with intermittant test weirdness

It's technically possible for the 2 cache keys to be the same - which would break stuff - although it seems
a bit too frequent to be the reason...

Also we clear one cache in tear down & not the other.

I'm not optimistic either of these will solve the intermittant fails but they seem more correct changed

Also I added verbosity

5 years agoMerge pull request #14445 from demeritcowboy/deletedActivitiesSearchFilter
Yashodha Chaku [Thu, 6 Jun 2019 09:23:16 +0000 (14:53 +0530)]
Merge pull request #14445 from demeritcowboy/deletedActivitiesSearchFilter

dev/core#1022 - Manage Case deleted activities search filter no longer working

5 years agoFix Invalid asset builder test by using guzzle
Seamus Lee [Sun, 5 May 2019 01:43:12 +0000 (11:43 +1000)]
Fix Invalid asset builder test by using guzzle

5 years agoRevert "Fix Asset builder test by altering error_reporting level to match Drupal...
Tim Otten [Thu, 6 Jun 2019 09:15:55 +0000 (02:15 -0700)]
Revert "Fix Asset builder test by altering error_reporting level to match Drupal and changing regex to not care about HTTP version"

This reverts commit be441aa368ef7f1e5a8dd115c065caa172f95a6a.

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:38:24 +0000 (01:38 -0700)]
Update 5.14.0.md

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:36:06 +0000 (01:36 -0700)]
Update 5.14.0.md

5 years agoMerge pull request #14212 from seamuslee001/wordpress_e2e_assetbuilder_fix
Tim Otten [Thu, 6 Jun 2019 08:33:34 +0000 (01:33 -0700)]
Merge pull request #14212 from seamuslee001/wordpress_e2e_assetbuilder_fix

Fix AssetBuilderTest by altering error_reporting level to match Dru…

5 years agoMerge pull request #14439 from seamuslee001/5_14_0_release_notes_update
Eileen McNaughton [Thu, 6 Jun 2019 07:50:29 +0000 (19:50 +1200)]
Merge pull request #14439 from seamuslee001/5_14_0_release_notes_update

Update 5.14.0 release notes with latest changes

5 years agoMerge pull request #14455 from civicrm/5.14
Eileen McNaughton [Thu, 6 Jun 2019 07:45:04 +0000 (19:45 +1200)]
Merge pull request #14455 from civicrm/5.14

5.14 to master

5 years agoMerge pull request #14454 from eileenmcnaughton/php72
Eileen McNaughton [Thu, 6 Jun 2019 07:43:28 +0000 (19:43 +1200)]
Merge pull request #14454 from eileenmcnaughton/php72

(NFC) Remove without param tests

5 years agoMerge pull request #14453 from eileenmcnaughton/export_sc_514
Tim Otten [Thu, 6 Jun 2019 07:24:19 +0000 (00:24 -0700)]
Merge pull request #14453 from eileenmcnaughton/export_sc_514

dev/core#1015 fix regression on exporting soft credits

5 years agoRemove without param tests
eileen [Thu, 6 Jun 2019 06:40:56 +0000 (18:40 +1200)]
Remove without param tests

These really date back to when we were creating the api wrapper. I don't think
they add much value now - esp since php is not quiet if we break the wrapper
contract

5 years agodev/core#1015 fix regression on exporting soft credits
eileen [Thu, 6 Jun 2019 06:34:20 +0000 (18:34 +1200)]
dev/core#1015 fix regression on exporting soft credits

Cut down from https://github.com/civicrm/civicrm-core/pull/14440/commits due to test fails

5 years agoUpdate Release 5.14.0 release notes with latest changes
Seamus Lee [Wed, 5 Jun 2019 23:09:45 +0000 (09:09 +1000)]
Update Release 5.14.0 release notes with latest changes

Update release notes for PR #14440

Withdraw soft credits item

5 years agofix E_NOTICE
DemeritCowboy [Thu, 6 Jun 2019 05:10:51 +0000 (01:10 -0400)]
fix E_NOTICE

5 years ago[NFC] array formatting in api_v3_paymentTest class
eileen [Thu, 6 Jun 2019 05:44:24 +0000 (17:44 +1200)]
[NFC] array formatting in api_v3_paymentTest class

5 years agoWrap titles in metadata in ts on payment.create api
eileen [Thu, 6 Jun 2019 05:40:09 +0000 (17:40 +1200)]
Wrap titles in metadata in ts on payment.create api

5 years agoFix Exception to remove result from duplicates
eileen [Thu, 6 Jun 2019 04:32:09 +0000 (16:32 +1200)]
Fix Exception to remove result from duplicates

This updates, and tests, the Exception.create function (via the api) to remove duplicates from the
prevnext_cache. This feels like a better fix than the cartwheels the prevnext cache code does to avoid
retrieving cached duplicates.

5 years agoMerge pull request #14441 from colemanw/sortable
Eileen McNaughton [Thu, 6 Jun 2019 04:15:38 +0000 (16:15 +1200)]
Merge pull request #14441 from colemanw/sortable

dev/core#628 - Make Quicksearch options sortable

5 years agoMerge pull request #14411 from eileenmcnaughton/merge_get_duplicates
Eileen McNaughton [Thu, 6 Jun 2019 04:05:43 +0000 (16:05 +1200)]
Merge pull request #14411 from eileenmcnaughton/merge_get_duplicates

Add api for Dedupe.getduplicates

5 years agomake search filter work again
DemeritCowboy [Thu, 6 Jun 2019 02:59:32 +0000 (22:59 -0400)]
make search filter work again

5 years agoUpdate get_merge_conflicts api
eileen [Mon, 3 Jun 2019 03:42:33 +0000 (15:42 +1200)]
Update get_merge_conflicts api

Increase result nuance in response to review

5 years agodev/core#628 - Make Quicksearch options sortable
Coleman Watts [Wed, 5 Jun 2019 21:47:10 +0000 (17:47 -0400)]
dev/core#628 - Make Quicksearch options sortable

5 years agoMerge pull request #14438 from eileenmcnaughton/display
Seamus Lee [Thu, 6 Jun 2019 00:09:30 +0000 (10:09 +1000)]
Merge pull request #14438 from eileenmcnaughton/display

(dev/core#1000) Fixes contact's displayname not appearing in membership edit, if no registered email is found

5 years agoMerge pull request #14363 from mfb/error-msg
Seamus Lee [Thu, 6 Jun 2019 00:08:23 +0000 (10:08 +1000)]
Merge pull request #14363 from mfb/error-msg

Avoid logging error message if status check query fails.