civicrm-core.git
19 months agoFixes core#4269 - import 'fill' doesn't work on phone/email
Jon Goldberg [Wed, 3 May 2023 18:09:53 +0000 (14:09 -0400)]
Fixes core#4269 - import 'fill' doesn't work on phone/email

19 months agoMerge pull request #26127 from alifrumin/rn5.61
Eileen McNaughton [Sat, 29 Apr 2023 23:53:47 +0000 (11:53 +1200)]
Merge pull request #26127 from alifrumin/rn5.61

[NFC] 5.61 release notes

19 months ago[NFC] 5.61 release notes
Alice Frumin [Fri, 28 Apr 2023 03:21:40 +0000 (23:21 -0400)]
[NFC] 5.61 release notes

19 months agoMerge pull request #26117 from agh1/5.61.0-releasenotes-initial
Eileen McNaughton [Thu, 27 Apr 2023 22:46:33 +0000 (10:46 +1200)]
Merge pull request #26117 from agh1/5.61.0-releasenotes-initial

5.61.0 release notes initial run

19 months ago5.61.0 release notes: added boilerplate
Andie Hunt [Thu, 27 Apr 2023 20:48:16 +0000 (16:48 -0400)]
5.61.0 release notes: added boilerplate

19 months ago5.61.0 release notes: raw from script
Andie Hunt [Thu, 27 Apr 2023 20:43:30 +0000 (16:43 -0400)]
5.61.0 release notes: raw from script

19 months agoMerge pull request #26015 from eileenmcnaughton/dedupe_employer
demeritcowboy [Thu, 27 Apr 2023 13:31:12 +0000 (09:31 -0400)]
Merge pull request #26015 from eileenmcnaughton/dedupe_employer

dev/core#4156 Fix employer not carrying over correctly in merge

19 months agoMerge pull request #26099 from seamuslee001/5.61
Seamus Lee [Sat, 22 Apr 2023 00:56:51 +0000 (10:56 +1000)]
Merge pull request #26099 from seamuslee001/5.61

dev/core#4249 Ensure that no deprecation logging occurs from groupPer…

19 months agodev/core#4249 Ensure that no deprecation logging occurs from groupPermission having...
Seamus Lee [Thu, 20 Apr 2023 03:26:15 +0000 (13:26 +1000)]
dev/core#4249 Ensure that no deprecation logging occurs from groupPermission having includeGroups as NULL rather than an empty array

19 months agoMerge pull request #26085 from seamuslee001/dev_core_4247
Yashodha Chaku [Thu, 20 Apr 2023 06:30:00 +0000 (12:00 +0530)]
Merge pull request #26085 from seamuslee001/dev_core_4247

dev/core#4247 Ensure that Membership values are populated to prevent …

19 months agodev/core#4247 Ensure that Membership values are populated to prevent fatal error...
Seamus Lee [Thu, 20 Apr 2023 03:21:33 +0000 (13:21 +1000)]
dev/core#4247 Ensure that Membership values are populated to prevent fatal error on formatting start date

19 months agoMerge pull request #26082 from seamuslee001/5.61
Seamus Lee [Wed, 19 Apr 2023 23:09:55 +0000 (09:09 +1000)]
Merge pull request #26082 from seamuslee001/5.61

Updates pear/pear-core-minimal and guzzlehttp/psr7

19 months agoUpdate Guzzle PSR7 package
Seamus Lee [Wed, 19 Apr 2023 22:45:34 +0000 (08:45 +1000)]
Update Guzzle PSR7 package

19 months agoThis has been closed in favour of pear/pear-core#124
Luke Stewart [Wed, 19 Apr 2023 20:55:40 +0000 (08:55 +1200)]
This has been closed in favour of pear/pear-core#124

Updates lock file to pull in latest version of pear/pear-core-minimal.

19 months agoMerge pull request #26067 from colemanw/fixEntityRefSave
colemanw [Mon, 17 Apr 2023 21:07:33 +0000 (17:07 -0400)]
Merge pull request #26067 from colemanw/fixEntityRefSave

Fix dev/core#4240 - Saving entityReference field value via API

19 months agoCustomValue - Fix saving entityReference field as NULL and add test
Coleman Watts [Mon, 17 Apr 2023 19:32:02 +0000 (15:32 -0400)]
CustomValue - Fix saving entityReference field as NULL and add test

19 months agoFix dev/core#4240 - Saving entityReference field value via API
Coleman Watts [Sat, 15 Apr 2023 19:57:43 +0000 (15:57 -0400)]
Fix dev/core#4240 - Saving entityReference field value via API

19 months agoCleanup relationships
Eileen McNaughton [Thu, 13 Apr 2023 19:02:26 +0000 (07:02 +1200)]
Cleanup relationships

19 months agoRemove obsolete code
Eileen McNaughton [Thu, 13 Apr 2023 00:17:27 +0000 (12:17 +1200)]
Remove obsolete code

This was actually obsolete before the apiv4 switch I think - but it DEFINITELY is now

19 months agoMore better fix on population on cached organization name
Eileen McNaughton [Thu, 13 Apr 2023 00:16:51 +0000 (12:16 +1200)]
More better fix on population on cached organization name

19 months agoFix for handling of FALSE now we are getting apiv4 results
Eileen McNaughton [Fri, 7 Apr 2023 01:15:05 +0000 (13:15 +1200)]
Fix for handling of FALSE now we are getting apiv4 results

As exposed in api_v3_JobTest.testBatchMergeWorks

19 months agoAdjust to APiv4 returning label as a field
Eileen McNaughton [Thu, 6 Apr 2023 23:39:38 +0000 (11:39 +1200)]
Adjust to APiv4 returning label as a field

As tested by CRM_Dedupe_MergerTest::testGetRowsElementsAndInfoSpecialInfo

19 months agoDo not consider greeting display names in merges
Eileen McNaughton [Thu, 6 Apr 2023 23:34:59 +0000 (11:34 +1200)]
Do not consider greeting display names in merges

As surfaced by api_v3_ContactTest::testMergeGetConflicts
these are basically caches of calculated fields

19 months agoFix employer not carrying over correctly in merge
Eileen McNaughton [Thu, 6 Apr 2023 06:12:24 +0000 (18:12 +1200)]
Fix employer not carrying over correctly in merge

This addresses a deduper bug where selecting the employer_id to
carry over in the form does NOT result in the newly
merged contact having that organization's name
in it's organization_name field

19 months agoMerge pull request #26008 from colemanw/fixEntityRefDefaults
colemanw [Fri, 7 Apr 2023 18:43:50 +0000 (14:43 -0400)]
Merge pull request #26008 from colemanw/fixEntityRefDefaults

Afform - Fix showing default values for EntityRef fields

19 months agoSet version to 5.61.beta1
CiviCRM [Thu, 6 Apr 2023 05:18:51 +0000 (05:18 +0000)]
Set version to 5.61.beta1

19 months agoMerge pull request #26013 from eileenmcnaughton/test_strict
Seamus Lee [Thu, 6 Apr 2023 05:15:52 +0000 (15:15 +1000)]
Merge pull request #26013 from eileenmcnaughton/test_strict

Type hints & strictness fixes within tests

19 months agoType hints & strictness fixes within tests
Eileen McNaughton [Thu, 6 Apr 2023 03:08:25 +0000 (15:08 +1200)]
Type hints & strictness fixes within tests

19 months agoMerge pull request #26012 from eileenmcnaughton/old
Eileen McNaughton [Thu, 6 Apr 2023 01:57:14 +0000 (13:57 +1200)]
Merge pull request #26012 from eileenmcnaughton/old

Remove an attention-span's worth of cvs info

19 months agoMerge pull request #26011 from eileenmcnaughton/strict_test
Eileen McNaughton [Thu, 6 Apr 2023 01:56:59 +0000 (13:56 +1200)]
Merge pull request #26011 from eileenmcnaughton/strict_test

[Test] Strictness fixes - `CiviUntTestBaseClass`

19 months agoRemove an attention-span's worth of cvs info
Eileen McNaughton [Thu, 6 Apr 2023 00:57:27 +0000 (12:57 +1200)]
Remove an attention-span's worth of cvs info

19 months ago[Test] Strictness fixes
Eileen McNaughton [Wed, 5 Apr 2023 23:18:04 +0000 (11:18 +1200)]
[Test] Strictness fixes

19 months agoMerge pull request #26005 from eileenmcnaughton/strict_test
colemanw [Wed, 5 Apr 2023 21:11:58 +0000 (17:11 -0400)]
Merge pull request #26005 from eileenmcnaughton/strict_test

Strictness cleanups in test class

19 months agoAfform - Fix showing default values for EntityRef fields
Coleman Watts [Wed, 5 Apr 2023 16:37:31 +0000 (12:37 -0400)]
Afform - Fix showing default values for EntityRef fields

There was some back-and-forth with this. #25374 removed the change() trigger, which fixed
the recursion bug described in https://lab.civicrm.org/dev/core/-/issues/4083 but broke
setting defaults, prompting #25465 which proposed to change it back.

This fix walks the line by triggering the change event but only when the value has actually changed.
Fixes dev/core#4110

19 months agoStrictness cleanups in test class
Eileen McNaughton [Tue, 4 Apr 2023 23:17:40 +0000 (11:17 +1200)]
Strictness cleanups in test class

19 months agoMerge pull request #25175 from colemanw/afformRepeatRelationships
colemanw [Wed, 5 Apr 2023 01:26:25 +0000 (21:26 -0400)]
Merge pull request #25175 from colemanw/afformRepeatRelationships

Afform - Support repeatable relationships

19 months agoMerge pull request #26004 from eileenmcnaughton/dedupe_old
Eileen McNaughton [Wed, 5 Apr 2023 01:04:26 +0000 (13:04 +1200)]
Merge pull request #26004 from eileenmcnaughton/dedupe_old

Remove upgrade custom field handling from Dedupe code - previously shared function

19 months agoMerge pull request #26003 from eileenmcnaughton/dedupe_strict
Eileen McNaughton [Wed, 5 Apr 2023 01:04:12 +0000 (13:04 +1200)]
Merge pull request #26003 from eileenmcnaughton/dedupe_strict

Clarify `entityID` types in Merger class

19 months agoClarify entityID types in Merger class
Eileen McNaughton [Tue, 4 Apr 2023 22:18:07 +0000 (10:18 +1200)]
Clarify entityID types in Merger class

19 months agoMerge pull request #26001 from demeritcowboy/undef
demeritcowboy [Tue, 4 Apr 2023 22:32:23 +0000 (18:32 -0400)]
Merge pull request #26001 from demeritcowboy/undef

Avoid potentially undefined var

19 months agoRemove upgrade custom field handling from Dedupe code
Eileen McNaughton [Tue, 4 Apr 2023 22:29:34 +0000 (10:29 +1200)]
Remove upgrade custom field handling from Dedupe code

19 months agoMerge pull request #25988 from eileenmcnaughton/import_campaign
colemanw [Tue, 4 Apr 2023 21:48:59 +0000 (17:48 -0400)]
Merge pull request #25988 from eileenmcnaughton/import_campaign

When importing invalid campaigns they pass validation (only to fail on import)

19 months agoavoid potentially undefined var
demeritcowboy [Tue, 4 Apr 2023 21:38:50 +0000 (17:38 -0400)]
avoid potentially undefined var

19 months agoMerge pull request #25647 from mattwire/disableinvalidrelationship
demeritcowboy [Tue, 4 Apr 2023 20:49:07 +0000 (16:49 -0400)]
Merge pull request #25647 from mattwire/disableinvalidrelationship

Allow to disable an invalid relationship (eg. contact subtype was changed so no longer valid)

19 months agoMerge pull request #25997 from agileware/CIVICRM-2120
colemanw [Tue, 4 Apr 2023 15:58:28 +0000 (11:58 -0400)]
Merge pull request #25997 from agileware/CIVICRM-2120

🥚 Payment API creates Activity with subject: "$x Offline Payment for Contribution" even when a payment was captured online

19 months agoMerge pull request #25991 from eileenmcnaughton/import_label
Yashodha Chaku [Tue, 4 Apr 2023 14:05:53 +0000 (19:35 +0530)]
Merge pull request #25991 from eileenmcnaughton/import_label

Use label, where present for import field labels

19 months agoMerge pull request #25995 from colemanw/uniqueNameIndex
colemanw [Tue, 4 Apr 2023 11:43:35 +0000 (07:43 -0400)]
Merge pull request #25995 from colemanw/uniqueNameIndex

Campaign - Make name index unique

19 months agoCampaign - Allow writeRecord to autogenerate name from title, fix tests
Coleman Watts [Tue, 4 Apr 2023 02:12:47 +0000 (22:12 -0400)]
Campaign - Allow writeRecord to autogenerate name from title, fix tests

The Campaign BAO was autogenerating a name from the title but without the dedupe checking feature
performed by writeRecord, so it was getting in the way of that safeguard.

20 months agoCIVICRM-2120 Payment API creates Activity with subject: "$x Offline Payment for Contr...
Justin Freeman [Tue, 4 Apr 2023 05:51:34 +0000 (15:51 +1000)]
CIVICRM-2120 Payment API creates Activity with subject: "$x Offline Payment for Contribution" even when a payment was captured online

20 months agoCampaign - Make name index unique
Coleman Watts [Mon, 3 Apr 2023 21:20:29 +0000 (17:20 -0400)]
Campaign - Make name index unique

20 months agoMerge pull request #25996 from eileenmcnaughton/test_clean
colemanw [Tue, 4 Apr 2023 00:21:06 +0000 (20:21 -0400)]
Merge pull request #25996 from eileenmcnaughton/test_clean

[TESTS] Fix some campaign cleanup

20 months ago[TESTS] Fix some campaign cleanup
Eileen McNaughton [Mon, 3 Apr 2023 23:47:07 +0000 (11:47 +1200)]
[TESTS] Fix some campaign cleanup

20 months agoUse label, where present
Eileen McNaughton [Mon, 3 Apr 2023 04:05:33 +0000 (16:05 +1200)]
Use label, where present

Label is preferred over title - when the metadata comes from the
DAO it is in html['label'], but if it comes from apiv4 it
seems it is mapped higher up...

20 months agoMerge pull request #25990 from eileenmcnaughton/import_user
Eileen McNaughton [Mon, 3 Apr 2023 03:52:14 +0000 (15:52 +1200)]
Merge pull request #25990 from eileenmcnaughton/import_user

Fix url from just-merged PR

20 months agoFix url from just-merged PR
Eileen McNaughton [Mon, 3 Apr 2023 03:51:00 +0000 (15:51 +1200)]
Fix url from just-merged PR

20 months agoFix to validation error for invalid campaign
Eileen McNaughton [Mon, 3 Apr 2023 01:03:08 +0000 (13:03 +1200)]
Fix to validation error for invalid campaign

20 months ago[REF] Add in Test for importing a deliberartly bad campaign id
Seamus Lee [Thu, 27 Oct 2022 22:26:30 +0000 (09:26 +1100)]
[REF] Add in Test for importing a deliberartly bad campaign id

20 months agoMerge pull request #25979 from eileenmcnaughton/civi_import_notice_fix
colemanw [Mon, 3 Apr 2023 00:45:11 +0000 (20:45 -0400)]
Merge pull request #25979 from eileenmcnaughton/civi_import_notice_fix

Fix enotice when using Civi-import

20 months agoMerge pull request #25939 from eileenmcnaughton/template_search
colemanw [Mon, 3 Apr 2023 00:43:29 +0000 (20:43 -0400)]
Merge pull request #25939 from eileenmcnaughton/template_search

Civi-Import - Add Template search

20 months agoMerge pull request #25971 from colemanw/acitivityCruft
Eileen McNaughton [Mon, 3 Apr 2023 00:07:03 +0000 (12:07 +1200)]
Merge pull request #25971 from colemanw/acitivityCruft

Activity BAO - Remove unused classes/functions

20 months agoMerge pull request #25973 from colemanw/savedSearchUpdate
Eileen McNaughton [Sun, 2 Apr 2023 23:53:02 +0000 (11:53 +1200)]
Merge pull request #25973 from colemanw/savedSearchUpdate

BAO - deprecate create for writeRecord: SavedSearch

20 months agoMerge pull request #25976 from colemanw/deprecateSetIsActive
Eileen McNaughton [Sun, 2 Apr 2023 23:52:13 +0000 (11:52 +1200)]
Merge pull request #25976 from colemanw/deprecateSetIsActive

BAO - Deprecate `setIsActive` BAO functions

20 months agoMerge pull request #25986 from civicrm/5.60
Eileen McNaughton [Sun, 2 Apr 2023 23:47:52 +0000 (11:47 +1200)]
Merge pull request #25986 from civicrm/5.60

5.60

20 months agoMerge pull request #25977 from eileenmcnaughton/import_edit_cond
colemanw [Sun, 2 Apr 2023 23:19:52 +0000 (19:19 -0400)]
Merge pull request #25977 from eileenmcnaughton/import_edit_cond

Civi-Import - improvements to the search display for imported rows

20 months agoMerge pull request #25980 from eileenmcnaughton/import_js
colemanw [Sun, 2 Apr 2023 23:18:23 +0000 (19:18 -0400)]
Merge pull request #25980 from eileenmcnaughton/import_js

Minor fixes to Civi-Import screen, populating defaults, missing `ts`

20 months agoMerge pull request #25981 from eileenmcnaughton/560
demeritcowboy [Sun, 2 Apr 2023 23:01:11 +0000 (19:01 -0400)]
Merge pull request #25981 from eileenmcnaughton/560

Fix error when importing a soft credit AND a note when currency not provided

20 months agoMerge pull request #25985 from civicrm/5.60
Eileen McNaughton [Sun, 2 Apr 2023 22:45:09 +0000 (10:45 +1200)]
Merge pull request #25985 from civicrm/5.60

5.60 to master

20 months agoMerge pull request #25982 from demeritcowboy/fileoncase
Eileen McNaughton [Sun, 2 Apr 2023 22:11:03 +0000 (10:11 +1200)]
Merge pull request #25982 from demeritcowboy/fileoncase

dev/core#4217 - Fix file on case search by id and broken entityref pagination

20 months agoMerge pull request #25983 from demeritcowboy/casejson
Eileen McNaughton [Sun, 2 Apr 2023 21:55:20 +0000 (09:55 +1200)]
Merge pull request #25983 from demeritcowboy/casejson

[NFC] Don't have null values for required fields in Case test fixture

20 months agoExtend Generic\CheckAccess to reduce boilerplate
Eileen McNaughton [Sun, 2 Apr 2023 21:51:13 +0000 (09:51 +1200)]
Extend Generic\CheckAccess to reduce boilerplate

20 months agoMinor fixes to Civi-Import screen, populating defaults, missing ts
Eileen McNaughton [Sun, 2 Apr 2023 07:04:30 +0000 (19:04 +1200)]
Minor fixes to Civi-Import screen, populating defaults, missing ts

20 months agoAfform - Support repeatable relationships
Coleman Watts [Wed, 14 Dec 2022 22:27:15 +0000 (17:27 -0500)]
Afform - Support repeatable relationships

20 months agoBAO - Deprecate setIsActive BAO functions
Coleman Watts [Sun, 2 Apr 2023 00:38:51 +0000 (20:38 -0400)]
BAO - Deprecate setIsActive BAO functions

20 months agodon't be null
demeritcowboy [Sun, 2 Apr 2023 19:20:30 +0000 (15:20 -0400)]
don't be null

20 months agoadd test
demeritcowboy [Sun, 2 Apr 2023 19:17:26 +0000 (15:17 -0400)]
add test

20 months agofix file on case search by id and broken pagination
demeritcowboy [Sun, 2 Apr 2023 17:28:19 +0000 (13:28 -0400)]
fix file on case search by id and broken pagination

20 months agoFix error when importing a soft credit AND a note when currency not provided
Eileen McNaughton [Sun, 2 Apr 2023 07:18:24 +0000 (19:18 +1200)]
Fix error when importing a soft credit AND a note when currency not provided

20 months agoFix enotice when using Civi-import
Eileen McNaughton [Sun, 2 Apr 2023 04:36:32 +0000 (16:36 +1200)]
Fix enotice when using Civi-import

20 months agoMerge pull request #25974 from colemanw/updateSubHistory
Eileen McNaughton [Sun, 2 Apr 2023 04:10:18 +0000 (16:10 +1200)]
Merge pull request #25974 from colemanw/updateSubHistory

BAO - deprecate create for writeRecord: SubscriptionHistory

20 months agoMerge pull request #25978 from civicrm/5.60
Eileen McNaughton [Sun, 2 Apr 2023 03:33:22 +0000 (15:33 +1200)]
Merge pull request #25978 from civicrm/5.60

5.60 to master

20 months agoMerge pull request #25967 from alifrumin/5.60rn
Eileen McNaughton [Sun, 2 Apr 2023 03:31:18 +0000 (15:31 +1200)]
Merge pull request #25967 from alifrumin/5.60rn

[NFC] 5.60 release notes

20 months agoMerge pull request #25970 from colemanw/aclWriteRecord
Eileen McNaughton [Sun, 2 Apr 2023 03:30:51 +0000 (15:30 +1200)]
Merge pull request #25970 from colemanw/aclWriteRecord

BAO - deprecate create for writeRecord: ACL

20 months agoMerge pull request #25975 from colemanw/factory
Eileen McNaughton [Sun, 2 Apr 2023 03:29:10 +0000 (15:29 +1200)]
Merge pull request #25975 from colemanw/factory

Demolish the factory 🏭💥

20 months agoMove entity_id before status_message
Eileen McNaughton [Sun, 2 Apr 2023 03:19:23 +0000 (15:19 +1200)]
Move entity_id before status_message

20 months agoRemoved edit-in-place options from Import views on imported rows.
Eileen McNaughton [Sun, 2 Apr 2023 02:48:29 +0000 (14:48 +1200)]
Removed edit-in-place options from Import views on imported rows.

It's confusing to the user to be able to edit the records when they
are already imported. This is not a real security thing - more
of a UI thing - but Coleman recommends implementing through
checkAccess. I did leave open the back door of being able to edit it
if the status is now present as there isn't a real reason they shouldn't -
just that it is confusing to present edit-in-place, except when they could
edit & re-try the import

20 months agoMerge pull request #25969 from colemanw/entityValues
Eileen McNaughton [Sun, 2 Apr 2023 03:12:08 +0000 (15:12 +1200)]
Merge pull request #25969 from colemanw/entityValues

SearchKit - Pass entire record into `checkAccess`

20 months agoMerge pull request #25972 from colemanw/batchUpdate
Eileen McNaughton [Sun, 2 Apr 2023 02:43:28 +0000 (14:43 +1200)]
Merge pull request #25972 from colemanw/batchUpdate

BAO - deprecate create for writeRecord: Batch

20 months agoRemove unused CRM_Contact_DAO_Factory
Coleman Watts [Sat, 1 Apr 2023 23:58:49 +0000 (19:58 -0400)]
Remove unused CRM_Contact_DAO_Factory

20 months agoBAO - deprecate create for writeRecord: SubscriptionHistory
Coleman Watts [Sat, 1 Apr 2023 23:50:11 +0000 (19:50 -0400)]
BAO - deprecate create for writeRecord: SubscriptionHistory

20 months agoBAO - deprecate create for writeRecord: SavedSearch
Coleman Watts [Sat, 1 Apr 2023 23:44:20 +0000 (19:44 -0400)]
BAO - deprecate create for writeRecord: SavedSearch

20 months agoBAO - deprecate create for writeRecord: Batch
Coleman Watts [Sat, 1 Apr 2023 23:31:53 +0000 (19:31 -0400)]
BAO - deprecate create for writeRecord: Batch

20 months agoActivity BAO - Remove unused classes/functions
Coleman Watts [Sat, 1 Apr 2023 20:52:45 +0000 (16:52 -0400)]
Activity BAO - Remove unused classes/functions

20 months agoBAO - deprecate create for writeRecord: ACL
Coleman Watts [Sat, 1 Apr 2023 20:32:11 +0000 (16:32 -0400)]
BAO - deprecate create for writeRecord: ACL

20 months agoSearchKit - Pass entire record into `checkAccess`
Coleman Watts [Sat, 1 Apr 2023 15:15:22 +0000 (11:15 -0400)]
SearchKit - Pass entire record into `checkAccess`

For efficiency it's best to pass all available data into the `checkAccess` action to avoid unnecessary
db lookups. This ensures the full record is passed in when checking access before enabling in-place edit.

20 months agoMerge pull request #25956 from totten/master-tap
Seamus Lee [Fri, 31 Mar 2023 23:28:30 +0000 (10:28 +1100)]
Merge pull request #25956 from totten/master-tap

(dev/core#4188) PHPUnit - Port TAP printer to v9.x

20 months ago[NFC] 5.56 release notes first pass
Alice Frumin [Fri, 10 Mar 2023 02:52:02 +0000 (21:52 -0500)]
[NFC] 5.56 release notes first pass

20 months agoMerge pull request #25965 from eileenmcnaughton/dep_tax
Matthew Wire [Fri, 31 Mar 2023 10:26:56 +0000 (11:26 +0100)]
Merge pull request #25965 from eileenmcnaughton/dep_tax

Remove noisily deprecated code

20 months agoMerge pull request #25966 from civicrm/5.60
Eileen McNaughton [Fri, 31 Mar 2023 01:46:52 +0000 (14:46 +1300)]
Merge pull request #25966 from civicrm/5.60

5.60 to master

20 months agoMerge pull request #25963 from seamuslee001/dev_core_4029
Eileen McNaughton [Fri, 31 Mar 2023 01:39:08 +0000 (14:39 +1300)]
Merge pull request #25963 from seamuslee001/dev_core_4029

dev/core#4029 Ensure that Pan Truncation and card type id is recorded…

20 months agoMerge pull request #25964 from eileenmcnaughton/mem_regress
Eileen McNaughton [Fri, 31 Mar 2023 01:36:24 +0000 (14:36 +1300)]
Merge pull request #25964 from eileenmcnaughton/mem_regress

Fix master-only regression on loading membership changes