Seamus Lee [Wed, 6 Dec 2023 20:53:17 +0000 (07:53 +1100)]
Merge pull request #28547 from alifrumin/5.68rnlate
[NFC] 5.68 release note late changes
Alice Frumin [Wed, 6 Dec 2023 19:54:55 +0000 (14:54 -0500)]
[NFC] 5.68 release note late changes
Matthew Wire [Wed, 6 Dec 2023 00:07:39 +0000 (00:07 +0000)]
Merge pull request #28396 from colemanw/contactTypeSearchSegments
SearchKit - Fix Search Segments for contact type entities
Seamus Lee [Wed, 6 Dec 2023 00:02:54 +0000 (11:02 +1100)]
Merge pull request #28522 from totten/5.68-msgtpl
(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.
Tim Otten [Tue, 5 Dec 2023 21:56:15 +0000 (21:56 +0000)]
(dev/core#4839) WorkflowMessage - Send email. Don't overwrite $to.
Matthew Wire [Sun, 3 Dec 2023 18:37:17 +0000 (18:37 +0000)]
Merge pull request #28409 from colemanw/toolbar
SearchKit - Fix toolbar display when not using pager
Matthew Wire [Sun, 3 Dec 2023 18:36:44 +0000 (18:36 +0000)]
Merge pull request #28437 from colemanw/civiGrantView
CiviGrant - Fix 'View Grant' page
colemanw [Sun, 3 Dec 2023 06:40:27 +0000 (06:40 +0000)]
CiviGrant - Fix 'View Grant' page
Fixes https://lab.civicrm.org/dev/core/-/issues/4828
colemanw [Sat, 2 Dec 2023 12:46:00 +0000 (12:46 +0000)]
SearchKit - Fix toolbar display when not using pager
colemanw [Fri, 1 Dec 2023 15:59:54 +0000 (15:59 +0000)]
SearchKit - Fix Search Segments for contact type entities
A SearchSegment created for the Contact entity should also apply to
Individual, Organization & Household entities.
Yashodha Chaku [Thu, 30 Nov 2023 13:43:41 +0000 (19:13 +0530)]
Merge pull request #28378 from eileenmcnaughton/contact
dev/core#4820 fix contact id search
Tim Otten [Thu, 30 Nov 2023 13:08:20 +0000 (13:08 +0000)]
Merge pull request #28354 from eileenmcnaughton/568_verp
Fix incoming bounce processing
Eileen McNaughton [Wed, 29 Nov 2023 23:32:12 +0000 (12:32 +1300)]
dev/core#4820 fix contact id search
Eileen McNaughton [Wed, 29 Nov 2023 22:57:12 +0000 (11:57 +1300)]
Merge pull request #28375 from demeritcowboy/relimp
dev/core#4563 - fix related contact mapping fields on import
demeritcowboy [Wed, 29 Nov 2023 21:48:37 +0000 (16:48 -0500)]
fix related contact mapping fields
Eileen McNaughton [Wed, 29 Nov 2023 21:16:42 +0000 (10:16 +1300)]
Merge pull request #28371 from mlutfy/568fixNumericCaseCustom
Case Custom Data: fix non-US numeric decimals - 5.68
Mathieu Lu [Wed, 29 Nov 2023 19:39:39 +0000 (14:39 -0500)]
Case Custom Data: fix non-US numeric decimals
colemanw [Wed, 29 Nov 2023 18:13:12 +0000 (13:13 -0500)]
Merge pull request #28332 from eileenmcnaughton/import_ug
dev/core#4726 Set field to do-not-import if not configured
Eileen McNaughton [Wed, 29 Nov 2023 03:24:42 +0000 (16:24 +1300)]
Fix incoming bounce processing
We switched to a less misleading method of calculating the hash here
https://github.com/civicrm/civicrm-core/pull/27533/files#diff-942a60901c838eb11bfd85cd3e84672748d9f1d49f8cbe62684bc898b02c7a90R58
but did not spot that the regex was expecting only letters a-f whereas
the new method is a-z
colemanw [Wed, 29 Nov 2023 01:16:56 +0000 (20:16 -0500)]
Merge pull request #28352 from bsilvern/core-4761-5.68
dev/core#4761 - CRM\Core\DAO - Generate unique name, case-insensitive
Bob Silvern [Tue, 28 Nov 2023 22:39:06 +0000 (14:39 -0800)]
dev/core#4761 - CRM\Core\DAO - Generate unique name, case-insensitve
This duplicates on the 5.68 branch changes made in PR-28168 to master.
Eileen McNaughton [Tue, 28 Nov 2023 03:14:48 +0000 (16:14 +1300)]
Set field to do-not-import if not configured
Eileen McNaughton [Mon, 27 Nov 2023 22:45:04 +0000 (11:45 +1300)]
Merge pull request #28325 from colemanw/userJobClause
UserJob - Fix deprecated syntax in addSelectWhereClause
colemanw [Mon, 27 Nov 2023 21:10:58 +0000 (16:10 -0500)]
UserJob - Fix deprecated syntax in addSelectWhereClause
Eileen McNaughton [Fri, 24 Nov 2023 22:10:48 +0000 (11:10 +1300)]
Merge pull request #28302 from alifrumin/rn5.68
[NFC] 5.68 release notes
colemanw [Fri, 24 Nov 2023 14:56:38 +0000 (09:56 -0500)]
Merge pull request #28282 from eileenmcnaughton/568
dev/core#4795 fix regression on other amount on main contribution page
colemanw [Fri, 24 Nov 2023 14:35:18 +0000 (09:35 -0500)]
Merge pull request #28283 from colemanw/optionValueAutocomplete
Autocomplete - Fix incorrect matching on id instead of value
Alice Frumin [Tue, 21 Nov 2023 18:54:27 +0000 (13:54 -0500)]
[NFC] 5.68 release notes first pass
colemanw [Thu, 23 Nov 2023 20:07:58 +0000 (15:07 -0500)]
Autocomplete - Fix incorrect matching on id instead of value
Fixes https://lab.civicrm.org/dev/core/-/issues/4799
Custom fields of type Autocomplete-Select were incorrectly using the id of the optionValue.
This fixes it to use the value, and also show the value in the autocomplete results.
Eileen McNaughton [Thu, 23 Nov 2023 19:49:35 +0000 (08:49 +1300)]
dev/core#4795 fix regression on other amount on main contribution page
demeritcowboy [Tue, 21 Nov 2023 20:35:34 +0000 (15:35 -0500)]
Merge pull request #28246 from eileenmcnaughton/profile
dev/core#4766 Fix event merging profiles together
Eileen McNaughton [Tue, 21 Nov 2023 02:37:01 +0000 (15:37 +1300)]
Fix event merging profiles together
https://lab.civicrm.org/dev/core/-/issues/4766
demeritcowboy [Tue, 21 Nov 2023 04:03:02 +0000 (23:03 -0500)]
Merge pull request #28244 from eileenmcnaughton/568
Fix reference to wrong value
Eileen McNaughton [Tue, 21 Nov 2023 02:13:10 +0000 (15:13 +1300)]
Merge pull request #28243 from demeritcowboy/lost-time
dev/financial#221 - Bring back missing time field
Eileen McNaughton [Tue, 21 Nov 2023 01:37:20 +0000 (14:37 +1300)]
Fix reference to wrong value
demeritcowboy [Tue, 21 Nov 2023 01:18:10 +0000 (20:18 -0500)]
bring back time field
demeritcowboy [Tue, 21 Nov 2023 00:54:14 +0000 (19:54 -0500)]
Merge pull request #28239 from eileenmcnaughton/568_prod
Fix regression in 5.68 on selecting a premium (when at least one is unavailable)
demeritcowboy [Tue, 21 Nov 2023 00:42:51 +0000 (19:42 -0500)]
Merge pull request #28237 from eileenmcnaughton/568
Add weight to premium config (tab on contribution page edit)
Eileen McNaughton [Mon, 20 Nov 2023 23:07:27 +0000 (12:07 +1300)]
Fix regression in 5.68 on premium
Eileen McNaughton [Mon, 20 Nov 2023 22:33:40 +0000 (11:33 +1300)]
Add weight to premium config (tab on contribution page edit)
Eileen McNaughton [Mon, 20 Nov 2023 22:05:38 +0000 (11:05 +1300)]
Merge pull request #28231 from agh1/5.68.0-releasenotes-initial
5.68.0 release notes initial run
Andie Hunt [Mon, 20 Nov 2023 15:27:38 +0000 (10:27 -0500)]
5.68.0 release notes: added boilerplate
Andie Hunt [Mon, 20 Nov 2023 15:24:11 +0000 (10:24 -0500)]
5.68.0 release notes: raw from script
Eileen McNaughton [Fri, 17 Nov 2023 20:39:30 +0000 (09:39 +1300)]
Merge pull request #28192 from lcdservices/civicrm-core-4780b
dev/core#4780 handle bounce processing when verp unverified
demeritcowboy [Fri, 17 Nov 2023 19:57:20 +0000 (14:57 -0500)]
Merge pull request #28187 from colemanw/groupConcatUiFix
SearchKit - Fix missing label on group concat distinct dropdown
demeritcowboy [Fri, 17 Nov 2023 19:27:21 +0000 (14:27 -0500)]
trying again to fix conflict
demeritcowboy [Fri, 17 Nov 2023 19:25:56 +0000 (14:25 -0500)]
try to fix merge conflict
demeritcowboy [Fri, 17 Nov 2023 18:37:17 +0000 (13:37 -0500)]
Merge pull request #28189 from aydun/adminui_cp_fix_rc
dev/core#4783 Fix ability to clone and delete Contribution Pages when AdminUI enabled
Brian Shaughnessy [Fri, 17 Nov 2023 18:23:38 +0000 (13:23 -0500)]
dev/core#4780 handle bounce processing when verp unverified
Aidan Saunders [Thu, 16 Nov 2023 21:46:41 +0000 (21:46 +0000)]
Move civicrm/contribute/manage to civicrm/admin/contribute/manage
Update one reference to old path
Change Contribution Page clone and delete to use new path
colemanw [Fri, 17 Nov 2023 14:17:39 +0000 (09:17 -0500)]
SearchKit - Fix missing label on group concat distinct dropdown
colemanw [Fri, 17 Nov 2023 13:33:00 +0000 (08:33 -0500)]
Merge pull request #28171 from eileenmcnaughton/568_tax
Fix tax total not showing on thank you
Eileen McNaughton [Thu, 16 Nov 2023 22:59:01 +0000 (11:59 +1300)]
Fix tests to not notice when faking form flow
Eileen McNaughton [Thu, 16 Nov 2023 20:53:38 +0000 (09:53 +1300)]
Fix tax total not showing on thank you
Eileen McNaughton [Thu, 16 Nov 2023 23:02:02 +0000 (12:02 +1300)]
Merge pull request #28170 from totten/5.68-mixin-since
(NFC) setting-admin@1 - Fix the `@since` metadata
Tim Otten [Thu, 16 Nov 2023 20:00:00 +0000 (12:00 -0800)]
setting-admin@1 - Raise version to 1.1.0
The original implementation uses some small niceties that don't backport well. Let's call this 1.1.x.
I've got a separate variant that backports better. We'll call that 1.0.x.
Tim Otten [Thu, 16 Nov 2023 19:33:13 +0000 (11:33 -0800)]
(NFC) setting-admin@1 - Fix the `@since` metadata
The code was originally written during 5.67.alpha1 and then merged during
5.68.alpha. So the `@since` is slightly off.
Seamus Lee [Thu, 16 Nov 2023 00:00:37 +0000 (11:00 +1100)]
Merge pull request #28137 from colemanw/havingFix
APIv4 - Fix index interfering with HAVING
Seamus Lee [Wed, 15 Nov 2023 20:10:59 +0000 (07:10 +1100)]
Merge pull request #28153 from demeritcowboy/menu-missing
dev/core#4778 - php notice causes civi menu to go missing
colemanw [Tue, 14 Nov 2023 18:40:29 +0000 (13:40 -0500)]
APIv4 - Fix index interfering with HAVING
It's not always safe to delete items from the SELECT clause... so let's not.
Fixes dev/core#4017
demeritcowboy [Wed, 15 Nov 2023 19:10:28 +0000 (14:10 -0500)]
php notice
colemanw [Wed, 15 Nov 2023 16:11:12 +0000 (11:11 -0500)]
Merge pull request #28145 from colemanw/parentNames
dev/core#4740 - Fix missing tagsets when label doesn't match name
colemanw [Wed, 15 Nov 2023 01:10:38 +0000 (20:10 -0500)]
dev/core#4740 - Fix missing tagsets when label doesn't match name
CRM_Core_Form_Tag::buildQuickForm was previously being passed an array of [id => name]
but it was wastefully ignoring the passed ids and looking it up from the name.
Now due to
bcf668d is being passed an array of [id => label] which is all it needs,
just had to remove the wasteful id lookup when it's already there.
colemanw [Wed, 15 Nov 2023 00:48:55 +0000 (19:48 -0500)]
Merge pull request #28133 from colemanw/civiCasePerms
dev/core#4769 APIv4 - Fix access to case activities for administrators
Seamus Lee [Tue, 14 Nov 2023 02:50:02 +0000 (13:50 +1100)]
Merge pull request #28130 from eileenmcnaughton/568
Update the parameters passed to the hook_QueueTaskError
colemanw [Tue, 14 Nov 2023 01:57:26 +0000 (20:57 -0500)]
APIv4 - Fix access to case activities for administrators
Fixes dev/core#4769
Before: Case administrators with 'access deleted contacts' permission blocked from viewing Case activities in APIv4
After: Permissions work correctly.
The problem was the hook logic was incorrectly interpreting empty permissions to mean "no access"
when it actually means "unrestricted access".
demeritcowboy [Tue, 14 Nov 2023 01:23:27 +0000 (20:23 -0500)]
Merge pull request #28128 from seamuslee001/dev_core_4768_568
dev/core#4768 Fix validating contact when using checksum url
Adedoyin Damilare [Mon, 13 Nov 2023 19:59:27 +0000 (19:59 +0000)]
Update the parameters passed to the hook_QueueTaskError
Issue: https://lab.civicrm.org/dev/core/-/issues/4774
colemanw [Tue, 14 Nov 2023 00:16:53 +0000 (19:16 -0500)]
Merge pull request #28124 from colemanw/fixApi4QueryRegression
dev/core#4773 - Fix APIv4 query regression
Seamus Lee [Mon, 13 Nov 2023 23:43:57 +0000 (10:43 +1100)]
Add unit test
Seamus Lee [Mon, 13 Nov 2023 21:58:09 +0000 (08:58 +1100)]
dev/core#4768 Fix validating contact when using checksum url
Fix type error failures
Seamus Lee [Mon, 13 Nov 2023 20:46:38 +0000 (07:46 +1100)]
Merge pull request #28121 from colemanw/contact_autocomplete_options
dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch
colemanw [Mon, 13 Nov 2023 20:42:09 +0000 (15:42 -0500)]
dev/core#4773 - Fix APIv4 query regression
colemanw [Mon, 13 Nov 2023 19:43:40 +0000 (14:43 -0500)]
dev/core#4759 - Respect Autocomplete Contact Search preferences in menubar quicksearch
demeritcowboy [Mon, 13 Nov 2023 14:19:52 +0000 (09:19 -0500)]
Merge pull request #28103 from colemanw/tagIndividuals
APIv4 - Fix missing tag filer on Individual,Organization,Household
colemanw [Sun, 12 Nov 2023 13:31:15 +0000 (08:31 -0500)]
Merge pull request #28113 from jitendrapurohit/reminder-error-rc
Schedule Job fails with a fatal error if configured with an absolute date
Jitendra Purohit [Sun, 12 Nov 2023 05:45:47 +0000 (11:15 +0530)]
Fix reminder error with absolute date
colemanw [Fri, 10 Nov 2023 18:59:01 +0000 (13:59 -0500)]
APIv4 - Fix missing tag filer on Individual,Organization,Household entities
Eileen McNaughton [Fri, 10 Nov 2023 07:10:28 +0000 (20:10 +1300)]
Merge pull request #28099 from eileenmcnaughton/568
Fix rc-unreleased regression - tax amount not loading
Eileen McNaughton [Fri, 10 Nov 2023 06:23:48 +0000 (19:23 +1300)]
Fix rc-unreleased regression - tax amount not loading
demeritcowboy [Fri, 10 Nov 2023 03:20:20 +0000 (22:20 -0500)]
Merge pull request #28085 from eileenmcnaughton/mailing
Add weights to CRM_Mailing_BAO_Mailing::getContactMailingSelector
Eileen McNaughton [Fri, 10 Nov 2023 01:18:55 +0000 (14:18 +1300)]
Merge pull request #28090 from demeritcowboy/eggscape
Fix source html displaying when editing price option
demeritcowboy [Thu, 9 Nov 2023 23:43:30 +0000 (18:43 -0500)]
fix source html displaying
Eileen McNaughton [Thu, 9 Nov 2023 21:11:23 +0000 (10:11 +1300)]
Add weights to CRM_Mailing_BAO_Mailing::getContactMailingSelector
Eileen McNaughton [Thu, 9 Nov 2023 21:03:45 +0000 (10:03 +1300)]
Merge pull request #28072 from colemanw/advSearchQuickSearchMatch
QuickSearch - Fix redirect to adv search with prepopulated criteria
Eileen McNaughton [Thu, 9 Nov 2023 20:51:57 +0000 (09:51 +1300)]
Merge pull request #28079 from chriscant/civi-api-kernel-error2
Ensure api/v3/utils.php required before civicrm_api3_create_error 5.68
Chris Cant [Thu, 9 Nov 2023 14:37:50 +0000 (14:37 +0000)]
Ensure api/v3/utils.php required before civicrm_api3_create_error 5.68
Seamus Lee [Thu, 9 Nov 2023 01:23:56 +0000 (12:23 +1100)]
Merge pull request #28073 from totten/master568-http-log
(NFC) MenuXmlTest - Improve debug output. Use richer helpers.
Tim Otten [Wed, 8 Nov 2023 23:37:36 +0000 (15:37 -0800)]
MenuXmlTest - Improve debug output. Use richer helpers.
In automated test-runs, the e2e test for `mixin/menu-xml@1` (`MenuXmlTest`) has been failing sporadically.
The failure always involves one of the HTTP sub-requests, but it's never clear what actually happened
in the HTTP sub-request. This patch improves debug info.
Before
-------
Send HTTP sub-request with simple primitives (`cv` + `file_get_contents`). No detailed information about the failed request.
After
-----
Send HTTP sub-request with `HttpTestTrait` (`guzzle`). Use rich assertions that log more detailed information.
Tim Otten [Wed, 8 Nov 2023 23:37:03 +0000 (15:37 -0800)]
HttpTestTrait - Add more assertion helpers
colemanw [Thu, 9 Nov 2023 00:12:34 +0000 (19:12 -0500)]
QuickSearch - Fix redirect to adv search with prepopulated criteria
Fixes dev/core#4624
Bridges the mismatch between APIv4-style field names and AdvSearch-style field names
with a good ol-fashioned mapper.
demeritcowboy [Wed, 8 Nov 2023 15:20:42 +0000 (10:20 -0500)]
Merge pull request #28051 from eileenmcnaughton/import_568
dev/core#4554 Delete related Queue when user job deleted
Eileen McNaughton [Wed, 8 Nov 2023 01:37:44 +0000 (14:37 +1300)]
dev/core#4554 Delete related Queue when user job deleted
Seamus Lee [Tue, 7 Nov 2023 21:17:29 +0000 (08:17 +1100)]
Merge pull request #28040 from colemanw/angularDepNotice
[NFC] More descriptive deprecation notice for Angular settings
colemanw [Tue, 7 Nov 2023 19:49:30 +0000 (14:49 -0500)]
More descriptive deprecation notice for Angular settings
colemanw [Tue, 7 Nov 2023 18:41:30 +0000 (13:41 -0500)]
Merge pull request #28036 from demeritcowboy/case-edit
dev/core#4755 - typo causes activity type to go missing on case activity edit
demeritcowboy [Tue, 7 Nov 2023 14:51:54 +0000 (09:51 -0500)]
typo
demeritcowboy [Tue, 7 Nov 2023 13:59:25 +0000 (08:59 -0500)]
Merge pull request #28018 from colemanw/searchFunctionZeroBugFix
SearchKit - Fix field transformation UI to handle number 0
Eileen McNaughton [Mon, 6 Nov 2023 22:48:38 +0000 (11:48 +1300)]
Merge pull request #28029 from MegaphoneJon/deprecated-part-token
Add check for deprecated token in event online receipt
Jon Goldberg [Mon, 6 Nov 2023 20:28:45 +0000 (15:28 -0500)]
Add check for deprecated token in event online receipt