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…
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…
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 [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
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 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.
Tim Otten [Thu, 6 Jun 2019 08:38:24 +0000 (01:38 -0700)]
Update 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:36:06 +0000 (01:36 -0700)]
Update 5.14.0.md
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…
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
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
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
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
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
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
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
DemeritCowboy [Thu, 6 Jun 2019 05:10:51 +0000 (01:10 -0400)]
fix E_NOTICE
eileen [Thu, 6 Jun 2019 05:44:24 +0000 (17:44 +1200)]
[NFC] array formatting in api_v3_paymentTest class
eileen [Thu, 6 Jun 2019 05:40:09 +0000 (17:40 +1200)]
Wrap titles in metadata in ts on payment.create api
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.
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
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
DemeritCowboy [Thu, 6 Jun 2019 02:59:32 +0000 (22:59 -0400)]
make search filter work again
eileen [Mon, 3 Jun 2019 03:42:33 +0000 (15:42 +1200)]
Update get_merge_conflicts api
Increase result nuance in response to review
Coleman Watts [Wed, 5 Jun 2019 21:47:10 +0000 (17:47 -0400)]
dev/core#628 - Make Quicksearch options sortable
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
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.
Seamus Lee [Wed, 5 Jun 2019 23:34:27 +0000 (09:34 +1000)]
Merge pull request #14407 from eileenmcnaughton/514
Fix checksum failure on editing recurring contributions
Seamus Lee [Wed, 5 Jun 2019 23:11:04 +0000 (09:11 +1000)]
Merge pull request #14435 from eileenmcnaughton/5.14
Revert "Create contribution before taking payment, per contribution page workflow"
eileen [Sun, 2 Jun 2019 23:11:49 +0000 (11:11 +1200)]
Fix checksum failure on editing recurring contributions
Vangelis Pantazis [Wed, 29 May 2019 10:54:38 +0000 (11:54 +0100)]
Fixes contact's displayname not appearing in membership edit, if no registered email is found
Add a unit test to lock in fix to dev/core#1000
Andrew Hunt [Wed, 5 Jun 2019 22:42:23 +0000 (18:42 -0400)]
5.14.0 release notes (#14245)
* 5.14.0 release notes: raw from script
* 5.14.0 release notes: add boilerplate
* sorting misc and deleting 5.13 commits
* fixing up contributors
* fixing up gitlab issues titles
* annotating
* rearranging sections
* editing and clean up
* 5.14.0 release notes: edits
* 5.14.0 release notes: incorporated late changes
Tim Otten [Wed, 5 Jun 2019 22:27:09 +0000 (15:27 -0700)]
Merge pull request #14437 from agh1/no-php-56
Minimum supported PHP version is 7.0
Eileen McNaughton [Wed, 5 Jun 2019 22:02:00 +0000 (10:02 +1200)]
Merge pull request #14426 from eileenmcnaughton/cont_notice
dev/core#1014 fix e-notice regression
eileen [Mon, 3 Jun 2019 04:21:46 +0000 (16:21 +1200)]
Add api for Dedupe.getduplicates
Andrew Hunt [Wed, 5 Jun 2019 16:33:24 +0000 (12:33 -0400)]
Minimum supported PHP version is 7.0
Coleman Watts [Wed, 5 Jun 2019 15:38:47 +0000 (11:38 -0400)]
Improve handling of 1st option on search prefs
Monish Deb [Wed, 5 Jun 2019 15:23:32 +0000 (20:53 +0530)]
Merge pull request #14247 from pradpnayak/ActvityTags
Change Activity tag to use select2
eileen [Wed, 5 Jun 2019 13:18:23 +0000 (01:18 +1200)]
Revert "Create contribution before taking payment, per contribution page workflow"
This reverts commit
9257f129
Eileen McNaughton [Wed, 5 Jun 2019 12:24:55 +0000 (00:24 +1200)]
Merge pull request #14434 from eileenmcnaughton/activity_form
[REF] Activity form - very minor tidy up
eileen [Wed, 5 Jun 2019 04:21:10 +0000 (16:21 +1200)]
Remove fatal errors in favour of status bounces
eileen [Wed, 5 Jun 2019 04:19:29 +0000 (16:19 +1200)]
[REF] very small code cleanup
activityTName is only ever set in the proceeding IF clause so moving this chunk of code into that
clause makes that a little more readable
eileen [Wed, 5 Jun 2019 04:10:21 +0000 (16:10 +1200)]
[Outbound mail admin form] fix some more notices resulting from recent change
Eileen McNaughton [Wed, 5 Jun 2019 03:24:53 +0000 (15:24 +1200)]
Merge pull request #14432 from civicrm/5.14
5.14 to master
Eileen McNaughton [Wed, 5 Jun 2019 03:24:27 +0000 (15:24 +1200)]
Merge pull request #14430 from agileware/5.14--CIVICRM-1228
dev/core#1017: Always bootstrap CRM_Utils_System against 5.14