Tim Otten [Fri, 3 Dec 2021 19:35:36 +0000 (11:35 -0800)]
Merge pull request #22209 from demeritcowboy/reldate
[NFC] Fix test failures for testRelativeDateRanges
demeritcowboy [Fri, 3 Dec 2021 14:56:37 +0000 (09:56 -0500)]
fix strict equality issue
Tim Otten [Thu, 2 Dec 2021 05:48:42 +0000 (21:48 -0800)]
Merge pull request #22206 from totten/5.44-bump0
5.44.0 - Bump version. Tweak notes.
Tim Otten [Thu, 2 Dec 2021 05:47:24 +0000 (21:47 -0800)]
Set version to 5.44.0
Tim Otten [Thu, 2 Dec 2021 05:46:33 +0000 (21:46 -0800)]
release-notes/5.44.0.md
Tim Otten [Thu, 2 Dec 2021 05:43:27 +0000 (21:43 -0800)]
Merge pull request #22182 from MegaphoneJon/core-2974
fixes core#2974, overrides break membership update status when removed
Tim Otten [Thu, 2 Dec 2021 05:07:23 +0000 (21:07 -0800)]
Merge pull request #22202 from agh1/5.44.0-releasenotes-final
5.44.0 release notes: added late changes
Andie Hunt [Wed, 1 Dec 2021 22:46:35 +0000 (17:46 -0500)]
5.44.0 release notes: added late changes
Jon Goldberg [Tue, 30 Nov 2021 20:57:55 +0000 (15:57 -0500)]
fixes core#2974, overrides break membership update status when removed
colemanw [Tue, 30 Nov 2021 18:55:42 +0000 (13:55 -0500)]
Merge pull request #22170 from colemanw/fixSearchKitOptions
SearchKit - Fix regression for pseudoconstant selection
Coleman Watts [Tue, 30 Nov 2021 17:02:47 +0000 (12:02 -0500)]
SearchKit - Fix regression for pseudoconstant selection
Fixes dev/report#83
colemanw [Tue, 30 Nov 2021 14:28:28 +0000 (09:28 -0500)]
Merge pull request #22169 from demeritcowboy/oauth-dropdown
dev/mail#105 - Oauth dropdown missing on mail settings form
demeritcowboy [Tue, 30 Nov 2021 01:22:03 +0000 (20:22 -0500)]
oauth dropdown missing on mail settings form
Seamus Lee [Fri, 26 Nov 2021 22:04:50 +0000 (09:04 +1100)]
Merge pull request #22144 from alifrumin/rn5.44
NFC first stab at 5.44 release notes
Alice Frumin [Mon, 22 Nov 2021 18:17:31 +0000 (13:17 -0500)]
NFC release notes 5.44
colemanw [Wed, 24 Nov 2021 19:30:00 +0000 (14:30 -0500)]
Merge pull request #22130 from colemanw/fixSearchKitHaving
SearchKit - Fix selecting HAVING operator
Coleman Watts [Wed, 24 Nov 2021 16:59:22 +0000 (11:59 -0500)]
SearchKit - Fix selecting HAVING operator
Fixes dev/core#2954 by gracefully handling field values when no field exists
Seamus Lee [Sun, 21 Nov 2021 23:00:23 +0000 (10:00 +1100)]
Merge pull request #22108 from colemanw/searchDisplayFix
SearchKit - Fix default displays in Afforms and multiple displays per page
Coleman Watts [Sun, 21 Nov 2021 17:34:29 +0000 (12:34 -0500)]
SearchKit - fix multiple displays on the same page
Coleman Watts [Sun, 21 Nov 2021 17:33:06 +0000 (12:33 -0500)]
SearchKit - fix rendering default display embedded in an afform
Seamus Lee [Fri, 19 Nov 2021 23:53:24 +0000 (10:53 +1100)]
Merge pull request #22103 from agh1/5.44.0-releasenotes-initial
5.44.0 release notes initial run
Andie Hunt [Fri, 19 Nov 2021 22:26:49 +0000 (17:26 -0500)]
5.44.0 release notes: added boilerplate
Andie Hunt [Fri, 19 Nov 2021 21:27:59 +0000 (16:27 -0500)]
5.44.0 release notes: raw from script
Seamus Lee [Thu, 18 Nov 2021 22:15:19 +0000 (09:15 +1100)]
Merge pull request #22092 from seamuslee001/ckeditor_upgrade_4_17
[REF] Upgrade CKEditor to 4.17
Seamus Lee [Thu, 18 Nov 2021 02:43:05 +0000 (13:43 +1100)]
Merge pull request #22093 from totten/5.44-civix-test
EventChecker - Fix recent regression
Tim Otten [Thu, 18 Nov 2021 00:20:55 +0000 (16:20 -0800)]
EventChecker - Fix recent regression
Overview
--------
v5.43 introduced `Civi/Test/EventChecker.php` as part of the execution of all unit-tests.
`civix` generates unit-tests from various templates. As part of the `civix` update-testing, it makes sundry tests with sundry phpunit.
Before
------
In 5.43.0, when running `civix`'s` `tests/make-example.sh`, it fails on one of the tests when using an older version of phpunit.
After
-----
When running `civix`'s` `tests/make-example.sh`, it passes with all tests.
Comment
-------
The type-hint is too strong -- the actual type-name depends on the version of phpunit. It is, of course, good
to have type-hints, and this preserves the softer `@param` hint.
Seamus Lee [Wed, 17 Nov 2021 22:31:41 +0000 (09:31 +1100)]
[REF] Upgrade CKEditor to 4.17.1
Seamus Lee [Mon, 15 Nov 2021 23:16:18 +0000 (10:16 +1100)]
Merge pull request #22085 from seamuslee001/5.44
Add in 5.43.1 and 5.43.2 Release Notes
Tim Otten [Mon, 15 Nov 2021 20:27:23 +0000 (12:27 -0800)]
Add release-notes/5.43.2.md
Tim Otten [Fri, 12 Nov 2021 20:18:25 +0000 (12:18 -0800)]
release-notes/5.43.1.md - Add recent patch
Tim Otten [Fri, 12 Nov 2021 04:59:35 +0000 (20:59 -0800)]
Add release-notes/5.43.1.md
Seamus Lee [Mon, 15 Nov 2021 00:13:23 +0000 (11:13 +1100)]
Merge pull request #22071 from demeritcowboy/drupal92-session
dev/drupal#169 - Fix for session_id() change in Drupal 9.2
demeritcowboy [Fri, 12 Nov 2021 21:53:57 +0000 (16:53 -0500)]
fix session change in drupal 9.2
colemanw [Fri, 12 Nov 2021 13:50:23 +0000 (08:50 -0500)]
Merge pull request #22051 from eileenmcnaughton/544
APIv4 - Add backticks around fields in join criteria
Seamus Lee [Fri, 12 Nov 2021 08:26:26 +0000 (19:26 +1100)]
Merge pull request #22046 from totten/5.44-eventid
(dev/core#2947) Tokens - Auto-enable `{event.*}` if `participantId` is present
Seamus Lee [Fri, 12 Nov 2021 05:54:49 +0000 (16:54 +1100)]
Merge pull request #22043 from seamuslee001/5.44
[REF] Skip testCutesyTokenData on php8 for the moment
Coleman Watts [Fri, 12 Nov 2021 02:42:36 +0000 (21:42 -0500)]
APIv4 - Add backticks around fields in join criteria
Fixes dev/mail#103
Tim Otten [Fri, 12 Nov 2021 04:08:16 +0000 (20:08 -0800)]
Refine alignment of old/new token lists
The prior commit means that `$context['participantId']` will activate `{event.*}` tokens - in contexts
that use `TokenProcessor`. And the `TokenProcessor` is *somewhat* matched to the older functions.
This twiddles the match-up:
* Provide continuity for the deprecated `CRM_Core_SelectValues::participantTokens()` - so it still
only returns `{participant.*}` tokens. Borrow the technique which excludes `{domain.*}` tokens.
This should ensure better continuity for any callers that actually use `CRM_Utils_Token`.
* Update the assertions for the `TokenProcessor` to show that the `{event.*}` tokens are presented in
participant-related contexts.
Tim Otten [Fri, 12 Nov 2021 00:41:30 +0000 (16:41 -0800)]
dev/core#2947 - Auto-enable `{event.*}` if `participantId` is present
Seamus Lee [Thu, 11 Nov 2021 04:26:00 +0000 (04:26 +0000)]
[REF] Fix Pledge Test failing on php8 by ensuring all payments have a status assigned and that customGroup is always assigned to the template and updating test to pass in some additional form values
Seamus Lee [Thu, 11 Nov 2021 23:58:01 +0000 (10:58 +1100)]
[REF] Skip testCutesyTokenData on php8 for the moment
Seamus Lee [Sun, 7 Nov 2021 23:56:18 +0000 (10:56 +1100)]
Merge pull request #21997 from colemanw/fixUpgradeErrors
dev/core#2550 Fix possible upgrade failures
Coleman Watts [Sat, 6 Nov 2021 21:47:43 +0000 (17:47 -0400)]
Fix possible upgrade failures when writing to db fields which may not yet exist
Fixes dev/core#2550
Eileen McNaughton [Fri, 5 Nov 2021 22:13:17 +0000 (11:13 +1300)]
Merge pull request #21985 from colemanw/searchImageFix
[Unreleased regression] SearchKit - Fix display of image fields
Coleman Watts [Fri, 5 Nov 2021 18:39:05 +0000 (14:39 -0400)]
SearchKit - Fix display of image fields
Seamus Lee [Fri, 5 Nov 2021 04:56:50 +0000 (15:56 +1100)]
Merge pull request #21980 from eileenmcnaughton/544
dev/core#2942 regression fix
Seamus Lee [Fri, 5 Nov 2021 03:17:37 +0000 (14:17 +1100)]
Merge pull request #21977 from colemanw/fixSearchKitPermissions
SearchKit - Fix permission to access default display and download spreadsheets
Eileen McNaughton [Fri, 5 Nov 2021 02:41:13 +0000 (15:41 +1300)]
dev/core#2942 regression fix
Coleman Watts [Thu, 4 Nov 2021 19:42:31 +0000 (15:42 -0400)]
SearchKit - Fix permission to access default display and download spreadsheets
Intentionally setting these gatekeeper permissions fairly open as all of these actions
perform stricter permission checks internally.
demeritcowboy [Thu, 4 Nov 2021 17:39:07 +0000 (13:39 -0400)]
Merge pull request #21974 from christianwach/lab-core-2909-2
dev/core#2909 - Repair the option value label for nb_NO language
Christian Wach [Thu, 4 Nov 2021 15:20:13 +0000 (15:20 +0000)]
Repair the option value label for nb_NO language
CiviCRM [Thu, 4 Nov 2021 07:47:04 +0000 (07:47 +0000)]
Set version to 5.44.beta1
Seamus Lee [Thu, 4 Nov 2021 05:16:52 +0000 (16:16 +1100)]
Merge pull request #21972 from eileenmcnaughton/gettok
Remove call to getTokenDetails
Eileen McNaughton [Thu, 4 Nov 2021 03:39:13 +0000 (16:39 +1300)]
Merge pull request #21967 from colemanw/searchRunFix
SearchKit - Fix incorrect pager count when using filters
Eileen McNaughton [Thu, 4 Nov 2021 03:35:46 +0000 (16:35 +1300)]
Merge pull request #21947 from colemanw/cssRules
SearchKit - Conditional style rules for rows/cells
Eileen McNaughton [Thu, 4 Nov 2021 03:32:32 +0000 (16:32 +1300)]
Merge pull request #21957 from eileenmcnaughton/lang
Use null variables rather than isset in Core_Block
Tim Otten [Thu, 4 Nov 2021 03:26:27 +0000 (20:26 -0700)]
transitionParticipants() - Improve $contactDetails cache maintenance
This revises a very recent commit that touches `static $contactDetails` cache.
Imagine you have two calls to `transitionParticipants()` which involve different-but-overlapping sets:
* First invocation involves Alice and Bob
* Second invocation involves Bob and Carol
The first invocation loads Alice and Bob into `$contactDetails`. The second
invocation identifies Carol as missing. We need to load Carol. Here's the change:
* Before: Carol overwrites Bob in `$contactDetails`. Bob goes missing.
* After: Alice, Bob, and Carol all exist in `$contactDetails`.
Eileen McNaughton [Thu, 4 Nov 2021 02:50:57 +0000 (15:50 +1300)]
Merge pull request #21942 from mattwire/gccachedrop
GroupContactCache: Drop temp table *after* releasing lock
Eileen McNaughton [Wed, 3 Nov 2021 21:27:16 +0000 (10:27 +1300)]
Remove call to getTokenDetails
This is tested vi CRM_Event_Form_Task_BatchTest::testSubmitCancel
Seamus Lee [Thu, 4 Nov 2021 01:09:20 +0000 (12:09 +1100)]
Merge pull request #21971 from civicrm/5.43
5.43
Seamus Lee [Thu, 4 Nov 2021 00:05:46 +0000 (11:05 +1100)]
Merge pull request #21953 from agileware/CIVICRM-1881
User experience improvement - CiviCRM Manage Events page, expand the Find Events criteria by default
Seamus Lee [Thu, 4 Nov 2021 00:01:10 +0000 (11:01 +1100)]
Merge pull request #21970 from seamuslee001/regen
[REF] Regenerate generated civicrm file after recent template updates
Seamus Lee [Wed, 3 Nov 2021 23:07:49 +0000 (10:07 +1100)]
Merge pull request #21964 from eileenmcnaughton/dom_tok
Remove calls to CRM_Utils_Token::getDomainTokenReplacement
Seamus Lee [Wed, 3 Nov 2021 22:18:20 +0000 (09:18 +1100)]
Merge pull request #21969 from agh1/5.43.0-releasenotes-final
5.43.0 release notes: final updates
Seamus Lee [Wed, 3 Nov 2021 22:16:32 +0000 (09:16 +1100)]
[REF] Regenerate generated civicrm file after recent template updates
Andie Hunt [Wed, 3 Nov 2021 22:15:25 +0000 (18:15 -0400)]
5.43.0 release notes: final updates
Eileen McNaughton [Wed, 3 Nov 2021 03:23:18 +0000 (16:23 +1300)]
Remove calls to CRM_Utils_Token::getDomainTokenReplacement
These values are no longer used ....
Eileen McNaughton [Wed, 3 Nov 2021 21:25:12 +0000 (10:25 +1300)]
Merge pull request #21963 from eileenmcnaughton/part_template
Remove remaining usages of contact & domain values in participant templates
Coleman Watts [Wed, 3 Nov 2021 19:55:59 +0000 (15:55 -0400)]
SearchKit - Improve pseudoconstant support & tests for SearchDisplay::getDefault
Coleman Watts [Wed, 3 Nov 2021 18:34:08 +0000 (14:34 -0400)]
SearchKit - Fix incorrect pager count when using filters
Fixes a bug where filters were not being applied correctly when fetching rowCount
demeritcowboy [Wed, 3 Nov 2021 15:32:35 +0000 (11:32 -0400)]
Merge pull request #21965 from civicrm/5.43
5.43
demeritcowboy [Wed, 3 Nov 2021 12:42:46 +0000 (08:42 -0400)]
Merge pull request #21962 from seamuslee001/fix_translation_tests
[NFC] Update Tests to match case in the latest l10n files
Seamus Lee [Wed, 3 Nov 2021 03:00:22 +0000 (14:00 +1100)]
[NFC] Update Tests to match case in the latest l10n files
Seamus Lee [Wed, 3 Nov 2021 03:48:33 +0000 (14:48 +1100)]
Merge pull request #21961 from seamuslee001/fix_participant_cancelled_html
[REF] Update date formatting in the html template to match the text t…
Eileen McNaughton [Wed, 3 Nov 2021 03:11:49 +0000 (16:11 +1300)]
Remove remaining usages of contact & domain values in participant templates
Seamus Lee [Wed, 3 Nov 2021 02:01:45 +0000 (13:01 +1100)]
[REF] Update date formatting in the html template to match the text template and regenerate civicrm_generated file
Seamus Lee [Wed, 3 Nov 2021 01:57:04 +0000 (12:57 +1100)]
Merge pull request #21937 from eileenmcnaughton/upit
Add test for selvSvcUpdate, switch to using tokens
Eileen McNaughton [Fri, 29 Oct 2021 09:09:48 +0000 (22:09 +1300)]
Add test for selvSvcUpdate, switch to using tokens
Seamus Lee [Tue, 2 Nov 2021 22:42:46 +0000 (09:42 +1100)]
Merge pull request #21955 from colemanw/managedEntity
APIv4 - Add managed entity functionality
Coleman Watts [Mon, 1 Nov 2021 13:43:56 +0000 (09:43 -0400)]
APIv4 - Provide pseudo-fields and Revert action for managed entities
This new "ManagedEntity" trait provides 2 extra fields and a Revert action
to facilitate UIs which show the managed state and a revert button,
similar to the AfformAdmin UI.
Coleman Watts [Sun, 31 Oct 2021 16:29:00 +0000 (12:29 -0400)]
SearchKit - Conditional style rules per-row & per-field
Eileen McNaughton [Tue, 2 Nov 2021 05:31:50 +0000 (18:31 +1300)]
Merge pull request #21929 from colemanw/searchKitDefaultDisplays
SearchKit - default displays and ACL-aware links
Seamus Lee [Tue, 2 Nov 2021 03:32:40 +0000 (14:32 +1100)]
Merge pull request #21959 from civicrm/5.43
5.43
Seamus Lee [Tue, 2 Nov 2021 03:26:11 +0000 (14:26 +1100)]
Merge pull request #21958 from seamuslee001/fix_token_rendering_campaign_legacy_php8
[REF] Fix pseduoconstant token rendering for contributions via legacy…
Coleman Watts [Tue, 2 Nov 2021 00:28:35 +0000 (20:28 -0400)]
SearchKit - Fix action checkboxes to work with any key
Lifts the assumption that every entity has a key column named "id"
Coleman Watts [Tue, 2 Nov 2021 00:43:01 +0000 (20:43 -0400)]
SearchKit - Default label when adding a display
Seamus Lee [Tue, 2 Nov 2021 00:41:15 +0000 (00:41 +0000)]
[REF] Fix pseduoconstant token rendering for contributions via legacy way on php8 and include campaign_id pseudoconsntants as well
demeritcowboy [Mon, 1 Nov 2021 23:20:28 +0000 (19:20 -0400)]
Merge pull request #21934 from eileenmcnaughton/empty
Ensure no_licence is assigned for drop.tpl
colemanw [Mon, 1 Nov 2021 23:15:18 +0000 (19:15 -0400)]
Merge pull request #21952 from eileenmcnaughton/im
Handling for intermittent Im->getfields error
Eileen McNaughton [Mon, 1 Nov 2021 21:23:03 +0000 (10:23 +1300)]
Use null variables rather than isset in Core_Block
This removes an isset from LangSwitch and some enotices that we see if escape on output is enabled.
'langSwitch' is normally always assigned by the smarty initialize but for some reason not via this path
Eileen McNaughton [Fri, 29 Oct 2021 01:06:39 +0000 (14:06 +1300)]
Use empty not isset in drop.tpl
On experimenting a little with smarty escaping it turns out that isset is gonna be
a lot more painful than empty - we should avoid where we can. In this case it
is passed in as TRUE or not at all (from schema.tpl) so an empty check is just fine
demeritcowboy [Mon, 1 Nov 2021 16:03:41 +0000 (12:03 -0400)]
Merge pull request #21948 from braders/hardcoded-error-text
Avoid hardcoded text in error strings; make translatable
demeritcowboy [Mon, 1 Nov 2021 15:53:43 +0000 (11:53 -0400)]
Merge pull request #21954 from braders/avoid-hardcoded-period-type-labels
Don't hardcode Period Type in Manage Premiums template.
Bradley Taylor [Mon, 1 Nov 2021 13:41:38 +0000 (13:41 +0000)]
Don't hardcode Period Type in Manage Premiums template.
Justin Freeman [Mon, 1 Nov 2021 05:51:28 +0000 (16:51 +1100)]
CIVICRM-1881 CiviCRM Manage Events page, Find Events criteria is hidden by default because the section is collapsed. End users cannot see any of the search options, by default and this causes confusion
Seamus Lee [Mon, 1 Nov 2021 01:26:09 +0000 (12:26 +1100)]
Merge pull request #21949 from braders/harcoded-setstatus-text
Avoid harcoded text in setStatus calls; make translatable
Eileen McNaughton [Mon, 1 Nov 2021 01:14:03 +0000 (14:14 +1300)]
Merge pull request #21951 from eileenmcnaughton/messages
Ensure communityMessages is assigned to the template.
Eileen McNaughton [Sun, 31 Oct 2021 21:38:57 +0000 (10:38 +1300)]
Ensure communityMessages is assigned to the template.
This is a minor code simplification & ensures the parameter is set rather than
handling it not being set at the template level
Eileen McNaughton [Sun, 31 Oct 2021 22:09:24 +0000 (11:09 +1300)]
Handling for intermittent Im->getfields error
I'm not quite sure when this started but I've been seeing Im->getfields not found errors of late - this helps
Eileen McNaughton [Sun, 31 Oct 2021 20:28:29 +0000 (09:28 +1300)]
Merge pull request #21950 from braders/misc-hardcoded-strings
Make miscellaneous strings translatable