civicrm-core.git
2 years agoMerge pull request #22407 from eileenmcnaughton/rel
colemanw [Fri, 7 Jan 2022 19:30:41 +0000 (14:30 -0500)]
Merge pull request #22407 from eileenmcnaughton/rel

Remove check for contact_check as it is always an array here

2 years agoMerge pull request #20561 from WeMoveEU/fix/double-autosave
demeritcowboy [Fri, 7 Jan 2022 12:08:19 +0000 (07:08 -0500)]
Merge pull request #20561 from WeMoveEU/fix/double-autosave

dev/core#2587 Ignore modified_date when checking for changes during mailing auto-save

2 years agoMerge pull request #22274 from eileenmcnaughton/mems
demeritcowboy [Fri, 7 Jan 2022 12:07:30 +0000 (07:07 -0500)]
Merge pull request #22274 from eileenmcnaughton/mems

Fix testMultipleMembershipsContribution to use order api

2 years agoRemove check for contact_check as it is always an array here
Eileen McNaughton [Thu, 6 Jan 2022 20:54:31 +0000 (09:54 +1300)]
Remove check for contact_check as it is always an array here

2 years agoMerge pull request #22404 from eileenmcnaughton/hooky
Eileen McNaughton [Fri, 7 Jan 2022 08:47:01 +0000 (21:47 +1300)]
Merge pull request #22404 from eileenmcnaughton/hooky

Stop calling hook twice

2 years agoStop calling hook twice
Eileen McNaughton [Fri, 7 Jan 2022 03:05:58 +0000 (16:05 +1300)]
Stop calling hook twice

Per the code comments this hook is called here but also in add. This is all about the crazy
history of this function - which used to be tied to the relationship form.

I can't think of any valid use for calling the hook twice - but I can think of reasons it
would be bad...

2 years agoMerge pull request #22399 from eileenmcnaughton/data
Eileen McNaughton [Fri, 7 Jan 2022 06:33:44 +0000 (19:33 +1300)]
Merge pull request #22399 from eileenmcnaughton/data

Remove always-true IF

2 years agoMerge pull request #22398 from eileenmcnaughton/rel_add
Eileen McNaughton [Fri, 7 Jan 2022 06:02:15 +0000 (19:02 +1300)]
Merge pull request #22398 from eileenmcnaughton/rel_add

[REF] Remove unused variable

2 years agoMerge pull request #22397 from eileenmcnaughton/silly
Eileen McNaughton [Fri, 7 Jan 2022 05:58:28 +0000 (18:58 +1300)]
Merge pull request #22397 from eileenmcnaughton/silly

Remove unnecessary pass-by-ref

2 years agoMerge pull request #22320 from colemanw/activityDateMeta
Eileen McNaughton [Fri, 7 Jan 2022 05:27:28 +0000 (18:27 +1300)]
Merge pull request #22320 from colemanw/activityDateMeta

Add metadata so Activity Created Date is available in Form Builder

2 years agoMerge pull request #22379 from eileenmcnaughton/not1
colemanw [Fri, 7 Jan 2022 04:52:12 +0000 (23:52 -0500)]
Merge pull request #22379 from eileenmcnaughton/not1

Ensure assigned smarty array has empty keys (not no keys)

2 years agoMerge pull request #22402 from eileenmcnaughton/no_rel
Eileen McNaughton [Fri, 7 Jan 2022 04:41:38 +0000 (17:41 +1300)]
Merge pull request #22402 from eileenmcnaughton/no_rel

Clarify contents of ids for further fixes

2 years agoFix testMultipleMembershipsContribution to use order api
Eileen McNaughton [Sun, 19 Dec 2021 20:54:16 +0000 (09:54 +1300)]
Fix testMultipleMembershipsContribution to use order api

This test was not creating valid financial records prior to this

2 years agoSet version to 5.47.alpha1
CiviCRM [Fri, 7 Jan 2022 03:24:15 +0000 (03:24 +0000)]
Set version to 5.47.alpha1

2 years agoSet version to 5.46.beta1
CiviCRM [Fri, 7 Jan 2022 03:23:36 +0000 (03:23 +0000)]
Set version to 5.46.beta1

2 years agoMerge pull request #22393 from eileenmcnaughton/no_ref
Eileen McNaughton [Fri, 7 Jan 2022 03:16:01 +0000 (16:16 +1300)]
Merge pull request #22393 from eileenmcnaughton/no_ref

Remove unnecessary pass-by-ref

2 years agoMerge pull request #22392 from eileenmcnaughton/protect
Eileen McNaughton [Fri, 7 Jan 2022 03:11:34 +0000 (16:11 +1300)]
Merge pull request #22392 from eileenmcnaughton/protect

Privatise function

2 years agoClarify contents of ids for further fixes
Eileen McNaughton [Fri, 7 Jan 2022 01:37:47 +0000 (14:37 +1300)]
Clarify contents of ids for further fixes

2 years agoRemove always-true IF
Eileen McNaughton [Thu, 6 Jan 2022 20:53:38 +0000 (09:53 +1300)]
Remove always-true IF

2 years agoMerge pull request #22391 from eileenmcnaughton/legacy
Eileen McNaughton [Fri, 7 Jan 2022 01:45:58 +0000 (14:45 +1300)]
Merge pull request #22391 from eileenmcnaughton/legacy

[REF] Remove handling for relationshipID

2 years agoMerge pull request #22394 from eileenmcnaughton/return
Eileen McNaughton [Fri, 7 Jan 2022 01:39:04 +0000 (14:39 +1300)]
Merge pull request #22394 from eileenmcnaughton/return

Ensure getDuplicateContacts always returns an array

2 years ago[REF] Remove unused variable
Eileen McNaughton [Fri, 7 Jan 2022 01:23:00 +0000 (14:23 +1300)]
[REF] Remove unused variable

2 years agoRemove unnecessary pass-by-ref
Eileen McNaughton [Fri, 7 Jan 2022 00:49:17 +0000 (13:49 +1300)]
Remove unnecessary pass-by-ref

2 years agoEnsure getDuplicateContacts always returns an array
Eileen McNaughton [Fri, 7 Jan 2022 00:08:26 +0000 (13:08 +1300)]
Ensure getDuplicateContacts always returns an array

Calling code already handles an empty array as that is what it would receive - unless the hook set it to NULL

2 years agoRemove unnecessary pass-by-ref
Eileen McNaughton [Thu, 6 Jan 2022 23:58:53 +0000 (12:58 +1300)]
Remove unnecessary pass-by-ref

2 years agoPrivatise function
Eileen McNaughton [Thu, 6 Jan 2022 23:56:20 +0000 (12:56 +1300)]
Privatise function

2 years agoMerge pull request #22389 from colemanw/contactTypes
Eileen McNaughton [Thu, 6 Jan 2022 23:38:56 +0000 (12:38 +1300)]
Merge pull request #22389 from colemanw/contactTypes

REF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists

2 years ago[REF] Remove handling for relationshipID
Eileen McNaughton [Thu, 6 Jan 2022 20:52:17 +0000 (09:52 +1300)]
[REF] Remove handling for relationshipID

We can see that the only call to this function does not set params['id'] & hence it is NULL

2 years agoMerge pull request #22383 from colemanw/dedupeRuleScreenFixes
Eileen McNaughton [Thu, 6 Jan 2022 23:13:10 +0000 (12:13 +1300)]
Merge pull request #22383 from colemanw/dedupeRuleScreenFixes

DedupeRules - Translate contact type labels, respect enabled contact types

2 years agoMerge pull request #22390 from eileenmcnaughton/legacy2
colemanw [Thu, 6 Jan 2022 23:08:20 +0000 (18:08 -0500)]
Merge pull request #22390 from eileenmcnaughton/legacy2

[REF] Further cleanup on employer create

2 years agoMerge pull request #22319 from colemanw/afformSearchFilters
colemanw [Thu, 6 Jan 2022 23:05:03 +0000 (18:05 -0500)]
Merge pull request #22319 from colemanw/afformSearchFilters

Afform - UI and contextual titles for search displays

2 years agoMerge pull request #22323 from eileenmcnaughton/taxterm
colemanw [Thu, 6 Jan 2022 23:01:39 +0000 (18:01 -0500)]
Merge pull request #22323 from eileenmcnaughton/taxterm

Smarty modifier - stop using isset to check taxTerm

2 years agoMerge pull request #21178 from eileenmcnaughton/perm
Seamus Lee [Thu, 6 Jan 2022 23:01:17 +0000 (10:01 +1100)]
Merge pull request #21178 from eileenmcnaughton/perm

dev/core#2752 Allow financial_trxns to be viewed

2 years ago[REF] Simplify handing of ids
Eileen McNaughton [Thu, 6 Jan 2022 20:49:12 +0000 (09:49 +1300)]
[REF] Simplify handing of ids

Rather than compile contactID into an array to pass it in pass as itself. It is then
clear that ids['relationship'] will always be null - so remove the check

2 years agoREF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists
Coleman Watts [Thu, 6 Jan 2022 17:17:29 +0000 (12:17 -0500)]
REF - Use `CRM_Contact_BAO_ContactType::basicTypes()` instead of hardcoded lists

Makes code more flexible/forgiving if new contact types are added in the future,
or if existing contact types are disabled.

2 years agoMerge pull request #22388 from colemanw/unusedFunctionDel
colemanw [Thu, 6 Jan 2022 18:40:38 +0000 (13:40 -0500)]
Merge pull request #22388 from colemanw/unusedFunctionDel

Remove unused function

2 years agoRemove unused function
Coleman Watts [Thu, 6 Jan 2022 17:04:02 +0000 (12:04 -0500)]
Remove unused function

2 years agoDuplicate legacyCreateMultiple to contact_utils
Eileen McNaughton [Thu, 6 Jan 2022 02:26:07 +0000 (15:26 +1300)]
Duplicate legacyCreateMultiple to contact_utils

Having a lot of trouble fixing a bug via this method so gonn break up & clean up the function in this context
(leaves on the import class & a JMA extension calling it.

2 years agoMerge pull request #22369 from braders/dedupeRulesSystemCheck
colemanw [Wed, 5 Jan 2022 18:50:00 +0000 (13:50 -0500)]
Merge pull request #22369 from braders/dedupeRulesSystemCheck

Add system status check for missing dedupe rules

2 years agoMerge pull request #22378 from eileenmcnaughton/notice
colemanw [Wed, 5 Jan 2022 18:49:47 +0000 (13:49 -0500)]
Merge pull request #22378 from eileenmcnaughton/notice

Ensure dashboardLinks assigned to prevent e-notice

2 years agoMerge pull request #22382 from colemanw/api4ExplorerFormatArrayParams
colemanw [Wed, 5 Jan 2022 18:43:33 +0000 (13:43 -0500)]
Merge pull request #22382 from colemanw/api4ExplorerFormatArrayParams

APIv4 Explorer - Format array params using add methods instead of set

2 years agoDedupeRules - Translate contact type labels, respect enabled contact types
Coleman Watts [Wed, 5 Jan 2022 16:47:21 +0000 (11:47 -0500)]
DedupeRules - Translate contact type labels, respect enabled contact types

2 years agoAdd system status check for missing dedupe rules
Bradley Taylor [Tue, 4 Jan 2022 12:44:36 +0000 (12:44 +0000)]
Add system status check for missing dedupe rules

2 years agoAPIv4 Explorer - Format array params using add methods instead of set when available
Coleman Watts [Wed, 5 Jan 2022 16:06:24 +0000 (11:06 -0500)]
APIv4 Explorer - Format array params using add methods instead of set when available

Improves OOP generated code by using sugar methods `addGroupBy()` and `addRecords()`

2 years agoMerge pull request #22267 from eileenmcnaughton/cont_test2
colemanw [Wed, 5 Jan 2022 15:14:21 +0000 (10:14 -0500)]
Merge pull request #22267 from eileenmcnaughton/cont_test2

[Ref] Add getter for priceSetID and use full form flow

2 years agoEnsure assigned smarty array has empty keys (not no keys)
Eileen McNaughton [Wed, 5 Jan 2022 06:19:20 +0000 (19:19 +1300)]
Ensure assigned smarty array has empty keys (not no keys)

2 years agoEnsure dashboardLinks assigned to prevent e-notice
Eileen McNaughton [Wed, 5 Jan 2022 05:49:18 +0000 (18:49 +1300)]
Ensure dashboardLinks assigned to prevent e-notice

Rather than no assign assign an empty array. It is processed with a foreach so all good

2 years agoMerge pull request #22366 from colemanw/fixSearchKitEditableDates
Eileen McNaughton [Wed, 5 Jan 2022 05:39:21 +0000 (18:39 +1300)]
Merge pull request #22366 from colemanw/fixSearchKitEditableDates

SearchKit - Fix editable dates on standalone form

2 years agoMerge pull request #22367 from colemanw/searchKitViewButton
Eileen McNaughton [Wed, 5 Jan 2022 05:37:04 +0000 (18:37 +1300)]
Merge pull request #22367 from colemanw/searchKitViewButton

SearchKit - Contextual "View" button

2 years agodev/core#2752 Allow financial_trxns to be viewed
Eileen McNaughton [Wed, 18 Aug 2021 21:18:05 +0000 (09:18 +1200)]
dev/core#2752 Allow financial_trxns to be viewed

Per https://lab.civicrm.org/dev/core/-/issues/2752 this allows non admins to
see payment details in search for contributions they can see.
I only added for 'get' because I didn't want to loosen 'delete'
(in particular) and this was the minimum extra to achieve
search access

2 years agoMerge pull request #22373 from demeritcowboy/memwarn
Eileen McNaughton [Wed, 5 Jan 2022 05:24:18 +0000 (18:24 +1300)]
Merge pull request #22373 from demeritcowboy/memwarn

Fix E_WARNING access array offset on null when creating new contribution page

2 years agoMerge pull request #22375 from demeritcowboy/searchkit-chicken-egg
Eileen McNaughton [Wed, 5 Jan 2022 05:24:00 +0000 (18:24 +1300)]
Merge pull request #22375 from demeritcowboy/searchkit-chicken-egg

dev/report#90 - Don't crash search_kit on upgrade from 5.35

2 years agoMerge pull request #22377 from eileenmcnaughton/format
Eileen McNaughton [Wed, 5 Jan 2022 05:23:17 +0000 (18:23 +1300)]
Merge pull request #22377 from eileenmcnaughton/format

dev/core#2773 Add an ACL to demo data

2 years agoMerge pull request #22372 from eileenmcnaughton/acl4
Eileen McNaughton [Wed, 5 Jan 2022 05:23:00 +0000 (18:23 +1300)]
Merge pull request #22372 from eileenmcnaughton/acl4

enotice fix (with default modifiers)

2 years agoAdd an ACL to demo data
Eileen McNaughton [Wed, 5 Jan 2022 02:23:31 +0000 (15:23 +1300)]
Add an ACL to demo data

This creates an acl user (jenny@example.com) who can view members of the Volunteer group.
A change will also be needed in buildkit to add her user account

2 years agoMerge pull request #22365 from colemanw/importMultiValuedCustom
Eileen McNaughton [Wed, 5 Jan 2022 03:16:58 +0000 (16:16 +1300)]
Merge pull request #22365 from colemanw/importMultiValuedCustom

Fix "Import Multi-Value Custom Data"

2 years agoMerge pull request #22371 from eileenmcnaughton/acl2
colemanw [Wed, 5 Jan 2022 02:32:53 +0000 (21:32 -0500)]
Merge pull request #22371 from eileenmcnaughton/acl2

Do not escape showHideBlocks by default

2 years agoMerge pull request #22374 from eileenmcnaughton/format
Seamus Lee [Wed, 5 Jan 2022 02:20:36 +0000 (13:20 +1100)]
Merge pull request #22374 from eileenmcnaughton/format

Formatting cleanup

2 years agodon't crash on upgrade from 5.35
demeritcowboy [Wed, 5 Jan 2022 02:07:05 +0000 (21:07 -0500)]
don't crash on upgrade from 5.35

2 years agoMerge pull request #21483 from jmcclelland/leaky-honoree-variable
demeritcowboy [Wed, 5 Jan 2022 00:54:36 +0000 (19:54 -0500)]
Merge pull request #21483 from jmcclelland/leaky-honoree-variable

Ensure we don't get previously set honoree values in receipts

2 years agoFormatting cleanup
Eileen McNaughton [Wed, 5 Jan 2022 00:41:39 +0000 (13:41 +1300)]
Formatting cleanup

2 years agoMerge pull request #22370 from eileenmcnaughton/acl
Eileen McNaughton [Wed, 5 Jan 2022 00:35:55 +0000 (13:35 +1300)]
Merge pull request #22370 from eileenmcnaughton/acl

Fix notices on acl page

2 years agoenotice fix (with default modifiers)
Eileen McNaughton [Wed, 5 Jan 2022 00:34:37 +0000 (13:34 +1300)]
enotice fix (with default modifiers)

2 years agofix array element access on null
demeritcowboy [Wed, 5 Jan 2022 00:33:42 +0000 (19:33 -0500)]
fix array element access on null

2 years agoMerge pull request #22356 from colemanw/searchKitLinks
colemanw [Tue, 4 Jan 2022 23:05:24 +0000 (18:05 -0500)]
Merge pull request #22356 from colemanw/searchKitLinks

SearchKit - Allow aggregate columns to be links

2 years agoDo not escape showHideBlocks by default
Eileen McNaughton [Tue, 4 Jan 2022 22:49:42 +0000 (11:49 +1300)]
Do not escape showHideBlocks by default

Affects civicrm/acl?action=add&reset=1

2 years agoFix notices on acl page
Eileen McNaughton [Tue, 4 Jan 2022 22:41:26 +0000 (11:41 +1300)]
Fix notices on acl page

civicrm/acl?reset=1

2 years agoMerge pull request #21517 from mattwire/propertybagrecurinstallments
demeritcowboy [Tue, 4 Jan 2022 22:03:35 +0000 (17:03 -0500)]
Merge pull request #21517 from mattwire/propertybagrecurinstallments

Fix PropertyBag setRecurInstallments to accept 0

2 years agoRegenerate sql for new "Import Custom Data" menu item
Coleman Watts [Tue, 4 Jan 2022 17:17:56 +0000 (12:17 -0500)]
Regenerate sql for new "Import Custom Data" menu item

2 years agoMerge pull request #22309 from eileenmcnaughton/brickit
demeritcowboy [Tue, 4 Jan 2022 16:34:47 +0000 (11:34 -0500)]
Merge pull request #22309 from eileenmcnaughton/brickit

Use new money formatting util for smarty formatting

2 years agoMerge pull request #21916 from mattwire/recurprocessorid
demeritcowboy [Tue, 4 Jan 2022 06:09:07 +0000 (01:09 -0500)]
Merge pull request #21916 from mattwire/recurprocessorid

dev/financial#57 Hide recur trxn_id if it matches recur processor_id

2 years agoMerge pull request #22361 from braders/phone-email-label-accessibility
Yashodha Chaku [Tue, 4 Jan 2022 04:11:25 +0000 (09:41 +0530)]
Merge pull request #22361 from braders/phone-email-label-accessibility

Improve accessibility - associate label and fields

2 years agoSearchKit - Contextual "View" button
Coleman Watts [Tue, 4 Jan 2022 04:06:44 +0000 (23:06 -0500)]
SearchKit - Contextual "View" button

This should make it less confusing. When you click on the View button it will take you to the display you are currently editing.
When not on a display, the View button looks different so it's easier to tell where it's taking you.
Fixes dev/core#3016

2 years agoSearchKit - Fix editable dates on standalone form
Coleman Watts [Tue, 4 Jan 2022 03:19:54 +0000 (22:19 -0500)]
SearchKit - Fix editable dates on standalone form

For better or worse, the crmDatePicker widget requires a parent <form> element.
Fixes dev/core#3017

2 years agoImport - Fix loading and saving multiValued custom data field mapping
Coleman Watts [Tue, 4 Jan 2022 02:51:37 +0000 (21:51 -0500)]
Import - Fix loading and saving multiValued custom data field mapping

2 years agoImport - Fix multi-record custom data import PHP errors
Coleman Watts [Mon, 3 Jan 2022 21:53:29 +0000 (16:53 -0500)]
Import - Fix multi-record custom data import PHP errors

Fixes fatal PHP error `Declaration of CRM_Custom_Import_Parser::run(...) should be compatible with CRM_Contact_Import_Parser::run(...)`
by switching to inherit the base class instead of the contact import class. This simplifies the code in general.

2 years agoMerge pull request #22364 from eileenmcnaughton/defaults
colemanw [Tue, 4 Jan 2022 02:35:28 +0000 (21:35 -0500)]
Merge pull request #22364 from eileenmcnaughton/defaults

Fix campaign dashboard to work with default escaping

2 years agoMerge pull request #22363 from eileenmcnaughton/noticey2
Seamus Lee [Tue, 4 Jan 2022 01:38:45 +0000 (12:38 +1100)]
Merge pull request #22363 from eileenmcnaughton/noticey2

Fix over-escaping when default escaping is on

2 years agoMerge pull request #22362 from eileenmcnaughton/noticey
Seamus Lee [Tue, 4 Jan 2022 01:18:41 +0000 (12:18 +1100)]
Merge pull request #22362 from eileenmcnaughton/noticey

Fix escape-by-default

2 years agoFix campaign dashboard to work with default escaping
Eileen McNaughton [Mon, 3 Jan 2022 23:51:11 +0000 (12:51 +1300)]
Fix campaign dashboard to work with default escaping

2 years agoFix over-escaping when default escaping is on
Eileen McNaughton [Mon, 3 Jan 2022 22:51:48 +0000 (11:51 +1300)]
Fix over-escaping when default escaping is on

2 years agoFix escape-by-default
Eileen McNaughton [Mon, 3 Jan 2022 22:48:07 +0000 (11:48 +1300)]
Fix escape-by-default

2 years agoMerge pull request #22357 from yashodha/dev-3012
Eileen McNaughton [Mon, 3 Jan 2022 22:29:04 +0000 (11:29 +1300)]
Merge pull request #22357 from yashodha/dev-3012

(dev/core#3012) Expose email on hold as filter for report

2 years agoMerge pull request #22359 from colemanw/api4ActivityCreate
Eileen McNaughton [Mon, 3 Jan 2022 22:28:33 +0000 (11:28 +1300)]
Merge pull request #22359 from colemanw/api4ActivityCreate

APIv4 - Set 'activity_type_id' to required

2 years agoCleanup multi-record custom import tpl and warn user if no multi-custom groups exist.
Coleman Watts [Mon, 3 Jan 2022 19:58:18 +0000 (14:58 -0500)]
Cleanup multi-record custom import tpl and warn user if no multi-custom groups exist.

2 years agoAdd menu item for "Import MultiValued Custom Data"
Coleman Watts [Mon, 3 Jan 2022 19:25:20 +0000 (14:25 -0500)]
Add menu item for "Import MultiValued Custom Data"

2 years agoMerge pull request #22360 from braders/import-field-docblock-improvements
colemanw [Mon, 3 Jan 2022 20:00:22 +0000 (15:00 -0500)]
Merge pull request #22360 from braders/import-field-docblock-improvements

[NFC] docblock improvements to Import_Field classes

2 years agoImprove accessibility - associate label and fields
Bradley Taylor [Mon, 3 Jan 2022 17:39:03 +0000 (17:39 +0000)]
Improve accessibility - associate label and fields

2 years agodocblock improvements to Import_Field classes
Bradley Taylor [Mon, 3 Jan 2022 17:20:07 +0000 (17:20 +0000)]
docblock improvements to Import_Field classes

2 years agoAPIv4 - Set 'activity_type_id' to required
Coleman Watts [Tue, 28 Dec 2021 15:40:58 +0000 (10:40 -0500)]
APIv4 - Set 'activity_type_id' to required

In APIv4 GetFields, sets activity field to required because the
database default is problematic.

2 years agoMerge pull request #22349 from braders/chart-label-translatable
demeritcowboy [Mon, 3 Jan 2022 14:14:34 +0000 (09:14 -0500)]
Merge pull request #22349 from braders/chart-label-translatable

Allow chart dropdown labels to be translatable.

2 years agoAllow chart dropdown labels to be translatable.
Bradley Taylor [Fri, 31 Dec 2021 12:19:19 +0000 (12:19 +0000)]
Allow chart dropdown labels to be translatable.

Prior to this change, the strings 'Tabular', 'Bar Chart' and 'Pie Chart' were hardcoded.

2 years agoMerge pull request #22318 from jitendrapurohit/state_name
Yashodha Chaku [Mon, 3 Jan 2022 05:48:35 +0000 (11:18 +0530)]
Merge pull request #22318 from jitendrapurohit/state_name

Add state name to export fields

2 years ago(dev/core#3012) expose email on hold as filter for report
yashodha [Mon, 3 Jan 2022 03:31:48 +0000 (09:01 +0530)]
(dev/core#3012) expose email on hold as filter for report

2 years agoSearchKit - Allow aggregate columns to be links
Coleman Watts [Sun, 2 Jan 2022 22:02:30 +0000 (17:02 -0500)]
SearchKit - Allow aggregate columns to be links

Previously aggregate columns were excluded from being shown as links.
That's overly strict. They can't have autogenerated links, but they can
have custom links.

2 years agoAlways assign taxTerm to templates
Eileen McNaughton [Wed, 29 Dec 2021 21:47:15 +0000 (10:47 +1300)]
Always assign taxTerm to templates

I do wonder about making this a domain token - I go back & forth a bit but as
a domain token it would be available in non-smarty contexts too & could be exported

2 years agoMerge pull request #22350 from demeritcowboy/managed-entities-drupal
colemanw [Sun, 2 Jan 2022 15:35:18 +0000 (10:35 -0500)]
Merge pull request #22350 from demeritcowboy/managed-entities-drupal

dev/drupal#172 - module status used incorrectly in drupal 8 to determine which modules to care about for managed entities

2 years agoMerge pull request #22347 from braders/price-set-unnecessary-ids
colemanw [Sun, 2 Jan 2022 15:33:14 +0000 (10:33 -0500)]
Merge pull request #22347 from braders/price-set-unnecessary-ids

Remove unnecessary id attribute.

2 years agoMerge pull request #22354 from civicrm/5.45
Seamus Lee [Sat, 1 Jan 2022 23:52:28 +0000 (10:52 +1100)]
Merge pull request #22354 from civicrm/5.45

5.45

2 years agoMerge pull request #22353 from seamuslee001/5.45
Tim Otten [Sat, 1 Jan 2022 23:00:23 +0000 (17:00 -0600)]
Merge pull request #22353 from seamuslee001/5.45

[REF] Fix tests that fail after 2021