civicrm-core.git
19 months agoMerge pull request #26040 from eileenmcnaughton/pmf
demeritcowboy [Tue, 11 Apr 2023 13:29:57 +0000 (09:29 -0400)]
Merge pull request #26040 from eileenmcnaughton/pmf

Remove almost all remaining handling for preferred_mail_format

19 months agoRemove almost all remaining handling for preferred_mail_format
Eileen McNaughton [Mon, 10 Apr 2023 22:55:07 +0000 (10:55 +1200)]
Remove almost all remaining handling for preferred_mail_format

This just mops up the handling, with the exception of the UFGroup function that
renders the profile (buildProfile) as we maybe need an upgrade script for that?

19 months agoMerge pull request #26038 from demeritcowboy/casetype-copypaste
demeritcowboy [Mon, 10 Apr 2023 22:13:24 +0000 (18:13 -0400)]
Merge pull request #26038 from demeritcowboy/casetype-copypaste

This doesn't belong here

19 months agoMerge pull request #26020 from eileenmcnaughton/pref_mail_form
demeritcowboy [Mon, 10 Apr 2023 22:10:41 +0000 (18:10 -0400)]
Merge pull request #26020 from eileenmcnaughton/pref_mail_form

Remove traces of preferred mail format from communication preferences

19 months agothis doesn't belong here
demeritcowboy [Mon, 10 Apr 2023 21:06:36 +0000 (17:06 -0400)]
this doesn't belong here

19 months agoMerge pull request #25984 from colemanw/deprecateRetrieve
Eileen McNaughton [Mon, 10 Apr 2023 20:29:08 +0000 (08:29 +1200)]
Merge pull request #25984 from colemanw/deprecateRetrieve

REF - Noisily deprecate BAO::retrieve functions

19 months agoMerge pull request #26037 from demeritcowboy/case-activity-form-revision
Matthew Wire [Mon, 10 Apr 2023 18:57:05 +0000 (19:57 +0100)]
Merge pull request #26037 from demeritcowboy/case-activity-form-revision

dev/core#4220 - Remove is_current_revision code that is buggy because it gets overwritten later, and we don't want it anymore anyway

19 months agothis doesn't do anything because it gets overwritten later, and we no longer want...
demeritcowboy [Mon, 10 Apr 2023 17:59:51 +0000 (13:59 -0400)]
this doesn't do anything because it gets overwritten later, and we no longer want it anyway

19 months agoMerge pull request #26025 from colemanw/removeDeprecatedClasses
Yashodha Chaku [Mon, 10 Apr 2023 18:19:02 +0000 (23:49 +0530)]
Merge pull request #26025 from colemanw/removeDeprecatedClasses

Remove old deprecated class aliases

19 months agoMerge pull request #26031 from colemanw/cleanupCoreComponent
demeritcowboy [Mon, 10 Apr 2023 15:00:22 +0000 (11:00 -0400)]
Merge pull request #26031 from colemanw/cleanupCoreComponent

[REF] CoreComponent - Standardize on isEnabled function and remove unused code

19 months agoCoreComponent - Fix errors when fetching component name/id
Coleman Watts [Mon, 10 Apr 2023 13:31:50 +0000 (09:31 -0400)]
CoreComponent - Fix errors when fetching component name/id

19 months agoMerge pull request #26032 from eileenmcnaughton/i_am_hu
colemanw [Mon, 10 Apr 2023 13:07:10 +0000 (09:07 -0400)]
Merge pull request #26032 from eileenmcnaughton/i_am_hu

I am Hu

19 months agoMerge pull request #26034 from braders/property-petition-bao
demeritcowboy [Mon, 10 Apr 2023 11:50:17 +0000 (07:50 -0400)]
Merge pull request #26034 from braders/property-petition-bao

[REF][PHP8.2] Add cookieExpire property to CRM_Campaign_BAO_Petition

19 months agoMerge pull request #26035 from braders/phpdoc-fixes-5
demeritcowboy [Mon, 10 Apr 2023 11:49:25 +0000 (07:49 -0400)]
Merge pull request #26035 from braders/phpdoc-fixes-5

(NFC) PHPdoc fixes and improvements

19 months agoMerge pull request #26033 from eileenmcnaughton/phpcs
demeritcowboy [Mon, 10 Apr 2023 11:47:27 +0000 (07:47 -0400)]
Merge pull request #26033 from eileenmcnaughton/phpcs

Minor fixes around linting

19 months agoMerge pull request #26018 from eileenmcnaughton/test_contact
Matthew Wire [Mon, 10 Apr 2023 10:38:16 +0000 (11:38 +0100)]
Merge pull request #26018 from eileenmcnaughton/test_contact

dev/core#1340 - Test + fix for contact get using custom field param + special characters

19 months ago(NFC) PHPdoc fixes and improvements
Bradley Taylor [Mon, 10 Apr 2023 09:00:24 +0000 (10:00 +0100)]
(NFC) PHPdoc fixes and improvements

19 months ago[REF][PHP8.2] Add cookieExpire property to CRM_Campaign_BAO_Petition
Bradley Taylor [Mon, 10 Apr 2023 08:52:27 +0000 (09:52 +0100)]
[REF][PHP8.2] Add cookieExpire property to CRM_Campaign_BAO_Petition

19 months agoMinor fixes around linting
Eileen McNaughton [Mon, 10 Apr 2023 04:49:28 +0000 (16:49 +1200)]
Minor fixes around linting

19 months agoI am Hu
Eileen McNaughton [Mon, 10 Apr 2023 04:47:29 +0000 (16:47 +1200)]
I am Hu

19 months agoMerge pull request #25945 from MegaphoneJon/participant-role-id-fix
Eileen McNaughton [Mon, 10 Apr 2023 00:16:52 +0000 (12:16 +1200)]
Merge pull request #25945 from MegaphoneJon/participant-role-id-fix

fix import of participant role ID

19 months agoCoreComponent - Standardize on isEnabled function and remove unused code
Coleman Watts [Sun, 9 Apr 2023 03:50:36 +0000 (23:50 -0400)]
CoreComponent - Standardize on isEnabled function and remove unused code

19 months agoMerge pull request #26028 from colemanw/afFieldDefaults
colemanw [Sat, 8 Apr 2023 23:26:02 +0000 (19:26 -0400)]
Merge pull request #26028 from colemanw/afFieldDefaults

Afform - support field defaults from the url even when in a popup

19 months agoMerge pull request #26030 from colemanw/fixAfformWysiwyg
colemanw [Sat, 8 Apr 2023 23:25:44 +0000 (19:25 -0400)]
Merge pull request #26030 from colemanw/fixAfformWysiwyg

Fix broken wysiwyg fields in Afforms due to timing issue

19 months agoFix broken wysiwyg fields in Afforms due to timing issue
Coleman Watts [Sat, 8 Apr 2023 21:10:26 +0000 (17:10 -0400)]
Fix broken wysiwyg fields in Afforms due to timing issue

19 months agoMerge pull request #26019 from eileenmcnaughton/pref_mail
colemanw [Sat, 8 Apr 2023 19:46:09 +0000 (15:46 -0400)]
Merge pull request #26019 from eileenmcnaughton/pref_mail

Remove references to preferred_mail_format from examples

19 months agoMerge pull request #26014 from eileenmcnaughton/contact_order
colemanw [Sat, 8 Apr 2023 17:36:08 +0000 (13:36 -0400)]
Merge pull request #26014 from eileenmcnaughton/contact_order

Re-order Contact fields in table,DAO

19 months agoMerge pull request #26023 from eileenmcnaughton/phpcs
colemanw [Sat, 8 Apr 2023 17:13:43 +0000 (13:13 -0400)]
Merge pull request #26023 from eileenmcnaughton/phpcs

Update a few references to `list()`

19 months agoAfform - support field defaults from the url even when in a popup
Coleman Watts [Sat, 8 Apr 2023 16:45:08 +0000 (12:45 -0400)]
Afform - support field defaults from the url even when in a popup

When in the context of a poup dialog the routeParams are not passed in from the url
and must be accessed through $scope.

19 months agoRemove old deprecated class aliases
Coleman Watts [Fri, 7 Apr 2023 14:13:59 +0000 (10:13 -0400)]
Remove old deprecated class aliases

19 months agoMerge pull request #26024 from eileenmcnaughton/phpcs2
colemanw [Fri, 7 Apr 2023 18:42:12 +0000 (14:42 -0400)]
Merge pull request #26024 from eileenmcnaughton/phpcs2

Remove some uses of legacy array format (`array()`)

19 months agoMerge pull request #26022 from eileenmcnaughton/clarify_return
colemanw [Fri, 7 Apr 2023 15:48:39 +0000 (11:48 -0400)]
Merge pull request #26022 from eileenmcnaughton/clarify_return

Clarify return on `BAO_Activity::create`

19 months agoMerge pull request #26021 from eileenmcnaughton/query_dep
colemanw [Fri, 7 Apr 2023 14:05:14 +0000 (10:05 -0400)]
Merge pull request #26021 from eileenmcnaughton/query_dep

Remvoe a long-deprecated bit of code

19 months agoA few more array style cleanups
Eileen McNaughton [Fri, 7 Apr 2023 04:09:30 +0000 (16:09 +1200)]
A few more array style cleanups

19 months agoRemove some uses of legacy array format
Eileen McNaughton [Fri, 7 Apr 2023 04:06:41 +0000 (16:06 +1200)]
Remove some uses of legacy array format

19 months agoUpdate a few references to list()
Eileen McNaughton [Fri, 7 Apr 2023 03:41:52 +0000 (15:41 +1200)]
Update a few references to list()

19 months agoClarify return on BAO_Activity::create
Eileen McNaughton [Fri, 7 Apr 2023 02:06:03 +0000 (14:06 +1200)]
Clarify return on BAO_Activity::create

19 months agoRemvoe a long-deprecated bit of code
Eileen McNaughton [Fri, 7 Apr 2023 01:41:22 +0000 (13:41 +1200)]
Remvoe a long-deprecated bit of code

19 months agoFix for double escaping of custom field values
Eileen McNaughton [Thu, 6 Apr 2023 23:04:07 +0000 (11:04 +1200)]
Fix for double escaping of custom field values

19 months agodev/core#1340 - Test contact get using custom field param + special character.
Ian Wilson [Thu, 17 Feb 2022 21:48:52 +0000 (16:48 -0500)]
dev/core#1340 - Test contact get using custom field param + special character.

19 months agoFix tests for re-ordering
Eileen McNaughton [Fri, 7 Apr 2023 00:07:19 +0000 (12:07 +1200)]
Fix tests for re-ordering

19 months agoRe-order Contact fields in table,DAO
Eileen McNaughton [Thu, 6 Apr 2023 04:57:04 +0000 (16:57 +1200)]
Re-order Contact fields in table,DAO

19 months agoRemove traces of preferred mail format from communication preferences
Eileen McNaughton [Thu, 6 Apr 2023 23:56:03 +0000 (11:56 +1200)]
Remove traces of preferred mail format from communication preferences

19 months agoRemove references to preferred_mail_format from examples
Eileen McNaughton [Thu, 6 Apr 2023 23:52:51 +0000 (11:52 +1200)]
Remove references to preferred_mail_format from examples

Just reduces confusion / grep results.

Technically it still is returned at this stage but these
examples are kinda static now

19 months agoMerge pull request #26009 from colemanw/customSpec
Eileen McNaughton [Thu, 6 Apr 2023 23:42:43 +0000 (11:42 +1200)]
Merge pull request #26009 from colemanw/customSpec

APIv4 - Fix customValue fieldSpec to include input types & labels

19 months agoMerge pull request #26017 from eileenmcnaughton/strtolower
Eileen McNaughton [Thu, 6 Apr 2023 23:07:06 +0000 (11:07 +1200)]
Merge pull request #26017 from eileenmcnaughton/strtolower

Use `mb_strtolower` rathter than `strtolower` to compare translated strings

19 months agoMerge pull request #26006 from colemanw/refContactType
Seamus Lee [Thu, 6 Apr 2023 22:46:24 +0000 (08:46 +1000)]
Merge pull request #26006 from colemanw/refContactType

REF - Update ContactType BAO to use writeRecord, deprecated add function

19 months agoMerge pull request #26016 from colemanw/MailingEventTrackableURL
Seamus Lee [Thu, 6 Apr 2023 22:44:39 +0000 (08:44 +1000)]
Merge pull request #26016 from colemanw/MailingEventTrackableURL

Mailing - Rename trackable URL entities for consistency and add APIv4

19 months agoUse mb_strtolower to compare translated strings
Eileen McNaughton [Thu, 6 Apr 2023 22:24:52 +0000 (10:24 +1200)]
Use mb_strtolower to compare translated strings

19 months agoMerge pull request #26007 from colemanw/relationshipTypeRef
Seamus Lee [Thu, 6 Apr 2023 22:11:00 +0000 (08:11 +1000)]
Merge pull request #26007 from colemanw/relationshipTypeRef

REF - Deprecate RelationshipType add function in favor of writeRecord

19 months agoMerge pull request #24671 from larssandergreen/fix-wrong-action-for-registration...
demeritcowboy [Thu, 6 Apr 2023 21:13:51 +0000 (17:13 -0400)]
Merge pull request #24671 from larssandergreen/fix-wrong-action-for-registration-edit-from-search-results

Fix lack of price set options for edit registration from search results

19 months agoMailing - Rename trackable URL entities for consistency and add APIv4
Coleman Watts [Thu, 6 Apr 2023 18:52:08 +0000 (14:52 -0400)]
Mailing - Rename trackable URL entities for consistency and add APIv4

19 months agoSet version to 5.62.alpha1
CiviCRM [Thu, 6 Apr 2023 05:19:03 +0000 (05:19 +0000)]
Set version to 5.62.alpha1

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 agoAPIv4 - Fix customValue fieldSpec to include input types & labels
Coleman Watts [Wed, 5 Apr 2023 18:53:53 +0000 (14:53 -0400)]
APIv4 - Fix customValue fieldSpec to include input types & labels

19 months agoREF - Update ContactType BAO to use writeRecord, deprecated add function
Coleman Watts [Wed, 5 Apr 2023 12:19:55 +0000 (08:19 -0400)]
REF - Update ContactType BAO to use writeRecord, deprecated add function

19 months agoREF - Deprecate RelationshipType add function in favor of writeRecord
Coleman Watts [Wed, 5 Apr 2023 12:59:52 +0000 (08:59 -0400)]
REF - Deprecate RelationshipType add function in favor of writeRecord

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 agofix import of participant role ID
Jon Goldberg [Tue, 28 Mar 2023 18:01:13 +0000 (14:01 -0400)]
fix import of participant role ID

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.

19 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

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

19 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

19 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

19 months agoREF - Noisily deprecate BAO::retrieve functions
Coleman Watts [Mon, 3 Apr 2023 00:38:35 +0000 (20:38 -0400)]
REF - Noisily deprecate BAO::retrieve functions

19 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...

19 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

19 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

19 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

19 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

19 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

19 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

19 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

19 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

19 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

19 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

19 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

19 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`

19 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

19 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

19 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