civicrm-core.git
2 years agoMerge pull request #22772 from eileenmcnaughton/batch
demeritcowboy [Fri, 25 Feb 2022 04:14:11 +0000 (23:14 -0500)]
Merge pull request #22772 from eileenmcnaughton/batch

Fix submit handling of thousands when creating data entry batch

2 years agoMerge pull request #22827 from colemanw/subType
Eileen McNaughton [Fri, 25 Feb 2022 03:06:08 +0000 (16:06 +1300)]
Merge pull request #22827 from colemanw/subType

APIv4 - Add fixme about filtering custom fields by sub-type

2 years agoMerge pull request #22637 from eileenmcnaughton/dom_flush
Eileen McNaughton [Fri, 25 Feb 2022 02:03:23 +0000 (15:03 +1300)]
Merge pull request #22637 from eileenmcnaughton/dom_flush

Flush the metadata cache when the domain is edited

2 years agoAPIv4 - Add fixme about filtering custom fields by sub-type
Coleman Watts [Fri, 25 Feb 2022 00:53:35 +0000 (19:53 -0500)]
APIv4 - Add fixme about filtering custom fields by sub-type

2 years agoMerge pull request #22752 from eileenmcnaughton/grumpit
colemanw [Fri, 25 Feb 2022 00:26:12 +0000 (19:26 -0500)]
Merge pull request #22752 from eileenmcnaughton/grumpit

Fixes for smarty grumpy mode with membership

2 years agoMerge pull request #22719 from eileenmcnaughton/notice_page
demeritcowboy [Fri, 25 Feb 2022 00:07:26 +0000 (19:07 -0500)]
Merge pull request #22719 from eileenmcnaughton/notice_page

Enotice fixes

2 years agoEnotice fix
Eileen McNaughton [Thu, 24 Feb 2022 23:17:38 +0000 (12:17 +1300)]
Enotice fix

2 years agoCall static function statically
Eileen McNaughton [Thu, 24 Feb 2022 23:17:21 +0000 (12:17 +1300)]
Call static function statically

Also objects are always references....

2 years agoFlush the metadata cache when the domain is edited
Eileen McNaughton [Thu, 27 Jan 2022 03:07:01 +0000 (16:07 +1300)]
Flush the metadata cache when the domain is edited

Domain info is cached in metadata cache for token usage - we should flush out when altering

2 years agoMerge pull request #22800 from mlutfy/mailingCleanup
demeritcowboy [Thu, 24 Feb 2022 14:11:15 +0000 (09:11 -0500)]
Merge pull request #22800 from mlutfy/mailingCleanup

Mailing Report: do not recalculate the recipients when the count is zero

2 years agoMerge pull request #22824 from colemanw/api4Provider
colemanw [Thu, 24 Feb 2022 02:13:25 +0000 (21:13 -0500)]
Merge pull request #22824 from colemanw/api4Provider

[REF] APIv4 - use entityTypes event to load custom records

2 years agoMerge pull request #22823 from demeritcowboy/mailing-since
Seamus Lee [Thu, 24 Feb 2022 01:55:08 +0000 (12:55 +1100)]
Merge pull request #22823 from demeritcowboy/mailing-since

Fix the "since" version for api v4 Mailing and MailingJob

2 years agoAPIv4 - use entityTypes event to load custom records
Coleman Watts [Thu, 24 Feb 2022 00:40:54 +0000 (19:40 -0500)]
APIv4 - use entityTypes event to load custom records

This standardizes things to use the ActionObjectProvider service more like it was intended,
with getEntityNames now returning what it's supposed to, and removing a direct-cache-access hack
from CoreUtil, in favor of using the service.

2 years agofix the since version
demeritcowboy [Thu, 24 Feb 2022 00:12:25 +0000 (19:12 -0500)]
fix the since version

2 years agoMerge pull request #22822 from civicrm/5.47
Seamus Lee [Thu, 24 Feb 2022 00:09:47 +0000 (11:09 +1100)]
Merge pull request #22822 from civicrm/5.47

5.47

2 years agoMerge pull request #22821 from demeritcowboy/update-token
Eileen McNaughton [Wed, 23 Feb 2022 21:34:38 +0000 (10:34 +1300)]
Merge pull request #22821 from demeritcowboy/update-token

Recent update to {receipt_text} token gives warning in system check after upgrade

2 years agoMerge pull request #22817 from totten/5.47-rest-q
Tim Otten [Wed, 23 Feb 2022 21:03:19 +0000 (13:03 -0800)]
Merge pull request #22817 from totten/5.47-rest-q

RestTest - Skip `testNotCMSUser_q` when it's not supported

2 years agoMerge pull request #22818 from JMAConsulting/add-checkperm
colemanw [Wed, 23 Feb 2022 16:59:19 +0000 (11:59 -0500)]
Merge pull request #22818 from JMAConsulting/add-checkperm

add checkPerm

2 years agoMerge pull request #22819 from demeritcowboy/unused-v2
colemanw [Wed, 23 Feb 2022 16:57:40 +0000 (11:57 -0500)]
Merge pull request #22819 from demeritcowboy/unused-v2

[REF] Remove unused api v2 function

2 years agoMerge pull request #22820 from demeritcowboy/recurforms
colemanw [Wed, 23 Feb 2022 16:57:03 +0000 (11:57 -0500)]
Merge pull request #22820 from demeritcowboy/recurforms

[NFC] Rename RecurForms test class

2 years agoMerge pull request #22665 from colemanw/memberCleanup
demeritcowboy [Wed, 23 Feb 2022 16:03:20 +0000 (11:03 -0500)]
Merge pull request #22665 from colemanw/memberCleanup

[REF] Cleanup docblocks & unused vars in Membership BAO

2 years agoupdate tokens in message template
demeritcowboy [Wed, 23 Feb 2022 15:36:41 +0000 (10:36 -0500)]
update tokens in message template

2 years agoconvert to trait
demeritcowboy [Wed, 23 Feb 2022 14:44:53 +0000 (09:44 -0500)]
convert to trait

2 years agomove file
demeritcowboy [Wed, 23 Feb 2022 14:37:08 +0000 (09:37 -0500)]
move file

2 years agoremove unused v2 function
demeritcowboy [Wed, 23 Feb 2022 14:28:10 +0000 (09:28 -0500)]
remove unused v2 function

2 years agoMerge pull request #21895 from kartik1000/Test#18196
demeritcowboy [Wed, 23 Feb 2022 12:47:25 +0000 (07:47 -0500)]
Merge pull request #21895 from kartik1000/Test#18196

Added Cancel Recur Subscription test & setter for `supports` on Dummy processor

2 years agoadd checkPerm
Monish Deb [Wed, 23 Feb 2022 07:37:11 +0000 (13:07 +0530)]
add checkPerm

2 years agoSkip `testNotCMSUser_q` in some environments (based on `isOldQSupported()`)
Tim Otten [Wed, 23 Feb 2022 04:52:00 +0000 (20:52 -0800)]
Skip `testNotCMSUser_q` in some environments (based on `isOldQSupported()`)

2 years ago(REF) E2E_Extern_*RestTest - Extract `isOldQSupported()`
Tim Otten [Wed, 23 Feb 2022 04:21:00 +0000 (20:21 -0800)]
(REF) E2E_Extern_*RestTest - Extract `isOldQSupported()`

This patch changes the way a certain carve-out works, but it doesn't change the outcome.

Background: There are two E2E tests:

* `LegacyRestTest` extends `BaseRestTest` and targets `extern/rest.php`.
  It tests `rest.php?entity=ENTITY&action=ACTION`
  as well as `rest.php?q=civicrm/ENTITY/ACTION`.
* `AuthxRestTest` extends `BaseRestTest` and targets `civicrm/ajax/rest`.
  It only tests `civicrm/ajax/rest?entity=ENTITY&action=ACTION`.

The `q` parameter cannot be used realiably with CMS routing
(`q=civicrm/ajax/rest&q=civicrm/ENTITY/ACTION`).  So we skip testing that
combination.

The patch merely changes how the skip works.

2 years agoMerge pull request #22815 from totten/5.47-rn546-auto
Tim Otten [Wed, 23 Feb 2022 03:49:47 +0000 (19:49 -0800)]
Merge pull request #22815 from totten/5.47-rn546-auto

(NFC) release-notes/5.46.0.md - Re-apply auto-cleanups

2 years agoMerge pull request #22475 from eileenmcnaughton/ipn
colemanw [Wed, 23 Feb 2022 00:07:27 +0000 (19:07 -0500)]
Merge pull request #22475 from eileenmcnaughton/ipn

Revert membership debug handling in IPN

2 years agorelease-notes/5.46.0.md - Auto clean (https://gist.github.com/totten/acff49e6dd779473...
Tim Otten [Tue, 22 Feb 2022 23:04:55 +0000 (15:04 -0800)]
release-notes/5.46.0.md - Auto clean (https://gist.github.com/totten/acff49e6dd77947349a1df26d5002003)

2 years agorelease-notes.md - Update date
Tim Otten [Fri, 4 Feb 2022 02:52:55 +0000 (18:52 -0800)]
release-notes.md - Update date

2 years agoMerge pull request #22813 from alifrumin/rn5.46take2
Tim Otten [Tue, 22 Feb 2022 22:56:40 +0000 (14:56 -0800)]
Merge pull request #22813 from alifrumin/rn5.46take2

[NFC] Second pass at release notes for 5.46

2 years ago[NFC] 5.46 release notes updates
Alice Frumin [Wed, 16 Feb 2022 18:28:48 +0000 (13:28 -0500)]
[NFC] 5.46 release notes updates

2 years agoMerge pull request #22736 from eileenmcnaughton/membership_message
Mathieu Lu [Tue, 22 Feb 2022 19:57:03 +0000 (14:57 -0500)]
Merge pull request #22736 from eileenmcnaughton/membership_message

Cleanup on Offline Membership Receipts (ensures variables present across flows)

2 years agoMerge pull request #22748 from colemanw/api4SystemCheck
colemanw [Tue, 22 Feb 2022 14:42:10 +0000 (09:42 -0500)]
Merge pull request #22748 from colemanw/api4SystemCheck

APIv4 - remove unnecessary field from System::check

2 years agoMerge pull request #22811 from colemanw/deprecateApiv3
Eileen McNaughton [Tue, 22 Feb 2022 00:33:39 +0000 (13:33 +1300)]
Merge pull request #22811 from colemanw/deprecateApiv3

Add deprecation notice to APIv3 Explorer

2 years agoAdd deprecation notice to APIv3 Explorer
Coleman Watts [Mon, 21 Feb 2022 22:25:46 +0000 (17:25 -0500)]
Add deprecation notice to APIv3 Explorer

2 years agoMerge pull request #22790 from colemanw/searchKitTaskButtons
Monish Deb [Mon, 21 Feb 2022 02:21:30 +0000 (07:51 +0530)]
Merge pull request #22790 from colemanw/searchKitTaskButtons

SearchKit - Use crmDialogButtons for task popups

2 years agoMerge pull request #22807 from seamuslee001/css_fixes
Seamus Lee [Sun, 20 Feb 2022 23:50:28 +0000 (10:50 +1100)]
Merge pull request #22807 from seamuslee001/css_fixes

[REF] Fix css code style issues

2 years agoMerge pull request #22796 from totten/master-queue-mgd
Seamus Lee [Sun, 20 Feb 2022 22:38:47 +0000 (09:38 +1100)]
Merge pull request #22796 from totten/master-queue-mgd

Civi\Api4\Queue - Allow use with hook_managed

2 years agoMerge pull request #22799 from colemanw/mailingGroupApi
Seamus Lee [Sun, 20 Feb 2022 22:34:13 +0000 (09:34 +1100)]
Merge pull request #22799 from colemanw/mailingGroupApi

APIv4 - Add MailingGroup API

2 years ago[REF] Fix css code style issues
Seamus Lee [Sun, 20 Feb 2022 22:20:17 +0000 (09:20 +1100)]
[REF] Fix css code style issues

2 years agoMerge pull request #22803 from braders/feature/isutf8-functionexists-fix
Seamus Lee [Sun, 20 Feb 2022 21:59:57 +0000 (08:59 +1100)]
Merge pull request #22803 from braders/feature/isutf8-functionexists-fix

Remove broken call to function_exists in CRM_Utils_String::isUtf8

2 years agoFix call to function_exists in CRM_Utils_String::isUtf8
Bradley Taylor [Sun, 20 Feb 2022 14:30:12 +0000 (14:30 +0000)]
Fix call to function_exists in CRM_Utils_String::isUtf8

2 years agoMerge pull request #22798 from civicrm/5.47
demeritcowboy [Sun, 20 Feb 2022 13:55:23 +0000 (08:55 -0500)]
Merge pull request #22798 from civicrm/5.47

5.47

2 years agoMerge pull request #22801 from jitendrapurohit/pledge_deefault
demeritcowboy [Sun, 20 Feb 2022 13:55:13 +0000 (08:55 -0500)]
Merge pull request #22801 from jitendrapurohit/pledge_deefault

Fix pledge default on contribution page when the site has a WR for "contribution"

2 years agoFix pledge default on contribution page
jitendrapurohit [Sun, 20 Feb 2022 06:16:32 +0000 (11:46 +0530)]
Fix pledge default on contribution page

2 years agoMerge pull request #22791 from colemanw/civigrantPermissions
colemanw [Sun, 20 Feb 2022 01:47:07 +0000 (20:47 -0500)]
Merge pull request #22791 from colemanw/civigrantPermissions

CiviGrant - Declare API permissions

2 years agoMailing Report: do not recalculate the recipients when the count is zero
Mathieu Lutfy [Sat, 19 Feb 2022 21:40:29 +0000 (16:40 -0500)]
Mailing Report: do not recalculate the recipients when the count is zero

2 years agoAPIv4 - Add MailingGroup API
Coleman Watts [Sat, 19 Feb 2022 17:42:33 +0000 (12:42 -0500)]
APIv4 - Add MailingGroup API

2 years agoMerge pull request #22624 from eileenmcnaughton/mailing
colemanw [Sat, 19 Feb 2022 17:37:44 +0000 (12:37 -0500)]
Merge pull request #22624 from eileenmcnaughton/mailing

dev/core#2486 Add v4 Mailing api (+ MailingJob)

2 years agoFlexMailer - Update test
Coleman Watts [Sat, 19 Feb 2022 15:28:33 +0000 (10:28 -0500)]
FlexMailer - Update test

2 years agoMerge pull request #22797 from totten/master-queue-spec
colemanw [Sat, 19 Feb 2022 03:31:50 +0000 (22:31 -0500)]
Merge pull request #22797 from totten/master-queue-spec

(REF) CRM_Queue_Queue_* - Retain a copy of `$queueSpec`

2 years agoMerge pull request #22795 from totten/master-queue-group
colemanw [Sat, 19 Feb 2022 02:11:36 +0000 (21:11 -0500)]
Merge pull request #22795 from totten/master-queue-group

(NFC) tests/phpunit/CRM/Queue - Add common `@group`

2 years agoMerge pull request #22794 from totten/master-queue-task-sig
colemanw [Sat, 19 Feb 2022 02:11:11 +0000 (21:11 -0500)]
Merge pull request #22794 from totten/master-queue-task-sig

(REF) CRM_Queue_Task - Tighter signature

2 years agoMerge pull request #22792 from colemanw/autoloader
Tim Otten [Sat, 19 Feb 2022 01:04:19 +0000 (17:04 -0800)]
Merge pull request #22792 from colemanw/autoloader

[REF] Remove old require_once statements made obsolete by autoloader

2 years agoMerge pull request #22793 from agh1/5.47.0-releasenotes-initial
Tim Otten [Sat, 19 Feb 2022 00:24:11 +0000 (16:24 -0800)]
Merge pull request #22793 from agh1/5.47.0-releasenotes-initial

5.47.0 release notes initial run

2 years agoCRM_Queue_Queue_* - Retain a copy of `$queueSpec`
Tim Otten [Fri, 11 Feb 2022 03:12:23 +0000 (19:12 -0800)]
CRM_Queue_Queue_* - Retain a copy of `$queueSpec`

2 years agoCivi\Api4\Queue - Allow use with hook_managed
Tim Otten [Wed, 2 Feb 2022 21:13:26 +0000 (13:13 -0800)]
Civi\Api4\Queue - Allow use with hook_managed

2 years ago(NFC) tests/phpunit/CRM/Queue - Add common `@group`
Tim Otten [Thu, 17 Feb 2022 06:15:10 +0000 (22:15 -0800)]
(NFC) tests/phpunit/CRM/Queue - Add common `@group`

2 years ago(REF) CRM_Queue_Task - Tighter signature
Tim Otten [Fri, 18 Feb 2022 23:47:17 +0000 (15:47 -0800)]
(REF) CRM_Queue_Task - Tighter signature

2 years agoDelete paymentprocessor between tests
Matthew Wire [Fri, 18 Feb 2022 11:37:55 +0000 (11:37 +0000)]
Delete paymentprocessor between tests

2 years agoAdded cancel recur test
Kartik Kathuria [Wed, 20 Oct 2021 21:43:32 +0000 (03:13 +0530)]
Added cancel recur test

2 years agoMerge pull request #22720 from JKingsnorth/patch-19
Eileen McNaughton [Fri, 18 Feb 2022 22:17:17 +0000 (11:17 +1300)]
Merge pull request #22720 from JKingsnorth/patch-19

Fix regression with flexible merging of contact information

2 years agoMerge pull request #22788 from colemanw/searchKitExtensionGet
Eileen McNaughton [Fri, 18 Feb 2022 22:11:51 +0000 (11:11 +1300)]
Merge pull request #22788 from colemanw/searchKitExtensionGet

SearchKit - Update APIv3 Extension.get to use APIv4

2 years agoAPIv4 - Create necessary fk entities in conformance test
Coleman Watts [Fri, 18 Feb 2022 01:45:37 +0000 (20:45 -0500)]
APIv4 - Create necessary fk entities in conformance test

2 years agoBlock crud for v4 api
Eileen McNaughton [Fri, 18 Feb 2022 00:05:24 +0000 (13:05 +1300)]
Block crud for v4 api

2 years agoMove validator out of BAO into v3 api
Eileen McNaughton [Thu, 17 Feb 2022 23:40:57 +0000 (12:40 +1300)]
Move validator out of BAO into v3 api

m

m

2 years agoMerge pull request #22488 from mattwire/deprecateipnprocesstransaction
Matthew Wire [Fri, 18 Feb 2022 21:43:21 +0000 (21:43 +0000)]
Merge pull request #22488 from mattwire/deprecateipnprocesstransaction

REF Deprecate API3 _ipn_process_transaction()

2 years ago5.47.0 release notes: added boilerplate
Andie Hunt [Fri, 18 Feb 2022 20:14:54 +0000 (15:14 -0500)]
5.47.0 release notes: added boilerplate

2 years ago5.47.0 release notes: raw from script
Andie Hunt [Fri, 18 Feb 2022 20:10:27 +0000 (15:10 -0500)]
5.47.0 release notes: raw from script

2 years agoMerge pull request #22698 from eileenmcnaughton/matt
Matthew Wire [Fri, 18 Feb 2022 18:55:22 +0000 (18:55 +0000)]
Merge pull request #22698 from eileenmcnaughton/matt

Cleanup on contribution view

2 years agoRemove old require_once statements made obsolete by autoloader
Coleman Watts [Fri, 18 Feb 2022 18:52:06 +0000 (13:52 -0500)]
Remove old require_once statements made obsolete by autoloader

2 years agoMerge pull request #22783 from colemanw/api4DateFunction
Monish Deb [Fri, 18 Feb 2022 18:10:00 +0000 (23:40 +0530)]
Merge pull request #22783 from colemanw/api4DateFunction

SearchKit - Support relative dates and datepicker with the DATE() sql fn

2 years agoCiviGrant - Declare API permissions
Coleman Watts [Fri, 18 Feb 2022 15:26:38 +0000 (10:26 -0500)]
CiviGrant - Declare API permissions

This allows the current user to access the grant api (e.g. through SearchKit)
without needing the "administer CiviCRM" permission.

2 years agoSearchKit - Use crmDialogButtons for task popups
Coleman Watts [Fri, 18 Feb 2022 14:34:03 +0000 (09:34 -0500)]
SearchKit - Use crmDialogButtons for task popups

2 years agodev/core#2486 Add v4 Mailing api (+ MailingJob)
Eileen McNaughton [Wed, 26 Jan 2022 00:32:05 +0000 (13:32 +1300)]
dev/core#2486 Add v4 Mailing api (+ MailingJob)

ro

2 years agoMerge pull request #22789 from civicrm/5.47
Eileen McNaughton [Fri, 18 Feb 2022 03:22:44 +0000 (16:22 +1300)]
Merge pull request #22789 from civicrm/5.47

5.47

2 years agoMerge pull request #22787 from eileenmcnaughton/t
Seamus Lee [Fri, 18 Feb 2022 02:03:26 +0000 (13:03 +1100)]
Merge pull request #22787 from eileenmcnaughton/t

Update unit test to use exception

2 years agoMerge pull request #22499 from eileenmcnaughton/fin3
Seamus Lee [Fri, 18 Feb 2022 01:38:35 +0000 (12:38 +1100)]
Merge pull request #22499 from eileenmcnaughton/fin3

Follow up fix on #22685 financial acl move to extension

2 years agoMerge pull request #22785 from colemanw/mailingTemplateOptions
Eileen McNaughton [Fri, 18 Feb 2022 00:19:03 +0000 (13:19 +1300)]
Merge pull request #22785 from colemanw/mailingTemplateOptions

Mailing - Add `serialize` and `add` to `template_options` field

2 years agoSearchKit - Update APIv3 Extension.get to use APIv4
Coleman Watts [Thu, 17 Feb 2022 23:46:06 +0000 (18:46 -0500)]
SearchKit - Update APIv3 Extension.get to use APIv4

2 years agoUpdate unit test to use exception
Eileen McNaughton [Thu, 17 Feb 2022 22:40:37 +0000 (11:40 +1300)]
Update unit test to use exception

Note that this also updates the money formatting on the contributionSoft list

2 years agoMailing - Add `serialize` and `add` to `template_options` field
Coleman Watts [Thu, 17 Feb 2022 21:28:26 +0000 (16:28 -0500)]
Mailing - Add `serialize` and `add` to `template_options` field

No need for special handling to json_encode the field, the BAO
takes care of that automatically when `serialize` is declared.

Test coverage in api_v3_MailingTest::testMailerCreateTemplateOptions

2 years agoMerge pull request #22784 from mattwire/recurformstests
Seamus Lee [Thu, 17 Feb 2022 22:25:46 +0000 (09:25 +1100)]
Merge pull request #22784 from mattwire/recurformstests

RecurForms test fixes

2 years agoMerge pull request #22753 from eileenmcnaughton/mail
colemanw [Thu, 17 Feb 2022 22:25:30 +0000 (17:25 -0500)]
Merge pull request #22753 from eileenmcnaughton/mail

BAO_Mailing::create - stop passing by reference

2 years agoMerge pull request #22766 from eileenmcnaughton/mailit
colemanw [Thu, 17 Feb 2022 22:19:00 +0000 (17:19 -0500)]
Merge pull request #22766 from eileenmcnaughton/mailit

Move check for mailing workflow permisisons to BAO layer

2 years agoMerge pull request #22782 from civicrm/5.47
Seamus Lee [Thu, 17 Feb 2022 21:21:23 +0000 (08:21 +1100)]
Merge pull request #22782 from civicrm/5.47

5.47

2 years agoRecurForms test fixes
Matthew Wire [Thu, 17 Feb 2022 20:59:41 +0000 (20:59 +0000)]
RecurForms test fixes

2 years agoSearchKit - Support relative dates and datepicker with the DATE() sql function
Coleman Watts [Thu, 17 Feb 2022 18:50:39 +0000 (13:50 -0500)]
SearchKit - Support relative dates and datepicker with the DATE() sql function

2 years agoMerge pull request #22781 from iswilson/patch-2
demeritcowboy [Thu, 17 Feb 2022 18:25:14 +0000 (13:25 -0500)]
Merge pull request #22781 from iswilson/patch-2

Contributor key: Add Ian Wilson

2 years agoMerge pull request #22778 from colemanw/noMoreSearchBuilder
demeritcowboy [Thu, 17 Feb 2022 14:30:03 +0000 (09:30 -0500)]
Merge pull request #22778 from colemanw/noMoreSearchBuilder

Remove "Search Builder" from menubar on new installs.

2 years agoContributor key: Add Ian Wilson
Ian Wilson [Thu, 17 Feb 2022 14:28:43 +0000 (09:28 -0500)]
Contributor key: Add Ian Wilson

2 years agoMerge pull request #22724 from braders/feature/group-search-null-columns
demeritcowboy [Thu, 17 Feb 2022 14:12:14 +0000 (09:12 -0500)]
Merge pull request #22724 from braders/feature/group-search-null-columns

Avoid null column showing on groups search page

2 years agoMerge pull request #22667 from braders/avoid-notices-uf-settings-page
demeritcowboy [Thu, 17 Feb 2022 14:11:54 +0000 (09:11 -0500)]
Merge pull request #22667 from braders/avoid-notices-uf-settings-page

Avoid PHP notices on the UF settings page.

2 years agoMerge pull request #22768 from colemanw/searchKitDedupe
Seamus Lee [Thu, 17 Feb 2022 07:06:38 +0000 (18:06 +1100)]
Merge pull request #22768 from colemanw/searchKitDedupe

SearchKit - Add 'merge contacts' task

2 years agoMerge pull request #22780 from civicrm/5.47
Eileen McNaughton [Wed, 16 Feb 2022 22:38:03 +0000 (11:38 +1300)]
Merge pull request #22780 from civicrm/5.47

5.47 to master

2 years agoMerge pull request #22779 from eileenmcnaughton/pledgey
Eileen McNaughton [Wed, 16 Feb 2022 22:37:49 +0000 (11:37 +1300)]
Merge pull request #22779 from eileenmcnaughton/pledgey

dev/core#3066 - Check CiviPledge is enabled before disconnecting pledge payments