Seamus Lee [Tue, 9 Nov 2021 22:31:39 +0000 (09:31 +1100)]
Merge pull request #22008 from artfulrobot/artfulrobot-fix-mailing-click-report-url
Fix unencoded mailing url query param in Mailing report
Eileen McNaughton [Tue, 9 Nov 2021 21:01:48 +0000 (10:01 +1300)]
Merge pull request #22011 from jmcclelland/surveyprevnext
don't overfill the prevnext cache when reserving for a survey.
demeritcowboy [Tue, 9 Nov 2021 15:22:15 +0000 (10:22 -0500)]
Merge pull request #21983 from lisandro-compucorp/email_to_organizations
Handle activity creation for emails directed to organization contacts
demeritcowboy [Tue, 9 Nov 2021 00:20:49 +0000 (19:20 -0500)]
Merge pull request #22010 from colemanw/apiExplorerFormat
APIv4 Explorer - Optionally view results in PHP format
demeritcowboy [Mon, 8 Nov 2021 23:59:14 +0000 (18:59 -0500)]
Merge pull request #22005 from seamuslee001/update_province_philippines
[REF] Add in missing province for Philippines and update names to matc…
Seamus Lee [Mon, 8 Nov 2021 01:54:07 +0000 (12:54 +1100)]
[REF] Add in missing province for Philippines and update names to match ISO
Ensure we don't overwrite any customisations already in the database
Coleman Watts [Mon, 8 Nov 2021 19:03:49 +0000 (14:03 -0500)]
APIv4 Explorer - Optionally view results in PHP format
Jamie McClelland [Mon, 8 Nov 2021 19:19:06 +0000 (14:19 -0500)]
don't overfill the prevnext cache when reserving for a survey.
Rich Lott / Artful Robot [Mon, 8 Nov 2021 14:31:14 +0000 (14:31 +0000)]
Fix unencoded mailing url query param in Mailing report
Tano Rojas [Fri, 5 Nov 2021 09:05:26 +0000 (16:05 +0700)]
Handle activity creation for emails to organization contacts
Seamus Lee [Mon, 8 Nov 2021 04:09:42 +0000 (15:09 +1100)]
Merge pull request #22003 from civicrm/5.44
5.44
Tim Otten [Mon, 8 Nov 2021 02:48:15 +0000 (18:48 -0800)]
Merge pull request #21960 from colemanw/afformBaseModule
Afform - Display the extension in which an Afform is packaged
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
Eileen McNaughton [Sun, 7 Nov 2021 22:27:54 +0000 (11:27 +1300)]
Merge pull request #20811 from elcapo/billing-fields
Check the billing fields returned by each payment processor
colemanw [Sun, 7 Nov 2021 21:07:11 +0000 (16:07 -0500)]
Merge pull request #21995 from braders/title-attr-tidyup
Tidy up title attributes
Bradley Taylor [Sat, 6 Nov 2021 16:26:24 +0000 (16:26 +0000)]
Tidy up title attributes
Wrap text in {ts} as appropriate (for translation)
Remove poorly worded or superflous title attributes
Monish Deb [Sun, 7 Nov 2021 15:37:05 +0000 (21:07 +0530)]
Merge pull request #21998 from webmaster-cses-org-uk/patch-3
Guard against passing empty values to CRM_Core_DAO::getFieldValue()
colemanw [Sun, 7 Nov 2021 14:54:54 +0000 (09:54 -0500)]
Merge pull request #21975 from MegaphoneJon/reporting-18
Reporting #18: Fix sorting with > 10 participant roles
demeritcowboy [Sun, 7 Nov 2021 13:53:18 +0000 (08:53 -0500)]
Merge pull request #21940 from eileenmcnaughton/debug
Enotice fixes in debug.tpl that are compatible with default escaping
demeritcowboy [Sun, 7 Nov 2021 13:52:13 +0000 (08:52 -0500)]
Merge pull request #21979 from eileenmcnaughton/vars
Fix isForm to be always assigned, remove checks
Adam Wood [Sun, 7 Nov 2021 13:09:31 +0000 (13:09 +0000)]
Guard against passing empty values to CRM_Core_DAO::getFieldValue()
This change removes a potential "getFieldValue failed" error that can be thrown if an empty scalar value occurs in a multiple-contact reference custom field.
See https://lab.civicrm.org/dev/core/-/issues/2939
Replaces https://github.com/eileenmcnaughton/civicrm-core/pull/13/commits which was opened against the wrong repo.
Seamus Lee [Sat, 6 Nov 2021 22:22:27 +0000 (09:22 +1100)]
Merge pull request #21994 from braders/more-hardcoded-strings
Make more hardcoded strings available for translation
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
demeritcowboy [Sat, 6 Nov 2021 18:03:31 +0000 (14:03 -0400)]
Merge pull request #21933 from eileenmcnaughton/local
Remove unused variable
Bradley Taylor [Sat, 6 Nov 2021 12:05:17 +0000 (12:05 +0000)]
Make more hardcoded strings available for translation
colemanw [Sat, 6 Nov 2021 03:44:14 +0000 (23:44 -0400)]
Merge pull request #21988 from eileenmcnaughton/isset2
Remove isset from Datasource.tpl
demeritcowboy [Fri, 5 Nov 2021 23:27:25 +0000 (19:27 -0400)]
Merge pull request #21987 from eileenmcnaughton/enotice
Enotice fixes
demeritcowboy [Fri, 5 Nov 2021 23:26:57 +0000 (19:26 -0400)]
Merge pull request #21956 from eileenmcnaughton/escape2
dev/core#1328 Add define to optionally enable escape-on-output
Eileen McNaughton [Fri, 5 Nov 2021 22:59:34 +0000 (11:59 +1300)]
Merge pull request #21990 from civicrm/5.44
5.44 to master
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
Eileen McNaughton [Fri, 5 Nov 2021 21:12:15 +0000 (10:12 +1300)]
Remove isset from Datasource.tpl
This comes up on the first import contact screen
Eileen McNaughton [Fri, 5 Nov 2021 20:43:19 +0000 (09:43 +1300)]
Enotice fixes
Eileen McNaughton [Mon, 1 Nov 2021 21:04:56 +0000 (10:04 +1300)]
Add define to optionally enable escape-on-output
This adjusts the smarty class such that if you have the define below
escape-on-output is enabled
This PR + fixing the use of isset in the template layer are the pre-requisites for
turning escape on output on and off. Keeping this part in an unmerged branch is
tricky as the templates need to be recompiled when you switch to a branch
which does not have this function
I envisage us starting to use this define in our dev environments fairly soon
as it's working well locally for me on
https://github.com/civicrm/civicrm-core/pull/21935
Coleman Watts [Fri, 5 Nov 2021 20:17:06 +0000 (16:17 -0400)]
AfformAdmin - Show counts in tab header
Coleman Watts [Fri, 5 Nov 2021 18:39:05 +0000 (14:39 -0400)]
SearchKit - Fix display of image fields
Mathieu Lu [Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)]
Merge pull request #21835 from wmortada/patch-1
Run scheduled reminder job hourly
Seamus Lee [Fri, 5 Nov 2021 07:28:39 +0000 (18:28 +1100)]
Merge pull request #21982 from civicrm/5.44
5.44
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
Eileen McNaughton [Fri, 5 Nov 2021 01:59:47 +0000 (14:59 +1300)]
Fix isForm to be always assigned, remove checks
Note I'm not seeing any regressions on this locally with enotice turned on - but the
worst case, if tests pass, is we get some enotices back in a scenario where we
are only impacting bleeding edge devs
Eileen McNaughton [Fri, 29 Oct 2021 20:15:29 +0000 (09:15 +1300)]
Enotice fixes in debug.tpl that are compatible with default escaping
Jon Goldberg [Thu, 4 Nov 2021 17:01:36 +0000 (13:01 -0400)]
Reporting #18: Fix sorting with > 10 participant roles
Seamus Lee [Thu, 4 Nov 2021 21:46:07 +0000 (08:46 +1100)]
Merge pull request #21912 from eileenmcnaughton/no_display
Move responsibilty for ensuring greeting parameters are set to `ensureGreetingParamsAreSet`
demeritcowboy [Thu, 4 Nov 2021 20:10:02 +0000 (16:10 -0400)]
Merge pull request #21976 from civicrm/5.44
5.44
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:53:51 +0000 (07:53 +0000)]
Set version to 5.45.alpha1
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 [Tue, 2 Nov 2021 18:33:21 +0000 (14:33 -0400)]
Afform - Display the extension in which an Afform is packaged
Expose the base_module field to the Afform admin UI as a column.
Coleman Watts [Mon, 1 Nov 2021 17:27:51 +0000 (13:27 -0400)]
Afform - Provide `base_module` calculated field to APIv4 Afform.get
This extra Afform field mirrors the functionality of the field of the same name
from ManagedEntity APIv4 trait: it returns the name of the extension in which
an Afform is packaged.
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