civicrm-core.git
2 years agoMerge pull request #24573 from civicrm/5.54
demeritcowboy [Tue, 20 Sep 2022 02:29:13 +0000 (22:29 -0400)]
Merge pull request #24573 from civicrm/5.54

5.54 to master

2 years agoMerge pull request #24566 from eileenmcnaughton/import_soft
colemanw [Tue, 20 Sep 2022 01:12:00 +0000 (21:12 -0400)]
Merge pull request #24566 from eileenmcnaughton/import_soft

Remove attempt to match on soft credit header

2 years agoMerge pull request #24551 from colemanw/autocompleteFix
Eileen McNaughton [Tue, 20 Sep 2022 01:10:51 +0000 (13:10 +1200)]
Merge pull request #24551 from colemanw/autocompleteFix

Afform - Fix "Existing" autocomplete field and add tests

2 years agoMerge pull request #24565 from braders/addtoparentclass-notices
Eileen McNaughton [Tue, 20 Sep 2022 01:10:32 +0000 (13:10 +1200)]
Merge pull request #24565 from braders/addtoparentclass-notices

Avoid PHP notices in Add Contacts to Household task

2 years agoMerge pull request #24571 from civicrm/5.54
Seamus Lee [Tue, 20 Sep 2022 00:49:46 +0000 (10:49 +1000)]
Merge pull request #24571 from civicrm/5.54

5.54

2 years agoMerge pull request #24568 from totten/master-nfc
Seamus Lee [Tue, 20 Sep 2022 00:34:48 +0000 (10:34 +1000)]
Merge pull request #24568 from totten/master-nfc

(NFC) Add various comments (ClassScanner, Config)

2 years agoMerge pull request #24570 from seamuslee001/fix_dismaker_typo
Seamus Lee [Tue, 20 Sep 2022 00:34:29 +0000 (10:34 +1000)]
Merge pull request #24570 from seamuslee001/fix_dismaker_typo

[NFC] Fix Typo in Dismaker list of core exts

2 years ago[NFC] Fix Typo in Dismaker list of core exts
Seamus Lee [Tue, 20 Sep 2022 00:32:35 +0000 (10:32 +1000)]
[NFC] Fix Typo in Dismaker list of core exts

2 years ago(NFC) CRM_Core_Config - Add discussion link
Tim Otten [Mon, 19 Sep 2022 22:56:50 +0000 (15:56 -0700)]
(NFC) CRM_Core_Config - Add discussion link

2 years ago(NFC) ClassScanner - More comments. Copy-edits.
Tim Otten [Mon, 19 Sep 2022 22:51:34 +0000 (15:51 -0700)]
(NFC) ClassScanner - More comments. Copy-edits.

2 years agoMerge pull request #24567 from civicrm/5.54
Eileen McNaughton [Mon, 19 Sep 2022 22:48:56 +0000 (10:48 +1200)]
Merge pull request #24567 from civicrm/5.54

5.54 to master

2 years agoMerge pull request #24563 from braders/remove-unused-variable-addtoparentclass
Eileen McNaughton [Mon, 19 Sep 2022 22:42:42 +0000 (10:42 +1200)]
Merge pull request #24563 from braders/remove-unused-variable-addtoparentclass

Remove unused variable

2 years agoMerge pull request #24560 from braders/mailing-browse-notice
Eileen McNaughton [Mon, 19 Sep 2022 22:13:31 +0000 (10:13 +1200)]
Merge pull request #24560 from braders/mailing-browse-notice

Stop PHP notice on Find Mailings page

2 years agoMerge pull request #24558 from braders/include-report-status-typo
Eileen McNaughton [Mon, 19 Sep 2022 22:13:12 +0000 (10:13 +1200)]
Merge pull request #24558 from braders/include-report-status-typo

Remove stray character in income report

2 years agoRemove attempt to match on soft credit header
Eileen McNaughton [Mon, 19 Sep 2022 21:48:51 +0000 (09:48 +1200)]
Remove attempt to match on soft credit header

2 years agoMerge pull request #24538 from eileenmcnaughton/import_temp_table
colemanw [Mon, 19 Sep 2022 21:44:03 +0000 (17:44 -0400)]
Merge pull request #24538 from eileenmcnaughton/import_temp_table

Stop removing Import tables during cache clearing

2 years agoMerge pull request #24546 from eileenmcnaughton/flush
colemanw [Mon, 19 Sep 2022 21:42:55 +0000 (17:42 -0400)]
Merge pull request #24546 from eileenmcnaughton/flush

Flush old user jobs

2 years agoMerge pull request #24547 from eileenmcnaughton/import_entity_no
colemanw [Mon, 19 Sep 2022 21:41:31 +0000 (17:41 -0400)]
Merge pull request #24547 from eileenmcnaughton/import_entity_no

Fix entity_id being saved to message field (only affects rc+)

2 years agoMerge pull request #24559 from colemanw/afformStringFunctions
colemanw [Mon, 19 Sep 2022 21:18:33 +0000 (17:18 -0400)]
Merge pull request #24559 from colemanw/afformStringFunctions

[REF] Afform - Extract string function to CRM_Utils_String

2 years agoMerge pull request #24557 from colemanw/contactTypesFix
Eileen McNaughton [Mon, 19 Sep 2022 20:43:04 +0000 (08:43 +1200)]
Merge pull request #24557 from colemanw/contactTypesFix

CiviCRM-Admin-UI - Fix Contact Types search display

2 years agoAvoid PHP notices in Add Contacts to Household task
Bradley Taylor [Mon, 19 Sep 2022 16:56:41 +0000 (17:56 +0100)]
Avoid PHP notices in Add Contacts to Household task

2 years agoRemove unused variable
Bradley Taylor [Mon, 19 Sep 2022 16:49:50 +0000 (17:49 +0100)]
Remove unused variable

2 years agoStop PHP notice on Find Mailings page
Bradley Taylor [Mon, 19 Sep 2022 16:02:25 +0000 (17:02 +0100)]
Stop PHP notice on Find Mailings page

2 years agoAfform - Sync string functions with CRM_Utils_String
Coleman Watts [Mon, 19 Sep 2022 15:54:40 +0000 (11:54 -0400)]
Afform - Sync string functions with CRM_Utils_String

2 years agoMerge pull request #24420 from colemanw/afformParticipant
colemanw [Mon, 19 Sep 2022 15:37:52 +0000 (11:37 -0400)]
Merge pull request #24420 from colemanw/afformParticipant

Afform - basic support for creating event participant

2 years agoSearchKit - Fix 'Add New' button
Coleman Watts [Mon, 19 Sep 2022 15:18:00 +0000 (11:18 -0400)]
SearchKit - Fix 'Add New' button

2 years agoRemove stray character in income report
Bradley Taylor [Mon, 19 Sep 2022 15:15:07 +0000 (16:15 +0100)]
Remove stray character in income report

2 years agoCiviCRM-Admin-UI - Fix Contact Types search display
Coleman Watts [Mon, 19 Sep 2022 13:14:04 +0000 (09:14 -0400)]
CiviCRM-Admin-UI - Fix Contact Types search display

`.mgd` was missing from the file extension.

Fixes dev/core#3854

2 years agoMerge pull request #24542 from colemanw/getDuplicates
colemanw [Mon, 19 Sep 2022 13:00:18 +0000 (09:00 -0400)]
Merge pull request #24542 from colemanw/getDuplicates

APIv4 - Add Contact::mergeDuplicates action

2 years agoMerge pull request #24556 from yashodha/report_cleanup
Eileen McNaughton [Mon, 19 Sep 2022 07:53:09 +0000 (19:53 +1200)]
Merge pull request #24556 from yashodha/report_cleanup

contribution template clean up for reports

2 years agoMerge pull request #24555 from civicrm/5.54
Seamus Lee [Mon, 19 Sep 2022 06:58:53 +0000 (16:58 +1000)]
Merge pull request #24555 from civicrm/5.54

5.54

2 years agocomtribution template clean up for reports
yashodha [Mon, 19 Sep 2022 05:13:41 +0000 (10:43 +0530)]
comtribution template clean up for reports

2 years agoMerge pull request #24553 from colemanw/admin_ui_ts
Seamus Lee [Mon, 19 Sep 2022 02:23:18 +0000 (12:23 +1000)]
Merge pull request #24553 from colemanw/admin_ui_ts

AdminUi Extension - Translate strings

2 years agoMerge pull request #24554 from totten/5.54-xdebug
Seamus Lee [Mon, 19 Sep 2022 01:47:39 +0000 (11:47 +1000)]
Merge pull request #24554 from totten/5.54-xdebug

DebugSubscriber - Fix activation check

2 years agoDebugSubscriber - Fix activation check
Tim Otten [Sun, 18 Sep 2022 23:11:53 +0000 (16:11 -0700)]
DebugSubscriber - Fix activation check

This subscriber only interjects if XDebug is configured with the suitable mode.

To see if the mode is suitable, it consults `ini_get("xdebug.mode")`, but
this is not quite right -- because the mode may be set other ways (eg
`XDEBUG_MODE`). In XDebug 3.1+, you can get the true effective-mode
by calling `xdebug_info`.

See also: https://xdebug.org/docs/all_functions#xdebug_info

2 years agoAdminUi Extension - Translate strings
Coleman Watts [Sun, 18 Sep 2022 22:55:54 +0000 (18:55 -0400)]
AdminUi Extension - Translate strings

2 years agoMerge pull request #24549 from demeritcowboy/load
colemanw [Sun, 18 Sep 2022 18:34:45 +0000 (14:34 -0400)]
Merge pull request #24549 from demeritcowboy/load

dev/core#3852 - Classload extension test folders during tests

2 years agoAfform - Fix "Existing" autocomplete field and add tests
Coleman Watts [Sun, 18 Sep 2022 15:36:55 +0000 (11:36 -0400)]
Afform - Fix "Existing" autocomplete field and add tests

Followup to #24165 which regressed when the action was changed.
Locks in the fix with unit tests.

2 years agoclassload extension test folders
demeritcowboy [Sat, 17 Sep 2022 14:43:15 +0000 (10:43 -0400)]
classload extension test folders

2 years agoMerge pull request #24550 from demeritcowboy/exception
Seamus Lee [Sun, 18 Sep 2022 05:39:04 +0000 (15:39 +1000)]
Merge pull request #24550 from demeritcowboy/exception

dev/core#3853 - Still need the exception aliases

2 years agoput this back - need the aliases
demeritcowboy [Sun, 18 Sep 2022 00:32:13 +0000 (20:32 -0400)]
put this back - need the aliases

2 years agoMerge pull request #24548 from civicrm/5.54
demeritcowboy [Sun, 18 Sep 2022 00:04:58 +0000 (20:04 -0400)]
Merge pull request #24548 from civicrm/5.54

5.54

2 years agoMerge pull request #24543 from eileenmcnaughton/opt
Eileen McNaughton [Sat, 17 Sep 2022 04:51:12 +0000 (16:51 +1200)]
Merge pull request #24543 from eileenmcnaughton/opt

Pass correct variable type to CRM_Core_OptionValue::getValues

2 years agoFix entity_id being saved to message field
Eileen McNaughton [Sat, 17 Sep 2022 04:47:51 +0000 (16:47 +1200)]
Fix entity_id being saved to message field

2 years agoClean up user jobs
Eileen McNaughton [Sat, 17 Sep 2022 00:18:38 +0000 (12:18 +1200)]
Clean up user jobs

2 years agoMerge pull request #24520 from eileenmcnaughton/import_configy
colemanw [Fri, 16 Sep 2022 23:47:07 +0000 (19:47 -0400)]
Merge pull request #24520 from eileenmcnaughton/import_configy

Fix import to support entity_configuration

2 years agoStop removing Import tables during cache clearing
Eileen McNaughton [Thu, 15 Sep 2022 23:24:49 +0000 (11:24 +1200)]
Stop removing Import tables during cache clearing

2 years agoMerge pull request #24524 from colemanw/currency
Eileen McNaughton [Fri, 16 Sep 2022 22:53:07 +0000 (10:53 +1200)]
Merge pull request #24524 from colemanw/currency

SearchKit - Respect currency when formatting monetary fields

2 years agoPass correct variable type to CRM_Core_OptionValue::getValues
Eileen McNaughton [Fri, 16 Sep 2022 22:15:31 +0000 (10:15 +1200)]
Pass correct variable type to CRM_Core_OptionValue::getValues

2 years agoMerge pull request #24541 from yashodha/report_cleanup
demeritcowboy [Fri, 16 Sep 2022 20:48:27 +0000 (16:48 -0400)]
Merge pull request #24541 from yashodha/report_cleanup

case template clean up for reports

2 years agoMerge pull request #24525 from colemanw/isComponentEnabled
demeritcowboy [Fri, 16 Sep 2022 20:45:29 +0000 (16:45 -0400)]
Merge pull request #24525 from colemanw/isComponentEnabled

[REF] DAO - Add helper function to check if component is enabled

2 years agoMerge pull request #24276 from totten/master-basic-svc
colemanw [Fri, 16 Sep 2022 20:08:18 +0000 (16:08 -0400)]
Merge pull request #24276 from totten/master-basic-svc

Autoload services based on interfaces/annotations. Convert APIv4 services.

2 years agoMerge pull request #24526 from colemanw/CRM_Core_Exception
colemanw [Fri, 16 Sep 2022 17:22:10 +0000 (13:22 -0400)]
Merge pull request #24526 from colemanw/CRM_Core_Exception

[REF] Cleanup unused references to CRM_Core_Exception aliases

2 years agoMerge pull request #24540 from eileenmcnaughton/de_status
colemanw [Fri, 16 Sep 2022 17:08:37 +0000 (13:08 -0400)]
Merge pull request #24540 from eileenmcnaughton/de_status

Remove usage of result from deprecated contributionStatus

2 years agoMerge pull request #24539 from civicrm/5.54
demeritcowboy [Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)]
Merge pull request #24539 from civicrm/5.54

5.54

2 years agoMerge pull request #24158 from kurund/display-only-fields
colemanw [Fri, 16 Sep 2022 16:02:23 +0000 (12:02 -0400)]
Merge pull request #24158 from kurund/display-only-fields

dev/core#3779 add an ability to set a field as display only in formbuilder

2 years agoRemove unused references to CRM_Core_Exception aliases
Coleman Watts [Thu, 15 Sep 2022 19:27:00 +0000 (15:27 -0400)]
Remove unused references to CRM_Core_Exception aliases

2 years agoMerge pull request #24528 from eileenmcnaughton/sub_can
colemanw [Fri, 16 Sep 2022 13:56:52 +0000 (09:56 -0400)]
Merge pull request #24528 from eileenmcnaughton/sub_can

Remove call to deprecated `CRM_Contribute_PseudoConstant::contributionStatus`

2 years agoAPIv4 - Add Contact::mergeDuplicates action
Coleman Watts [Fri, 16 Sep 2022 13:34:29 +0000 (09:34 -0400)]
APIv4 - Add Contact::mergeDuplicates action

2 years agoSearchKit - Update to newer money formatting function
Coleman Watts [Fri, 16 Sep 2022 11:53:24 +0000 (07:53 -0400)]
SearchKit - Update to newer money formatting function

2 years agocase template clean up for reports
yashodha [Fri, 16 Sep 2022 07:12:47 +0000 (12:42 +0530)]
case template clean up for reports

2 years agoRemove usage of result from deprecated contributionStatus
Eileen McNaughton [Fri, 16 Sep 2022 05:37:06 +0000 (17:37 +1200)]
Remove usage of result from deprecated contributionStatus

2 years agoRemove call to deprecated CRM_Contribute_PseudoConstant::contributionStatus
Eileen McNaughton [Thu, 15 Sep 2022 22:12:48 +0000 (10:12 +1200)]
Remove call to deprecated CRM_Contribute_PseudoConstant::contributionStatus

2 years agoFix import to support entity_configuration
Eileen McNaughton [Thu, 15 Sep 2022 05:47:36 +0000 (17:47 +1200)]
Fix import to support entity_configuration

2 years agoMerge pull request #24535 from colemanw/replaceExceptionTests
Seamus Lee [Fri, 16 Sep 2022 04:35:00 +0000 (14:35 +1000)]
Merge pull request #24535 from colemanw/replaceExceptionTests

Replace CRM_Core_Exception aliases - tests dir

2 years agoMerge pull request #24537 from colemanw/replaceExceptionOther
Tim Otten [Fri, 16 Sep 2022 04:14:13 +0000 (21:14 -0700)]
Merge pull request #24537 from colemanw/replaceExceptionOther

Replace CRM_Core_Exception aliases - ext,bin dir

2 years agoMerge pull request #24531 from colemanw/replaceExceptionCRM
Eileen McNaughton [Fri, 16 Sep 2022 03:04:21 +0000 (15:04 +1200)]
Merge pull request #24531 from colemanw/replaceExceptionCRM

Replace CRM_Core_Exception aliases - CRM dir

2 years agoMerge pull request #24536 from colemanw/replaceExceptionApi
Eileen McNaughton [Fri, 16 Sep 2022 03:03:42 +0000 (15:03 +1200)]
Merge pull request #24536 from colemanw/replaceExceptionApi

Replace CRM_Core_Exception aliases - api dir

2 years agoMerge pull request #24534 from colemanw/replaceExceptionCivi
Eileen McNaughton [Fri, 16 Sep 2022 02:56:21 +0000 (14:56 +1200)]
Merge pull request #24534 from colemanw/replaceExceptionCivi

Replace CRM_Core_Exception aliases - Civi dir

2 years agoMerge pull request #24533 from seamuslee001/rerun_regen
Seamus Lee [Fri, 16 Sep 2022 02:32:21 +0000 (12:32 +1000)]
Merge pull request #24533 from seamuslee001/rerun_regen

Re run regen

2 years agoMerge pull request #24532 from eileenmcnaughton/import_temp
Seamus Lee [Fri, 16 Sep 2022 01:31:32 +0000 (11:31 +1000)]
Merge pull request #24532 from eileenmcnaughton/import_temp

Remove references to old temp table names

2 years agoReplace CRM_Core_Exception aliases - ext,bin dir
Coleman Watts [Thu, 15 Sep 2022 21:41:00 +0000 (17:41 -0400)]
Replace CRM_Core_Exception aliases - ext,bin dir

2 years agoReplace CRM_Core_Exception aliases - api dir
Coleman Watts [Thu, 15 Sep 2022 23:26:10 +0000 (19:26 -0400)]
Replace CRM_Core_Exception aliases - api dir

2 years agoReplace CRM_Core_Exception aliases - tests dir
Coleman Watts [Thu, 15 Sep 2022 23:21:00 +0000 (19:21 -0400)]
Replace CRM_Core_Exception aliases - tests dir

2 years agoReplace CRM_Core_Exception aliases - Civi dir
Coleman Watts [Thu, 15 Sep 2022 23:17:39 +0000 (19:17 -0400)]
Replace CRM_Core_Exception aliases - Civi dir

2 years agoRe run regen
Seamus Lee [Thu, 15 Sep 2022 23:15:40 +0000 (09:15 +1000)]
Re run regen

2 years agoReplace CRM_Core_Exception aliases - CRM dir
Coleman Watts [Thu, 15 Sep 2022 23:14:36 +0000 (19:14 -0400)]
Replace CRM_Core_Exception aliases - CRM dir

2 years agoRemove references to old temp table names
Eileen McNaughton [Thu, 15 Sep 2022 23:07:08 +0000 (11:07 +1200)]
Remove references to old temp table names

2 years agoMerge pull request #24527 from demeritcowboy/pledge-your
colemanw [Thu, 15 Sep 2022 23:08:28 +0000 (19:08 -0400)]
Merge pull request #24527 from demeritcowboy/pledge-your

Wording typo in pledge reminder message template

2 years agoMerge pull request #23074 from eileenmcnaughton/pledge_status
Seamus Lee [Thu, 15 Sep 2022 21:34:15 +0000 (07:34 +1000)]
Merge pull request #23074 from eileenmcnaughton/pledge_status

dev/financial#201 Do not add pledge statuses to Contribution statuses

2 years agofix typo
demeritcowboy [Thu, 15 Sep 2022 21:00:26 +0000 (17:00 -0400)]
fix typo

2 years agoCRM_Core_DAO - Add helper function to determine if associated component is enabled
Coleman Watts [Thu, 15 Sep 2022 16:05:14 +0000 (12:05 -0400)]
CRM_Core_DAO - Add helper function to determine if associated component is enabled

2 years agoSearchKit - Use contribution currency when formatting LineItem amounts
Coleman Watts [Thu, 15 Sep 2022 19:12:27 +0000 (15:12 -0400)]
SearchKit - Use contribution currency when formatting LineItem amounts

2 years agoSearchKit - Respect currency when formatting monetary fields
Coleman Watts [Thu, 15 Sep 2022 14:12:41 +0000 (10:12 -0400)]
SearchKit - Respect currency when formatting monetary fields

Fixes dev/core#3428

2 years agoMerge pull request #24522 from magnolia61/show_missing_customfield
colemanw [Thu, 15 Sep 2022 18:25:57 +0000 (14:25 -0400)]
Merge pull request #24522 from magnolia61/show_missing_customfield

dev/core#3847 Display id of missing custom field in error message

2 years agoMerge pull request #24264 from colemanw/afformSubmitIds
colemanw [Thu, 15 Sep 2022 17:41:46 +0000 (13:41 -0400)]
Merge pull request #24264 from colemanw/afformSubmitIds

Afform - Store all values in submission record

2 years agocorrected style issue
magnolia61 [Thu, 15 Sep 2022 09:52:40 +0000 (11:52 +0200)]
corrected style issue

2 years agoMerge pull request #24523 from civicrm/5.54
demeritcowboy [Thu, 15 Sep 2022 14:38:58 +0000 (10:38 -0400)]
Merge pull request #24523 from civicrm/5.54

5.54

2 years agoMerge pull request #24517 from seamuslee001/update_zetacomponents
demeritcowboy [Thu, 15 Sep 2022 11:39:24 +0000 (07:39 -0400)]
Merge pull request #24517 from seamuslee001/update_zetacomponents

[REF] Update Zetacomponents/mail to be 1.9.4

2 years agoMerge pull request #24516 from civicrm/5.54
Seamus Lee [Thu, 15 Sep 2022 10:58:49 +0000 (20:58 +1000)]
Merge pull request #24516 from civicrm/5.54

5.54

2 years agoMerge pull request #24521 from eileenmcnaughton/const_dep
Seamus Lee [Thu, 15 Sep 2022 10:57:53 +0000 (20:57 +1000)]
Merge pull request #24521 from eileenmcnaughton/const_dep

Deprecate handling for removed silly constant

2 years agoMerge pull request #24519 from yashodha/report_cleanup
Seamus Lee [Thu, 15 Sep 2022 10:56:23 +0000 (20:56 +1000)]
Merge pull request #24519 from yashodha/report_cleanup

pledge template clean for reports

2 years agoDeprecate handling for removed silly constant
Eileen McNaughton [Thu, 15 Sep 2022 06:52:17 +0000 (18:52 +1200)]
Deprecate handling for removed silly constant

2 years agopledge template clean for reports
yashodha [Thu, 15 Sep 2022 06:33:56 +0000 (12:03 +0530)]
pledge template clean for reports

2 years ago[REF] Update Zetacomponents/mail to be 1.9.4
Seamus Lee [Thu, 15 Sep 2022 05:06:04 +0000 (15:06 +1000)]
[REF] Update Zetacomponents/mail to be 1.9.4

2 years agoMerge pull request #24515 from demeritcowboy/upmerge
Seamus Lee [Thu, 15 Sep 2022 05:03:22 +0000 (15:03 +1000)]
Merge pull request #24515 from demeritcowboy/upmerge

upmerge #24506 - got stuck in limbo between branches

2 years agoupmerge #24506
demeritcowboy [Thu, 15 Sep 2022 01:57:20 +0000 (21:57 -0400)]
upmerge #24506

2 years agoSet version to 5.55.alpha1
CiviCRM [Thu, 15 Sep 2022 01:39:31 +0000 (01:39 +0000)]
Set version to 5.55.alpha1

2 years agoSet version to 5.54.beta1
CiviCRM [Thu, 15 Sep 2022 01:38:22 +0000 (01:38 +0000)]
Set version to 5.54.beta1

2 years agoMerge pull request #24514 from colemanw/fixWhereEquations
demeritcowboy [Wed, 14 Sep 2022 21:43:49 +0000 (17:43 -0400)]
Merge pull request #24514 from colemanw/fixWhereEquations

SearchKit - Fix arithmetic in WHERE clause