Seamus Lee [Fri, 19 Nov 2021 23:53:15 +0000 (10:53 +1100)]
Merge pull request #22102 from eileenmcnaughton/vis
Remove obsolete showVisibility
Eileen McNaughton [Fri, 19 Nov 2021 21:45:28 +0000 (10:45 +1300)]
Remove obsolete showVisibility
Per https://github.com/civicrm/civicrm-core/pull/22079#issuecomment-
974267801
Seamus Lee [Fri, 19 Nov 2021 06:34:25 +0000 (17:34 +1100)]
Merge pull request #22009 from colemanw/afformSubmissionTable
Afform - Add table of submission results
Seamus Lee [Fri, 19 Nov 2021 06:33:32 +0000 (17:33 +1100)]
Merge pull request #21908 from eileenmcnaughton/statuses
[REF] Remove support for not-passed 'pledge' value
Seamus Lee [Fri, 19 Nov 2021 01:24:59 +0000 (12:24 +1100)]
Merge pull request #22035 from eileenmcnaughton/campaign
Escape-on-output: Cleanup addCampaignToSearch, remove isset
Seamus Lee [Fri, 19 Nov 2021 00:26:27 +0000 (11:26 +1100)]
Merge pull request #22099 from civicrm/5.44
5.44
colemanw [Thu, 18 Nov 2021 22:21:16 +0000 (17:21 -0500)]
Merge pull request #22084 from eileenmcnaughton/search
Remove smarty isset in favour of always set
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
Eileen McNaughton [Thu, 18 Nov 2021 21:28:51 +0000 (10:28 +1300)]
Merge pull request #22094 from civicrm/5.44
5.44
Eileen McNaughton [Thu, 18 Nov 2021 21:28:22 +0000 (10:28 +1300)]
Merge pull request #22098 from twomice/2959_fix_pdf_default_format
Fix dev/core#2959: some PDFs hard-code format to "a3 landscape", overriding default PDF format
demeritcowboy [Thu, 18 Nov 2021 19:49:34 +0000 (14:49 -0500)]
Merge pull request #22095 from colemanw/fixDomainOptionGroup
OptionValue - Fix checking if domain is set
Eileen McNaughton [Thu, 18 Nov 2021 19:27:35 +0000 (08:27 +1300)]
Merge pull request #22097 from mlutfy/fixStrings2021
Fix two English strings
Allen Shaw [Thu, 18 Nov 2021 18:10:33 +0000 (12:10 -0600)]
Fix dev/core#2959: some PDFs hard-code format to "a3 landscape", overriding default PDF format
Mathieu Lutfy [Thu, 18 Nov 2021 16:26:28 +0000 (11:26 -0500)]
Fix two English strings
Coleman Watts [Thu, 18 Nov 2021 02:56:24 +0000 (21:56 -0500)]
OptionValue - Fix checking if domain is set
Fixes a bug introduced in #19970
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.
Eileen McNaughton [Mon, 15 Nov 2021 20:33:56 +0000 (09:33 +1300)]
Remove smarty isset in favour of always set
Seamus Lee [Wed, 17 Nov 2021 22:31:41 +0000 (09:31 +1100)]
[REF] Upgrade CKEditor to 4.17.1
Eileen McNaughton [Wed, 17 Nov 2021 22:17:26 +0000 (11:17 +1300)]
Merge pull request #22091 from demeritcowboy/translate-js
Contribution amounts configuration page is borked when translation contains apostrophe
demeritcowboy [Wed, 17 Nov 2021 22:09:59 +0000 (17:09 -0500)]
Merge pull request #22089 from colemanw/nullOptionDefaultFix
OptionValue - Fix incorrect update of `is_default`
Coleman Watts [Wed, 17 Nov 2021 02:15:42 +0000 (21:15 -0500)]
OptionValue - Fix incorrect update of `is_default`
Checking `!empty($params['is_default'])` gave a false-positive for the string 'null'.
demeritcowboy [Wed, 17 Nov 2021 19:23:53 +0000 (14:23 -0500)]
fix when translation contains apostrophe
demeritcowboy [Wed, 17 Nov 2021 13:35:09 +0000 (08:35 -0500)]
Merge pull request #21992 from colemanw/searchKitImageAndDefault
SearchKit - Add default text/image to displays; support custom file fields
demeritcowboy [Wed, 17 Nov 2021 13:34:24 +0000 (08:34 -0500)]
Merge pull request #21966 from mattwire/eventnopricesetcurrency
Fix missing currency for event registration when configured via "quick config"
Matthew Wire [Wed, 17 Nov 2021 09:44:27 +0000 (09:44 +0000)]
Merge pull request #21854 from braders/feature/dev-core-2919-make-hidden-modal-buttons-non-focussable
dev/core#2919 Hidden submit buttons are confussing for keyboard users
Eileen McNaughton [Tue, 16 Nov 2021 21:09:00 +0000 (10:09 +1300)]
Merge pull request #22088 from demeritcowboy/website-default
dev/core#2894 - Crash when viewing a contact with a website
demeritcowboy [Tue, 16 Nov 2021 18:06:16 +0000 (13:06 -0500)]
fix website default
demeritcowboy [Tue, 16 Nov 2021 12:46:05 +0000 (07:46 -0500)]
Merge pull request #22082 from eileenmcnaughton/validate
Use smarty:nodefaults with smarty.get
demeritcowboy [Tue, 16 Nov 2021 00:57:03 +0000 (19:57 -0500)]
Merge pull request #22080 from seamuslee001/dev_drupal_169
[REF] dev/drupal#169 Replace other usages of session_id with CRM_Core…
Seamus Lee [Tue, 16 Nov 2021 00:56:47 +0000 (11:56 +1100)]
Merge pull request #22086 from civicrm/5.44
5.44
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
Eileen McNaughton [Mon, 15 Nov 2021 20:17:23 +0000 (09:17 +1300)]
Use smarty:nodefaults with smarty.get
smarty.get is a special smary function to access _GET and I think the nodefaults is the only option
(ie we can't ensure it is set)
demeritcowboy [Mon, 15 Nov 2021 13:35:14 +0000 (08:35 -0500)]
Merge pull request #22032 from agileware/CIVICRM-1885
CiviCRM Membership Status can never be deleted when logging is enabled
demeritcowboy [Mon, 15 Nov 2021 13:34:48 +0000 (08:34 -0500)]
Merge pull request #22022 from jaapjansma/issue2948
Fix for dev/core#2948
demeritcowboy [Mon, 15 Nov 2021 13:32:35 +0000 (08:32 -0500)]
Merge pull request #22076 from eileenmcnaughton/master_a
Ensure masterAddress is always assigned
Seamus Lee [Mon, 15 Nov 2021 06:29:09 +0000 (17:29 +1100)]
Merge pull request #22068 from colemanw/managedTypes
APIv4 - Opt-in more ManagedEntity types
Seamus Lee [Mon, 15 Nov 2021 02:24:49 +0000 (02:24 +0000)]
[REF] dev/drupal#169 Replace other usages of session_id with CRM_Core_Config::singleton()->userSystem->getSessionId
Seamus Lee [Mon, 15 Nov 2021 01:48:16 +0000 (12:48 +1100)]
Merge pull request #22077 from civicrm/5.44
5.44
Seamus Lee [Mon, 15 Nov 2021 01:43:07 +0000 (12:43 +1100)]
Merge pull request #22075 from eileenmcnaughton/paramssub
Ensure paramSubType is always set
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
Eileen McNaughton [Sun, 14 Nov 2021 18:26:57 +0000 (07:26 +1300)]
Ensure paramSubType is always set
demeritcowboy [Fri, 12 Nov 2021 21:53:57 +0000 (16:53 -0500)]
fix session change in drupal 9.2
Eileen McNaughton [Sun, 14 Nov 2021 18:31:16 +0000 (07:31 +1300)]
Ensure masterAddress is always assigned
Eileen McNaughton [Sun, 14 Nov 2021 04:09:39 +0000 (17:09 +1300)]
Merge pull request #22073 from demeritcowboy/parents2
[NFC] Add missing calls to parent::setUp and tearDown in unit tests
demeritcowboy [Sat, 13 Nov 2021 19:05:20 +0000 (14:05 -0500)]
E2E
demeritcowboy [Sat, 13 Nov 2021 19:04:37 +0000 (14:04 -0500)]
misc
demeritcowboy [Sat, 13 Nov 2021 19:00:43 +0000 (14:00 -0500)]
CRM
demeritcowboy [Sat, 13 Nov 2021 18:59:29 +0000 (13:59 -0500)]
Civi
demeritcowboy [Sat, 13 Nov 2021 18:56:58 +0000 (13:56 -0500)]
api4
Seamus Lee [Sat, 13 Nov 2021 20:27:23 +0000 (07:27 +1100)]
Merge pull request #22069 from eileenmcnaughton/context
Do not check is context is set, should always be
Coleman Watts [Sat, 13 Nov 2021 03:03:16 +0000 (22:03 -0500)]
APIv4 - Opt-in more ManagedEntity types
Adds the ManagedEntity trait to a number of entities that are commonly
used for configuration.
Seamus Lee [Sat, 13 Nov 2021 07:07:30 +0000 (18:07 +1100)]
Merge pull request #22067 from eileenmcnaughton/format
[NFC] Array formatting
Eileen McNaughton [Sat, 13 Nov 2021 02:50:43 +0000 (15:50 +1300)]
[NFC] Array formatting
Eileen McNaughton [Sat, 13 Nov 2021 03:01:32 +0000 (16:01 +1300)]
Do not check is context is set, should always be
Eileen McNaughton [Sat, 13 Nov 2021 02:41:50 +0000 (15:41 +1300)]
Merge pull request #22030 from eileenmcnaughton/isset_summary
Fix all the issets that affect ability to load contact summary page
Eileen McNaughton [Sat, 13 Nov 2021 02:40:07 +0000 (15:40 +1300)]
Merge pull request #22066 from demeritcowboy/gender-display
Fix typo in smarty template "gender_display"
Eileen McNaughton [Sat, 13 Nov 2021 02:39:53 +0000 (15:39 +1300)]
Merge pull request #22045 from seamuslee001/dev_mail_103
[NFC] dev/mail#103 Add in unit test to demonstate issue with API…
demeritcowboy [Fri, 12 Nov 2021 23:56:33 +0000 (18:56 -0500)]
fix typo
Seamus Lee [Fri, 12 Nov 2021 23:06:27 +0000 (10:06 +1100)]
Merge pull request #22065 from seamuslee001/master
[NFC] ENsure that formTpl is assigned in CRM_Custom_Form_OptionTest
Seamus Lee [Fri, 12 Nov 2021 00:59:43 +0000 (11:59 +1100)]
[NFC] dev/mail#103 Add in unit test to demonstate issue with APIv4 and joins
Add comment to test along the lines from Coleman and fix test cleanup
Update test to extend from BaseCustomValueTest
Seamus Lee [Fri, 12 Nov 2021 21:14:34 +0000 (21:14 +0000)]
[NFC] ENsure that formTpl is assigned in CRM_Custom_Form_OptionTest
Seamus Lee [Fri, 12 Nov 2021 21:13:33 +0000 (08:13 +1100)]
Merge pull request #22061 from demeritcowboy/formtpl2
[NFC] php8 assign formTpl in HookTest test
Eileen McNaughton [Wed, 10 Nov 2021 21:57:21 +0000 (10:57 +1300)]
Do not check if contact_type_label isset - it always is
Eileen McNaughton [Wed, 10 Nov 2021 20:46:11 +0000 (09:46 +1300)]
Ensure contact values are always assigned to the template
colemanw [Fri, 12 Nov 2021 20:11:25 +0000 (15:11 -0500)]
Merge pull request #22056 from eileenmcnaughton/context
Ensure context is always set
Eileen McNaughton [Fri, 12 Nov 2021 20:10:40 +0000 (09:10 +1300)]
Merge pull request #21909 from eileenmcnaughton/greeting_sanity
[REF] Preliminary cleanup in update greeting
colemanw [Fri, 12 Nov 2021 20:10:27 +0000 (15:10 -0500)]
Merge pull request #22055 from eileenmcnaughton/tagg
Ensure contactTag is always set
Eileen McNaughton [Fri, 12 Nov 2021 20:07:20 +0000 (09:07 +1300)]
Merge pull request #22057 from civicrm/5.44
5.44
demeritcowboy [Fri, 12 Nov 2021 19:51:47 +0000 (14:51 -0500)]
assign formTpl
colemanw [Fri, 12 Nov 2021 19:33:45 +0000 (14:33 -0500)]
Merge pull request #22059 from demeritcowboy/smarty-static-problem
php8 - fix for breadcrumb fails during tests
demeritcowboy [Fri, 12 Nov 2021 14:54:38 +0000 (09:54 -0500)]
temp fix for static smarty during tests
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:49:14 +0000 (19:49 +1100)]
Merge pull request #22044 from eileenmcnaughton/dep
Mark a few more token functions as deprected
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
Eileen McNaughton [Wed, 10 Nov 2021 21:52:40 +0000 (10:52 +1300)]
Ensure context is always set
Eileen McNaughton [Wed, 10 Nov 2021 21:52:17 +0000 (10:52 +1300)]
Ensure contactTag is always set
Seamus Lee [Fri, 12 Nov 2021 06:26:07 +0000 (17:26 +1100)]
Merge pull request #22047 from eileenmcnaughton/isset_gender
Ensure gender_display is always set
Seamus Lee [Fri, 12 Nov 2021 06:16:34 +0000 (17:16 +1100)]
Merge pull request #22053 from civicrm/5.44
5.44
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
Seamus Lee [Fri, 12 Nov 2021 05:13:52 +0000 (16:13 +1100)]
Merge pull request #22048 from demeritcowboy/session-status
[NFC] php8 - set smarty null defaults for CRM_Core_SessionTest
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:28:12 +0000 (20:28 -0800)]
Merge pull request #21989 from colemanw/managedEntityDelete
ManagedEntities - Track modification and auto-update
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
demeritcowboy [Fri, 12 Nov 2021 02:06:16 +0000 (21:06 -0500)]
php8 - set null defaults
Eileen McNaughton [Wed, 10 Nov 2021 20:46:11 +0000 (09:46 +1300)]
Ensure gender_display is always set
Always add it, rather than checking if it is assiged in the template
Eileen McNaughton [Sat, 23 Oct 2021 00:58:43 +0000 (13:58 +1300)]
[REF] Preliminary cleanup in update greeting
demeritcowboy [Fri, 12 Nov 2021 00:39:04 +0000 (19:39 -0500)]
Merge pull request #22042 from eileenmcnaughton/isset2
Ensure userRecordUrl is always set- fixes enotice with escape-on-output
Seamus Lee [Thu, 11 Nov 2021 23:58:01 +0000 (10:58 +1100)]
[REF] Skip testCutesyTokenData on php8 for the moment
Eileen McNaughton [Thu, 11 Nov 2021 23:46:34 +0000 (12:46 +1300)]
Mark a few more token functions as deprected
These are only used by the legacy mailing code or, in some cases, used by unsubscribe where it should use
the token processor
Eileen McNaughton [Thu, 11 Nov 2021 23:18:47 +0000 (12:18 +1300)]
Merge pull request #22038 from yashodha/report
(dev/core#2951) expose contribution custom fields in lybunt report
Eileen McNaughton [Thu, 11 Nov 2021 23:18:18 +0000 (12:18 +1300)]
Merge pull request #22041 from demeritcowboy/aggregate-report
dev/report#77 - Make contribution filters work for contribute/history civireport
Eileen McNaughton [Wed, 10 Nov 2021 21:50:02 +0000 (10:50 +1300)]
Ensure userRecordUrl is always set
demeritcowboy [Thu, 11 Nov 2021 18:48:00 +0000 (13:48 -0500)]
Merge pull request #22040 from colemanw/expectedKeys
Fix tabs getting overwritten by double foreach loop
demeritcowboy [Thu, 11 Nov 2021 16:43:08 +0000 (11:43 -0500)]
Merge pull request #21936 from JMAConsulting/issue_2912
dev/core#2912 : Can't save extra custom fields when inline and required