Seamus Lee [Wed, 12 Jun 2019 21:33:23 +0000 (07:33 +1000)]
Merge pull request #14496 from mattwire/extract_overridedefaultcurrency
REF Extract override default currency function
Matthew Wire [Wed, 12 Jun 2019 19:02:00 +0000 (20:02 +0100)]
Merge pull request #14444 from eileenmcnaughton/export_up
[REF] Minor code cleanup on string concatenation
Matthew Wire [Wed, 12 Jun 2019 18:59:39 +0000 (19:59 +0100)]
Merge pull request #14436 from eileenmcnaughton/pay
Fix proportional test to test Payment.create & for the test to make more sense
Matthew Wire (MJW Consulting) [Tue, 11 Jun 2019 17:39:26 +0000 (18:39 +0100)]
Extract override default currency function
Eileen McNaughton [Wed, 12 Jun 2019 18:47:56 +0000 (14:47 -0400)]
Merge pull request #14498 from mattwire/extract_paypalexpress_preprocess
REF: Extract preProcess paypalexpress
Eileen McNaughton [Wed, 12 Jun 2019 18:31:35 +0000 (14:31 -0400)]
Merge pull request #14497 from mattwire/commentsandformat
NFC Comments and formatting only
Monish Deb [Wed, 12 Jun 2019 18:08:58 +0000 (23:38 +0530)]
Merge pull request #14474 from colemanw/placeholderUrl
dev/drupal#21 Remove asterisks from placeholder url
Matthew Wire (MJW Consulting) [Tue, 11 Jun 2019 17:43:48 +0000 (18:43 +0100)]
Extract preProcess paypalexpress
Matthew Wire (MJW Consulting) [Tue, 11 Jun 2019 17:41:17 +0000 (18:41 +0100)]
Comments and formatting only
Eileen McNaughton [Wed, 12 Jun 2019 16:32:21 +0000 (12:32 -0400)]
Merge pull request #14494 from colemanw/customPc
Add a couple customField pseudoconstants
Coleman Watts [Fri, 7 Jun 2019 00:59:34 +0000 (20:59 -0400)]
Remove asterisks from placeholder url
These symbols get escaped by some CMSs which messes up CRM.url
colemanw [Wed, 12 Jun 2019 15:19:46 +0000 (11:19 -0400)]
Merge pull request #13916 from alifrumin/caserelstocore
dev/core#530 Make a_b relationships available as case roles
Coleman Watts [Wed, 12 Jun 2019 03:16:45 +0000 (23:16 -0400)]
Add a couple customField pseudoconstants
Matthew Wire [Wed, 12 Jun 2019 14:14:46 +0000 (15:14 +0100)]
Merge pull request #14452 from eileenmcnaughton/payment_activity
Create payment activity when creating a payment via the api, test
Monish Deb [Wed, 12 Jun 2019 13:47:17 +0000 (19:17 +0530)]
Merge pull request #14478 from eileenmcnaughton/contact_search
[REF] Move sort_name definition to searchFieldMetadata
Eileen McNaughton [Wed, 12 Jun 2019 11:43:01 +0000 (07:43 -0400)]
Merge pull request #14493 from seamuslee001/more_free
Remove more free calls
Seamus Lee [Tue, 11 Jun 2019 21:01:50 +0000 (07:01 +1000)]
Remove more free calls
Eileen McNaughton [Wed, 12 Jun 2019 09:22:41 +0000 (05:22 -0400)]
Merge pull request #14485 from seamuslee001/domain_uniqueness_cache_key
Add in uniqueness to cache keys to mitigate clashes on multisite inst…
Yashodha Chaku [Wed, 12 Jun 2019 03:47:52 +0000 (09:17 +0530)]
Merge pull request #14431 from eileenmcnaughton/pledge_search
dev/core#561 Convert pledge search form to use metadata functions
Seamus Lee [Wed, 12 Jun 2019 03:14:38 +0000 (13:14 +1000)]
Merge pull request #14290 from MegaphoneJon/json-pp-logging
financial#55: support IPN logging on processors that send JSON data as POST
Eileen McNaughton [Tue, 11 Jun 2019 20:30:52 +0000 (16:30 -0400)]
Merge pull request #14489 from aydun/core_1026
Fix core#1026 where an email address synced from a CMS contact is created with no location field.
Eileen McNaughton [Tue, 11 Jun 2019 20:30:16 +0000 (16:30 -0400)]
Merge pull request #14491 from pradpnayak/ActivityPre
Object id is always NULL in ore hook in update activity mode
Coleman Watts [Tue, 11 Jun 2019 18:25:41 +0000 (14:25 -0400)]
Extend location_type_id test to api4
Pradeep Nayak [Mon, 10 Jun 2019 22:03:23 +0000 (23:03 +0100)]
Fixed Checkstyle Warnings
Eileen McNaughton [Mon, 10 Jun 2019 20:59:37 +0000 (16:59 -0400)]
Merge pull request #14488 from seamuslee001/test_dev_core_889
dev/core#889 Add test for changing fee selection to 0 and then record…
Aidan Saunders [Mon, 10 Jun 2019 12:42:13 +0000 (13:42 +0100)]
When syncing to UF record, use API instead of DAO to create email
- with the addition of a default location in this change, this fixes core#1026
Bonus code tidy: if UF email matches the contact primary email, avoid unnecessary update.
If update is needed, use API not direct SQL.
Aidan Saunders [Mon, 10 Jun 2019 12:38:53 +0000 (13:38 +0100)]
Set a default location in Email.create API call. Add test for this.
Default location used to create the email is the default LocationType
Pradeep Nayak [Mon, 10 Jun 2019 19:28:34 +0000 (20:28 +0100)]
Object id is always NULL in ore hook in update activity mode
Eileen McNaughton [Mon, 10 Jun 2019 15:31:40 +0000 (10:31 -0500)]
Merge pull request #14103 from jitendrapurohit/core-889
dev/core#889 - Refund throws a fatal error if the main contribution a…
Alice Frumin [Thu, 9 May 2019 16:33:56 +0000 (12:33 -0400)]
dev/core#530 CiviCase: when creating a new reltype assume client is A
Alice Frumin [Wed, 8 May 2019 14:42:20 +0000 (10:42 -0400)]
dev/core#530 CiviCase: using label instead of name to be consistent and commenting why
Alice Frumin [Mon, 6 May 2019 16:21:21 +0000 (12:21 -0400)]
dev/core#530 CiviCase: fixing tests to match new convention
Alice Frumin [Fri, 3 May 2019 16:50:05 +0000 (12:50 -0400)]
dev/core#530 CiviCase: save new case roles in correct direction for xml and ui
Alice Frumin [Fri, 3 May 2019 15:31:54 +0000 (11:31 -0400)]
dev/core#530 CiviCase: don't assume that clients or case role contacts are individuals
Alice Frumin [Wed, 1 May 2019 19:47:55 +0000 (15:47 -0400)]
dev/core#530 CiviCase: translate case role direction coming from xml
Alice Frumin [Tue, 9 Apr 2019 19:34:54 +0000 (15:34 -0400)]
dev/core#530 CiviCase: fix Manage Case print report duplicate case roles rows
Alice Frumin [Tue, 9 Apr 2019 18:56:18 +0000 (14:56 -0400)]
dev/core#530 CiviCase: fix count on the case dashboard
Alice Frumin [Thu, 31 Jan 2019 22:19:40 +0000 (17:19 -0500)]
dev/core#530 CiviCase: making roles available in either direction
Seamus Lee [Mon, 10 Jun 2019 06:14:31 +0000 (16:14 +1000)]
dev/core#889 Add test for changing fee selection to 0 and then recording refund
Seamus Lee [Sun, 9 Jun 2019 01:42:30 +0000 (11:42 +1000)]
Merge pull request #14425 from eileenmcnaughton/form_clean
[Form cleanup] remove form classes & tpls for Event Component settings & Multisite
Seamus Lee [Sun, 9 Jun 2019 00:45:12 +0000 (10:45 +1000)]
Add in uniqueness to cache keys to mitigate clashes on multisite installs
Seamus Lee [Sat, 8 Jun 2019 11:01:04 +0000 (21:01 +1000)]
Merge pull request #14483 from civicrm/5.15
5.15
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.
Seamus Lee [Sat, 8 Jun 2019 08:57:11 +0000 (18:57 +1000)]
Incorporate Tim's Cleanup
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
Seamus Lee [Sat, 8 Jun 2019 07:40:27 +0000 (17:40 +1000)]
Update Exception DAO class
Seamus Lee [Sat, 8 Jun 2019 03:07:16 +0000 (13:07 +1000)]
Slimplify functions down as per Tim's review comments
Seamus Lee [Fri, 7 Jun 2019 00:06:28 +0000 (10:06 +1000)]
Update to use PSR HTTP Message Response Interface as per @totten
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
CiviCRM [Fri, 7 Jun 2019 23:45:33 +0000 (23:45 +0000)]
Set version to 5.16.alpha1
CiviCRM [Fri, 7 Jun 2019 23:34:14 +0000 (23:34 +0000)]
Set version to 5.15.beta1
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
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
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
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
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
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
eileen [Fri, 7 Jun 2019 06:52:33 +0000 (18:52 +1200)]
Move sort_name definition to searchFieldMetadata
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
eileen [Fri, 7 Jun 2019 03:01:16 +0000 (15:01 +1200)]
Convert sort_name to use search form methodology to pass by url
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
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
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.
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'
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'
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
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
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
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
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
eileen [Thu, 6 Jun 2019 22:46:44 +0000 (10:46 +1200)]
Fix version for pledge message update, also remove 'please print'
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
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
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
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
Mathieu Lutfy [Thu, 6 Jun 2019 20:51:36 +0000 (16:51 -0400)]
Misc translation 'ts' fixes
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.
Coleman Watts [Thu, 6 Jun 2019 00:54:47 +0000 (20:54 -0400)]
Conditionally use Drupal's jQuery only if available
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 15:11:29 +0000 (16:11 +0100)]
Don't search before showing smartgroup criteria
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 14:57:35 +0000 (15:57 +0100)]
Whitespace formatting in CRM/Group/Form/Edit.tpl
Seamus Lee [Thu, 6 Jun 2019 13:57:08 +0000 (23:57 +1000)]
Merge pull request #14463 from seamuslee001/5_14_master
5.14
Seamus Lee [Thu, 6 Jun 2019 13:55:06 +0000 (23:55 +1000)]
Merge in 5.14
Coleman Watts [Thu, 6 Jun 2019 13:19:24 +0000 (09:19 -0400)]
Use crm-checkbox-list styling in display prefs tpl
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
Tim Otten [Thu, 6 Jun 2019 11:45:07 +0000 (04:45 -0700)]
Update 5.14.0.md
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".
Tim Otten [Thu, 6 Jun 2019 11:12:11 +0000 (04:12 -0700)]
Update 5.14.0.md
CiviCRM [Thu, 6 Jun 2019 10:52:41 +0000 (10:52 +0000)]
Set version to 5.14.0
eileen [Thu, 6 Jun 2019 05:55:21 +0000 (17:55 +1200)]
Create payment activity when creating a payment via the api, test
This is a pre-requisite for switching AdditionalPayment form to the api
https://github.com/civicrm/civicrm-core/pull/14408/files
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
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
Tim Otten [Thu, 6 Jun 2019 10:28:58 +0000 (03:28 -0700)]
Update 5.14.0.md
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.
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
Eileen McNaughton [Thu, 6 Jun 2019 10:11:14 +0000 (22:11 +1200)]
Merge pull request #14457 from civicrm/5.14
5.14
Tim Otten [Thu, 6 Jun 2019 09:34:50 +0000 (02:34 -0700)]
AssetBuilderTest - Add more assertions for Guzzle variant of test
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
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
Seamus Lee [Sun, 5 May 2019 01:43:12 +0000 (11:43 +1000)]
Fix Invalid asset builder test by using guzzle
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.