civicrm-core.git
23 months ago(Ref) Remove unused dynamic property in report form class
Bradley Taylor [Tue, 14 Mar 2023 21:19:40 +0000 (21:19 +0000)]
(Ref) Remove unused dynamic property in report form class

23 months agoMerge pull request #25805 from mlutfy/homeBreadcrumb
demeritcowboy [Tue, 14 Mar 2023 04:42:45 +0000 (00:42 -0400)]
Merge pull request #25805 from mlutfy/homeBreadcrumb

Logging ReportDetail: update breadcrumb to use CiviCRM Home for disambiguation

23 months agoLogging ReportDetail: update breadcrumb to use CiviCRM Home for disambiguation with...
Mathieu Lutfy [Mon, 13 Mar 2023 17:26:46 +0000 (13:26 -0400)]
Logging ReportDetail: update breadcrumb to use CiviCRM Home for disambiguation with the Home location type translation

23 months agoMerge pull request #25803 from mattwire/casedates
demeritcowboy [Mon, 13 Mar 2023 22:59:52 +0000 (18:59 -0400)]
Merge pull request #25803 from mattwire/casedates

Case start_date/end_date are not datetime

23 months agoMerge pull request #25804 from colemanw/contributionRecurAutocomplete
Eileen McNaughton [Mon, 13 Mar 2023 21:56:59 +0000 (10:56 +1300)]
Merge pull request #25804 from colemanw/contributionRecurAutocomplete

APIv4 - Autocomplete ContributionRecur entity

23 months agoFix startdate/enddate schema for case DAO - they are date only
Matthew Wire [Mon, 13 Mar 2023 09:43:44 +0000 (09:43 +0000)]
Fix startdate/enddate schema for case DAO - they are date only

23 months agoMerge pull request #25796 from demeritcowboy/cachetest
Seamus Lee [Mon, 13 Mar 2023 20:46:06 +0000 (07:46 +1100)]
Merge pull request #25796 from demeritcowboy/cachetest

Remove dependence on cache/integration-tests

23 months agoMerge pull request #24819 from colemanw/searchKitHelp
colemanw [Mon, 13 Mar 2023 15:32:25 +0000 (11:32 -0400)]
Merge pull request #24819 from colemanw/searchKitHelp

SearchKit - POC help text

23 months agoSearchKit - Add help text
shaneonabike [Mon, 13 Mar 2023 15:30:12 +0000 (11:30 -0400)]
SearchKit - Add help text

23 months agoSearchKit - POC help text
Coleman Watts [Tue, 25 Oct 2022 22:49:39 +0000 (18:49 -0400)]
SearchKit - POC help text

23 months agoAPIv4 - Autocomplete ContributionRecur entity
Coleman Watts [Mon, 13 Mar 2023 15:02:22 +0000 (11:02 -0400)]
APIv4 - Autocomplete ContributionRecur entity

23 months agoMerge pull request #25800 from eileenmcnaughton/82_sql
Eileen McNaughton [Mon, 13 Mar 2023 06:24:25 +0000 (19:24 +1300)]
Merge pull request #25800 from eileenmcnaughton/82_sql

Php8.2 fixes in report `addToDeveloperTab` function

23 months agoPhp8.2 fixes in report addToDeveloperTab function
Eileen McNaughton [Sun, 12 Mar 2023 23:10:27 +0000 (12:10 +1300)]
Php8.2 fixes in report addToDeveloperTab function

23 months agoMerge pull request #25797 from eileenmcnaughton/php82
demeritcowboy [Sun, 12 Mar 2023 23:54:51 +0000 (19:54 -0400)]
Merge pull request #25797 from eileenmcnaughton/php82

Php8.2 fixes in unit tests

23 months agoMerge pull request #25798 from eileenmcnaughton/php82-2
Seamus Lee [Sun, 12 Mar 2023 22:58:41 +0000 (09:58 +1100)]
Merge pull request #25798 from eileenmcnaughton/php82-2

[NFC] cleanup in `ChangeFeeSelectionTest`

23 months agoPhp8.2 fix in test
Eileen McNaughton [Sun, 12 Mar 2023 22:46:46 +0000 (11:46 +1300)]
Php8.2 fix in test

23 months ago[NFC] cleanup in ChangeFeeSelectionTest
Eileen McNaughton [Sun, 12 Mar 2023 22:10:34 +0000 (11:10 +1300)]
[NFC] cleanup in ChangeFeeSelectionTest

23 months agoremove dependence on cache/integration-tests
demeritcowboy [Sun, 12 Mar 2023 20:48:48 +0000 (16:48 -0400)]
remove dependence on cache/integration-tests

23 months agoMerge pull request #25795 from braders/pageparams
Eileen McNaughton [Sun, 12 Mar 2023 20:55:16 +0000 (09:55 +1300)]
Merge pull request #25795 from braders/pageparams

[REF][PHP8.2] Refactor use of pageParams properties

23 months agoMerge pull request #25792 from braders/php82-imtest
Eileen McNaughton [Sun, 12 Mar 2023 20:35:17 +0000 (09:35 +1300)]
Merge pull request #25792 from braders/php82-imtest

[REF][PHP8.2] Refactor api_v3_ImTest with primary aim of improving PHP 8.2 compatiability

23 months agoMerge pull request #25793 from braders/PriceFieldValueTest
Eileen McNaughton [Sun, 12 Mar 2023 20:30:50 +0000 (09:30 +1300)]
Merge pull request #25793 from braders/PriceFieldValueTest

[REF][PHP8.2] Refactor api_v3_PriceFieldValueTest with primary aim of improving PHP 8.2 compatiability

23 months agoMerge pull request #25794 from braders/unused-onpopupclose
Eileen McNaughton [Sun, 12 Mar 2023 20:25:00 +0000 (09:25 +1300)]
Merge pull request #25794 from braders/unused-onpopupclose

(REF) Remove unused onPopupClose variables

23 months agoMerge pull request #25791 from braders/deprecated-self-callables-dedupe
Eileen McNaughton [Sun, 12 Mar 2023 20:18:47 +0000 (09:18 +1300)]
Merge pull request #25791 from braders/deprecated-self-callables-dedupe

[REF][PHP8.2] Fix use of self in callables deprecation

23 months ago[REF][PHP8.2] Refactor use of pageParams properties
Bradley Taylor [Sun, 12 Mar 2023 18:07:14 +0000 (18:07 +0000)]
[REF][PHP8.2] Refactor use of pageParams properties

23 months agoRemove unused onPopupClose variables
Bradley Taylor [Sun, 12 Mar 2023 16:45:27 +0000 (16:45 +0000)]
Remove unused onPopupClose variables

23 months ago[REF][PHP8.2] Refactor api_v3_PriceFieldValueTest with primary aim of improving PHP...
Bradley Taylor [Sun, 12 Mar 2023 10:55:47 +0000 (10:55 +0000)]
[REF][PHP8.2] Refactor api_v3_PriceFieldValueTest with primary aim of improving PHP 8.2 compatiability

23 months ago[REF][PHP8.2] Refactor api_v3_ImTest with primary aim of improving PHP 8.2 compatiability
Bradley Taylor [Sun, 12 Mar 2023 10:35:02 +0000 (10:35 +0000)]
[REF][PHP8.2] Refactor api_v3_ImTest with primary aim of improving PHP 8.2 compatiability

23 months ago[REF][PHP8.2] Fix use of self in callables deprecation
Bradley Taylor [Sun, 12 Mar 2023 10:18:27 +0000 (10:18 +0000)]
[REF][PHP8.2] Fix use of self in callables deprecation

23 months agoMerge pull request #25786 from totten/master-setver-warning
Eileen McNaughton [Sun, 12 Mar 2023 02:15:55 +0000 (15:15 +1300)]
Merge pull request #25786 from totten/master-setver-warning

set-version.php - Fix warning on PHP 8.1

23 months agoMerge pull request #25788 from braders/errortest-php82
Seamus Lee [Sat, 11 Mar 2023 23:21:58 +0000 (10:21 +1100)]
Merge pull request #25788 from braders/errortest-php82

[REF][PHP8.2] Declare property on CRM_Core_ErrorTest

23 months agoMerge pull request #25789 from braders/participantTest-dynamic-property
Seamus Lee [Sat, 11 Mar 2023 23:21:47 +0000 (10:21 +1100)]
Merge pull request #25789 from braders/participantTest-dynamic-property

[REF][PHP8.2] Declare property on CRM_Event_Import_Parser_ParticipantTest

23 months ago[REF][PHP8.2] Declare property on CRM_Event_Import_Parser_ParticipantTest
Bradley Taylor [Sat, 11 Mar 2023 11:20:44 +0000 (11:20 +0000)]
[REF][PHP8.2] Declare property on CRM_Event_Import_Parser_ParticipantTest

23 months ago[REF][PHP8.2] Declare property on CRM_Core_ErrorTest
Bradley Taylor [Sat, 11 Mar 2023 11:17:10 +0000 (11:17 +0000)]
[REF][PHP8.2] Declare property on CRM_Core_ErrorTest

23 months agoMerge pull request #25657 from eileenmcnaughton/dynamic
Eileen McNaughton [Sat, 11 Mar 2023 03:31:11 +0000 (16:31 +1300)]
Merge pull request #25657 from eileenmcnaughton/dynamic

dev/core#4144 Fix smarty notice on isDuplicate

23 months agoMerge pull request #16 from lemniscus/smarty-notices-profile-dynamic
Eileen McNaughton [Sat, 11 Mar 2023 02:11:02 +0000 (15:11 +1300)]
Merge pull request #16 from lemniscus/smarty-notices-profile-dynamic

fix notice in non-dialog mode too, make var name clearer, fix another notice

23 months agoeliminate notice in non-dialog mode too, make var name clearer, fix another couple...
Noah Miller [Sat, 11 Mar 2023 00:59:23 +0000 (19:59 -0500)]
eliminate notice in non-dialog mode too, make var name clearer, fix another couple notices

23 months agoset-version.php - Fix warning on PHP 8.1
Tim Otten [Sat, 11 Mar 2023 00:32:09 +0000 (16:32 -0800)]
set-version.php - Fix warning on PHP 8.1

The `$sqlFile` may or may not be needed, which produces a warning:

```
Deprecated: file_exists(): Passing null to parameter #1 ($filename) of type string is deprecated in
/.../tools/bin/scripts/set-version.php on line 105
```

23 months agoMerge pull request #25781 from colemanw/deprecateConstants
Eileen McNaughton [Fri, 10 Mar 2023 22:38:15 +0000 (11:38 +1300)]
Merge pull request #25781 from colemanw/deprecateConstants

APIv4 - Deprecate unnecessary constants

23 months agoMerge pull request #25783 from seamuslee001/php82_mailing_contact
Eileen McNaughton [Fri, 10 Mar 2023 22:01:47 +0000 (11:01 +1300)]
Merge pull request #25783 from seamuslee001/php82_mailing_contact

[NFC] Fix PHP8.2 issues in the Mailing Contact Test

23 months ago[NFC] Fix PHP8.2 issues in the Mailing Contact Test
Seamus Lee [Fri, 10 Mar 2023 20:55:20 +0000 (07:55 +1100)]
[NFC] Fix PHP8.2 issues in the Mailing Contact Test

23 months agoAPIv4 - Deprecate unnecessary constants
Coleman Watts [Fri, 10 Mar 2023 20:25:46 +0000 (15:25 -0500)]
APIv4 - Deprecate unnecessary constants

23 months agoMerge pull request #25774 from eileenmcnaughton/import_cache
Eileen McNaughton [Fri, 10 Mar 2023 04:06:06 +0000 (17:06 +1300)]
Merge pull request #25774 from eileenmcnaughton/import_cache

Fix cache clearing when import table is changed

23 months agoFix cache clearing when import table is changed
Eileen McNaughton [Thu, 9 Mar 2023 04:31:35 +0000 (17:31 +1300)]
Fix cache clearing when import table is changed

23 months agoMerge pull request #25527 from eileenmcnaughton/finder_build
Eileen McNaughton [Fri, 10 Mar 2023 01:07:46 +0000 (14:07 +1300)]
Merge pull request #25527 from eileenmcnaughton/finder_build

Fix dedupe finder performance issue on looking up table size

23 months agoMerge pull request #25712 from eileenmcnaughton/import_link
Eileen McNaughton [Fri, 10 Mar 2023 01:07:31 +0000 (14:07 +1300)]
Merge pull request #25712 from eileenmcnaughton/import_link

Import link - fix search Import SearchDisplays to link to the created contact

23 months agoMerge pull request #25474 from eileenmcnaughton/civi-import
colemanw [Fri, 10 Mar 2023 00:27:30 +0000 (19:27 -0500)]
Merge pull request #25474 from eileenmcnaughton/civi-import

Hyphenate Civi-Import in the title/label

23 months agoCivi-Import Add fk joinable to api spec
Coleman Watts [Thu, 9 Mar 2023 23:46:41 +0000 (18:46 -0500)]
Civi-Import Add fk joinable to api spec

23 months agoMerge pull request #25187 from totten/master-civiunit-more
Eileen McNaughton [Thu, 9 Mar 2023 22:53:48 +0000 (11:53 +1300)]
Merge pull request #25187 from totten/master-civiunit-more

CiviUnitTestCase - More aggressive simplifications

23 months agoMerge pull request #25677 from colemanw/noisyDeprecate
Eileen McNaughton [Thu, 9 Mar 2023 22:45:57 +0000 (11:45 +1300)]
Merge pull request #25677 from colemanw/noisyDeprecate

BAO - Noisily deprecate and stop using deprecated functions

23 months agoMerge pull request #25749 from eileenmcnaughton/retreive
Tim Otten [Thu, 9 Mar 2023 22:31:28 +0000 (14:31 -0800)]
Merge pull request #25749 from eileenmcnaughton/retreive

[REF] Improve function signature for `retrieve()` in `PaypalProIPN` , add test for when trxn_id is present

23 months agoBAO - Noisily deprecate and stop using deprecated functions
Coleman Watts [Mon, 27 Feb 2023 22:13:33 +0000 (17:13 -0500)]
BAO - Noisily deprecate and stop using deprecated functions

23 months agoMerge pull request #25770 from colemanw/replaceWithMatch
Eileen McNaughton [Thu, 9 Mar 2023 20:30:40 +0000 (09:30 +1300)]
Merge pull request #25770 from colemanw/replaceWithMatch

APIv4 - Support `match` in replaceAction

23 months agoMerge pull request #25768 from eileenmcnaughton/dep2
Eileen McNaughton [Thu, 9 Mar 2023 20:26:55 +0000 (09:26 +1300)]
Merge pull request #25768 from eileenmcnaughton/dep2

Remove function deprecated noisly in 2020

23 months agoMerge pull request #25028 from MegaphoneJon/bad-pseudoconstants-api4
colemanw [Thu, 9 Mar 2023 17:18:45 +0000 (12:18 -0500)]
Merge pull request #25028 from MegaphoneJon/bad-pseudoconstants-api4

Don't crash API4 if pseudoconstant lookups return nothing

23 months agoMerge pull request #25773 from colemanw/allYourBase
colemanw [Thu, 9 Mar 2023 16:14:52 +0000 (11:14 -0500)]
Merge pull request #25773 from colemanw/allYourBase

All your base are deleted

23 months agoAll your base are deleted
Coleman Watts [Thu, 9 Mar 2023 14:08:10 +0000 (09:08 -0500)]
All your base are deleted

23 months agoMerge pull request #25767 from eileenmcnaughton/dep
colemanw [Thu, 9 Mar 2023 13:35:01 +0000 (08:35 -0500)]
Merge pull request #25767 from eileenmcnaughton/dep

More deprecations of `del`

23 months agoMerge pull request #25771 from eileenmcnaughton/datasource
Yashodha Chaku [Thu, 9 Mar 2023 06:36:33 +0000 (12:06 +0530)]
Merge pull request #25771 from eileenmcnaughton/datasource

Consolidate `DataSource.tpl`

23 months agoMerge pull request #25772 from lemniscus/smarty-notice-merge
Eileen McNaughton [Thu, 9 Mar 2023 06:26:00 +0000 (19:26 +1300)]
Merge pull request #25772 from lemniscus/smarty-notice-merge

Smarty notice fix on Merge

23 months agoSmarty notice fix on Merge
Noah Miller [Thu, 9 Mar 2023 03:43:09 +0000 (22:43 -0500)]
Smarty notice fix on Merge

23 months agoConsolidate DataSource.tpl
Eileen McNaughton [Thu, 9 Mar 2023 03:22:20 +0000 (16:22 +1300)]
Consolidate DataSource.tpl

23 months agoAPIv4 - Support `match` in replaceAction
Coleman Watts [Thu, 9 Mar 2023 02:39:20 +0000 (21:39 -0500)]
APIv4 - Support `match` in replaceAction

This allows the replaceAction to support non-id matching, the same way as the saveAction does.
Fixes dev/core#4168

23 months agoMerge pull request #25763 from eileenmcnaughton/coleman
colemanw [Thu, 9 Mar 2023 02:10:27 +0000 (21:10 -0500)]
Merge pull request #25763 from eileenmcnaughton/coleman

Deprecate pledge_payment::del

23 months agoMerge pull request #25766 from eileenmcnaughton/coleman2
colemanw [Thu, 9 Mar 2023 02:08:45 +0000 (21:08 -0500)]
Merge pull request #25766 from eileenmcnaughton/coleman2

Remove deprecated calls from contribute, financial, remove ManagePremiums deprecated BAO

23 months agoRemove function deprecated noisly in 2020
Eileen McNaughton [Thu, 9 Mar 2023 00:23:19 +0000 (13:23 +1300)]
Remove function deprecated noisly in 2020

23 months agoMore deprecations
Eileen McNaughton [Thu, 9 Mar 2023 00:20:41 +0000 (13:20 +1300)]
More deprecations

23 months agoRemove deprecated calls from contribute, financial, remove ManagePremiums deprecated BAO
Eileen McNaughton [Wed, 8 Mar 2023 23:01:34 +0000 (12:01 +1300)]
Remove deprecated calls from contribute, financial, remove ManagePremiums deprecated BAO

23 months agoDeprecate pledge_payment::del
Eileen McNaughton [Wed, 8 Mar 2023 20:45:09 +0000 (09:45 +1300)]
Deprecate pledge_payment::del

23 months agoMerge pull request #25764 from eileenmcnaughton/coleman2
colemanw [Wed, 8 Mar 2023 22:05:04 +0000 (17:05 -0500)]
Merge pull request #25764 from eileenmcnaughton/coleman2

Deprecations on del functions

23 months agoMerge pull request #25765 from eileenmcnaughton/coleman_rel
colemanw [Wed, 8 Mar 2023 22:04:46 +0000 (17:04 -0500)]
Merge pull request #25765 from eileenmcnaughton/coleman_rel

Deprecate relationship::del

23 months agoDeprecate relationship::del
Eileen McNaughton [Wed, 8 Mar 2023 20:58:17 +0000 (09:58 +1300)]
Deprecate relationship::del

23 months agoDeprecations on del functions
Eileen McNaughton [Wed, 8 Mar 2023 20:53:57 +0000 (09:53 +1300)]
Deprecations on del functions

23 months agoMerge pull request #25762 from colemanw/noisyDep
Eileen McNaughton [Wed, 8 Mar 2023 19:48:57 +0000 (08:48 +1300)]
Merge pull request #25762 from colemanw/noisyDep

Noisily deprecate unused function

23 months agoMerge pull request #25666 from kurund/file-validations-formbuilder
colemanw [Wed, 8 Mar 2023 16:26:46 +0000 (11:26 -0500)]
Merge pull request #25666 from kurund/file-validations-formbuilder

dev/core#4121 Afform: add validation for file fields in formbuilder

23 months agoNoisily deprecate unused function
Coleman Watts [Wed, 8 Mar 2023 15:57:19 +0000 (10:57 -0500)]
Noisily deprecate unused function

23 months agoMerge pull request #25674 from colemanw/apiUpdateTest
Matthew Wire [Wed, 8 Mar 2023 15:53:30 +0000 (15:53 +0000)]
Merge pull request #25674 from colemanw/apiUpdateTest

APIv4 - Add 'Update' to conformanceTest

23 months agoMerge pull request #25752 from eileenmcnaughton/cust_it
colemanw [Wed, 8 Mar 2023 15:45:13 +0000 (10:45 -0500)]
Merge pull request #25752 from eileenmcnaughton/cust_it

Remove remaining non-variable variables

23 months agoMerge pull request #25761 from seamuslee001/regen_561
demeritcowboy [Wed, 8 Mar 2023 15:24:26 +0000 (10:24 -0500)]
Merge pull request #25761 from seamuslee001/regen_561

Regen after civicrm-core#24735

23 months agoRegen after civicrm-core#24735
Seamus Lee [Wed, 8 Mar 2023 06:52:43 +0000 (17:52 +1100)]
Regen after civicrm-core#24735

23 months agoMerge pull request #24735 from agileware/CIVICRM-2052
Eileen McNaughton [Wed, 8 Mar 2023 06:19:50 +0000 (19:19 +1300)]
Merge pull request #24735 from agileware/CIVICRM-2052

🪥 Fix inconsistent terminology used when referring to Member Since, Membership Start Date and Membership Expiration Date

23 months agoMerge pull request #25760 from civicrm/5.60
Eileen McNaughton [Wed, 8 Mar 2023 03:39:10 +0000 (16:39 +1300)]
Merge pull request #25760 from civicrm/5.60

5.60 to master

23 months agoMerge pull request #25758 from eileenmcnaughton/560
Eileen McNaughton [Wed, 8 Mar 2023 03:38:41 +0000 (16:38 +1300)]
Merge pull request #25758 from eileenmcnaughton/560

Load submitted `fieldSeparator` on back on `Import Datasource` screen

23 months agoMerge pull request #25681 from agileware/CIVICRM-2103
demeritcowboy [Wed, 8 Mar 2023 02:58:58 +0000 (21:58 -0500)]
Merge pull request #25681 from agileware/CIVICRM-2103

dev/core/-/issues/4149 Change CKEditor 4 default to not encode HTML entities by default which breaks Smarty syntax and prevents use of crmDate function

23 months agoMerge pull request #25757 from eileenmcnaughton/import_table
demeritcowboy [Wed, 8 Mar 2023 02:51:19 +0000 (21:51 -0500)]
Merge pull request #25757 from eileenmcnaughton/import_table

Code cleanup: Use `parent::buildForm` in contact import dataSource screen

23 months agoLoad submitted fieldSeparator on back on Import Datasource screen
Eileen McNaughton [Wed, 8 Mar 2023 02:15:39 +0000 (15:15 +1300)]
Load submitted fieldSeparator on back on Import Datasource screen

23 months agoMerge pull request #25751 from MegaphoneJon/relationship-cache-check
colemanw [Wed, 8 Mar 2023 02:11:11 +0000 (21:11 -0500)]
Merge pull request #25751 from MegaphoneJon/relationship-cache-check

Relationship Cache check

23 months agoUse parent::buildForm in contact import dataSource screen
Eileen McNaughton [Wed, 8 Mar 2023 01:04:48 +0000 (14:04 +1300)]
Use parent::buildForm in contact import dataSource screen

23 months agoMerge pull request #25700 from eileenmcnaughton/address
colemanw [Wed, 8 Mar 2023 00:45:47 +0000 (19:45 -0500)]
Merge pull request #25700 from eileenmcnaughton/address

Change title of is_primary fields consistent with Email

23 months agoMerge pull request #25750 from colemanw/ParticipantStatusType
Eileen McNaughton [Wed, 8 Mar 2023 00:36:14 +0000 (13:36 +1300)]
Merge pull request #25750 from colemanw/ParticipantStatusType

APIv4 - Add ParticipantStatusType entity

23 months agoHyphenate Civi-Import in the name
Eileen McNaughton [Tue, 31 Jan 2023 04:43:32 +0000 (17:43 +1300)]
Hyphenate Civi-Import in the name

23 months agodev/core#4144 Fix smarty notice on isDuplicate
Eileen McNaughton [Thu, 23 Feb 2023 23:59:30 +0000 (12:59 +1300)]
dev/core#4144 Fix smarty notice on isDuplicate

23 months agoFix performance on deciding which tables to query
Eileen McNaughton [Wed, 8 Feb 2023 04:56:22 +0000 (17:56 +1300)]
Fix performance on deciding which tables to query

23 months agoMerge pull request #25294 from colemanw/afformFileReupload
Eileen McNaughton [Wed, 8 Mar 2023 00:11:09 +0000 (13:11 +1300)]
Merge pull request #25294 from colemanw/afformFileReupload

Afform - Show file field values for existing entities

23 months agoMerge pull request #25756 from demeritcowboy/separator
demeritcowboy [Tue, 7 Mar 2023 23:53:17 +0000 (18:53 -0500)]
Merge pull request #25756 from demeritcowboy/separator

revert 25735

23 months agoMerge pull request #25755 from civicrm/5.60
Eileen McNaughton [Tue, 7 Mar 2023 23:06:03 +0000 (12:06 +1300)]
Merge pull request #25755 from civicrm/5.60

5.60

23 months agorevert 25735
demeritcowboy [Tue, 7 Mar 2023 22:37:36 +0000 (17:37 -0500)]
revert 25735

23 months agoMerge pull request #25753 from MegaphoneJon/two-field-separators-3
Eileen McNaughton [Tue, 7 Mar 2023 22:21:55 +0000 (11:21 +1300)]
Merge pull request #25753 from MegaphoneJon/two-field-separators-3

Remove the correct extraneous field separator field

23 months agoMerge pull request #25719 from eileenmcnaughton/quick_config
colemanw [Tue, 7 Mar 2023 20:11:39 +0000 (15:11 -0500)]
Merge pull request #25719 from eileenmcnaughton/quick_config

Unconditionally assign `quickConfig`, add helper for `getPriceSetID`

23 months agoRemove the correct extraneous field separator field
Jon Goldberg [Mon, 6 Mar 2023 19:47:38 +0000 (14:47 -0500)]
Remove the correct extraneous field separator field

23 months agoRelationship Cache check
Jon Goldberg [Tue, 7 Mar 2023 19:22:05 +0000 (14:22 -0500)]
Relationship Cache check