civicrm-core.git
2 years agoMerge pull request #22560 from eileenmcnaughton/fin_type
Seamus Lee [Sat, 22 Jan 2022 00:39:55 +0000 (11:39 +1100)]
Merge pull request #22560 from eileenmcnaughton/fin_type

Use tokens in offline contribution receipt (new installs)

2 years agoMerge pull request #22594 from eileenmcnaughton/deprecated
colemanw [Fri, 21 Jan 2022 15:22:55 +0000 (10:22 -0500)]
Merge pull request #22594 from eileenmcnaughton/deprecated

Remove unreachable code

2 years agoMerge pull request #22593 from eileenmcnaughton/values
Yashodha Chaku [Fri, 21 Jan 2022 07:41:49 +0000 (13:11 +0530)]
Merge pull request #22593 from eileenmcnaughton/values

Pass remove-by-reference

2 years agoMerge pull request #22557 from colemanw/searckKitLinkConditions
Seamus Lee [Fri, 21 Jan 2022 06:46:11 +0000 (17:46 +1100)]
Merge pull request #22557 from colemanw/searckKitLinkConditions

SearchKit - Support conditional links

2 years agoMerge pull request #22324 from totten/master-queue-table
Tim Otten [Fri, 21 Jan 2022 06:02:57 +0000 (22:02 -0800)]
Merge pull request #22324 from totten/master-queue-table

(dev/core#1304) Queue - Add high-level tracking table

2 years agoPass remove-by-reference
Eileen McNaughton [Fri, 21 Jan 2022 03:01:57 +0000 (16:01 +1300)]
Pass remove-by-reference

2 years agoMerge pull request #22586 from braders/checkTemplateFileExists-consistency-phpdoc
Eileen McNaughton [Fri, 21 Jan 2022 03:10:42 +0000 (16:10 +1300)]
Merge pull request #22586 from braders/checkTemplateFileExists-consistency-phpdoc

Add consistency between checkTemplateFileExists functions,

2 years agoRemove unreachable code
Eileen McNaughton [Fri, 21 Jan 2022 03:04:37 +0000 (16:04 +1300)]
Remove unreachable code

2 years agoMerge pull request #22481 from eileenmcnaughton/deprecated
colemanw [Fri, 21 Jan 2022 02:30:10 +0000 (21:30 -0500)]
Merge pull request #22481 from eileenmcnaughton/deprecated

Duplicate function from deprecated utils onto calling classes & remove

2 years agoQueue XML/DAO/BAO - Add pseudoconstant for listing available types
Tim Otten [Fri, 21 Jan 2022 02:28:28 +0000 (18:28 -0800)]
Queue XML/DAO/BAO - Add pseudoconstant for listing available types

2 years agoMerge pull request #22585 from colemanw/pissbyref
Eileen McNaughton [Fri, 21 Jan 2022 02:27:44 +0000 (15:27 +1300)]
Merge pull request #22585 from colemanw/pissbyref

Remove useless function

2 years agoSearchKit - Support conditional links
Coleman Watts [Tue, 18 Jan 2022 02:41:32 +0000 (21:41 -0500)]
SearchKit - Support conditional links

Advanced feature to conditionally show/hide links in a links/buttons/menu column,
based on user permissions or row values.

2 years agoMerge pull request #22566 from eileenmcnaughton/dep
colemanw [Fri, 21 Jan 2022 01:18:02 +0000 (20:18 -0500)]
Merge pull request #22566 from eileenmcnaughton/dep

CRM_Core_Component (et al) - Deprecate unused functions

2 years agoMerge pull request #22591 from civicrm/5.46
Eileen McNaughton [Fri, 21 Jan 2022 00:40:32 +0000 (13:40 +1300)]
Merge pull request #22591 from civicrm/5.46

5.46 to master

2 years agoMerge pull request #22589 from eileenmcnaughton/46
Eileen McNaughton [Fri, 21 Jan 2022 00:39:51 +0000 (13:39 +1300)]
Merge pull request #22589 from eileenmcnaughton/46

Use api for entityRole - addresses save issue on the form

2 years agoMerge pull request #22590 from eileenmcnaughton/prop
Eileen McNaughton [Thu, 20 Jan 2022 23:33:57 +0000 (12:33 +1300)]
Merge pull request #22590 from eileenmcnaughton/prop

Remove param default

2 years agoRemove param default
Eileen McNaughton [Thu, 20 Jan 2022 22:41:41 +0000 (11:41 +1300)]
Remove param default

Since value is required the default for label would never be used

2 years agoUse api for entityRole - addresses save issue on the form
Eileen McNaughton [Thu, 20 Jan 2022 22:23:23 +0000 (11:23 +1300)]
Use api for entityRole - addresses save issue on the form

2 years agoMerge pull request #22572 from yashodha/dev_3012
Eileen McNaughton [Thu, 20 Jan 2022 20:57:04 +0000 (09:57 +1300)]
Merge pull request #22572 from yashodha/dev_3012

(dev/core#3012) Expose more options for email on hold as filter for l…

2 years agoMerge pull request #22559 from colemanw/permissionGroup
Eileen McNaughton [Thu, 20 Jan 2022 20:55:30 +0000 (09:55 +1300)]
Merge pull request #22559 from colemanw/permissionGroup

APIv4 - Make Permission 'group' discoverable in API Explorer

2 years agoMerge pull request #22554 from colemanw/searchKitOps
Eileen McNaughton [Thu, 20 Jan 2022 20:54:02 +0000 (09:54 +1300)]
Merge pull request #22554 from colemanw/searchKitOps

SearchKit - Update operator labels

2 years agoMerge pull request #22581 from lemniscus/feature/issue-3037/two-digit-year-import
colemanw [Thu, 20 Jan 2022 20:53:28 +0000 (15:53 -0500)]
Merge pull request #22581 from lemniscus/feature/issue-3037/two-digit-year-import

Use rolling window for translating 2-digit years into 4-digit years

2 years agoMerge pull request #22508 from twomice/event_66_allow_dupliate_price_field_label
colemanw [Thu, 20 Jan 2022 20:48:16 +0000 (15:48 -0500)]
Merge pull request #22508 from twomice/event_66_allow_dupliate_price_field_label

dev/event#66: allow duplicate price field labels

2 years agoMerge pull request #22570 from colemanw/uniqueName
Eileen McNaughton [Thu, 20 Jan 2022 20:41:39 +0000 (09:41 +1300)]
Merge pull request #22570 from colemanw/uniqueName

DAO - Centralize logic to derive unique name from label

2 years agoMerge pull request #22579 from eileenmcnaughton/api4
colemanw [Thu, 20 Jan 2022 20:22:29 +0000 (15:22 -0500)]
Merge pull request #22579 from eileenmcnaughton/api4

Simplify apiv4 conformance test

2 years agoRemove useless function
Coleman Watts [Thu, 20 Jan 2022 20:04:02 +0000 (15:04 -0500)]
Remove useless function

2 years agoAdd consistency between checkTemplateFileExists functions,
Bradley Taylor [Thu, 20 Jan 2022 19:45:59 +0000 (19:45 +0000)]
Add consistency between checkTemplateFileExists functions,
resolving phpdoc issues in the process.

2 years agoMerge pull request #21583 from mattwire/propertybagsimplebits
Matthew Wire [Thu, 20 Jan 2022 18:50:09 +0000 (18:50 +0000)]
Merge pull request #21583 from mattwire/propertybagsimplebits

Add billingStateProvince and standardized property names

2 years agoMerge pull request #22561 from mattwire/jobapi3
Matthew Wire [Thu, 20 Jan 2022 18:40:47 +0000 (18:40 +0000)]
Merge pull request #22561 from mattwire/jobapi3

Fix return values for API3 Job.delete

2 years agoDAO - Centralize logic to derive unique name from label
Coleman Watts [Wed, 19 Jan 2022 02:45:33 +0000 (21:45 -0500)]
DAO - Centralize logic to derive unique name from label

This function checks db indices to enforce uniqueness of "name" column
when creating a new record via the `DAO::writeRecord()` method.

2 years agoMerge pull request #22584 from civicrm/5.46
Seamus Lee [Thu, 20 Jan 2022 07:19:59 +0000 (18:19 +1100)]
Merge pull request #22584 from civicrm/5.46

Merge pull request #22583 from seamuslee001/update_jquery_ui

2 years agoMerge pull request #22583 from seamuslee001/update_jquery_ui
Seamus Lee [Thu, 20 Jan 2022 07:19:34 +0000 (18:19 +1100)]
Merge pull request #22583 from seamuslee001/update_jquery_ui

[REF] Upgrade JQuery UI to 1.13.0

2 years agoMerge pull request #22582 from civicrm/5.46
Seamus Lee [Thu, 20 Jan 2022 06:44:15 +0000 (17:44 +1100)]
Merge pull request #22582 from civicrm/5.46

5.46

2 years agoSimplify apiv4 conformance test
Eileen McNaughton [Wed, 19 Jan 2022 23:34:26 +0000 (12:34 +1300)]
Simplify apiv4 conformance test

The use of services meant this test failed if you didn't do
something or other (maybe some flushing - I never did figure it
out) & is an unnecessary complexity.

2 years agoMerge pull request #21865 from colemanw/SearchKitTags
Seamus Lee [Thu, 20 Jan 2022 03:46:22 +0000 (14:46 +1100)]
Merge pull request #21865 from colemanw/SearchKitTags

SearchKit - add/remove tags action for all taggable entities

2 years agoMerge pull request #22537 from jensschuppe/fix/typeErrorCustomFieldTokens
Seamus Lee [Thu, 20 Jan 2022 03:45:37 +0000 (14:45 +1100)]
Merge pull request #22537 from jensschuppe/fix/typeErrorCustomFieldTokens

[dev/core#3029] Avoid risking a TypeError when evaluating tokens for non-existent custom fields

2 years agotranslate 2-digit years to 4 using rolling -95yr to +5yr window
Noah Miller [Thu, 20 Jan 2022 02:32:56 +0000 (18:32 -0800)]
translate 2-digit years to 4 using rolling -95yr to +5yr window

2 years agoMerge pull request #22577 from braders/remove-method-getWordReplacement
Seamus Lee [Thu, 20 Jan 2022 01:08:33 +0000 (12:08 +1100)]
Merge pull request #22577 from braders/remove-method-getWordReplacement

Remove method getWordReplacement.

2 years agoMerge pull request #22576 from seamuslee001/update_jquery_ui
colemanw [Thu, 20 Jan 2022 00:45:08 +0000 (19:45 -0500)]
Merge pull request #22576 from seamuslee001/update_jquery_ui

[REF] Upgrade JQuery UI to 1.13.0

2 years agoMerge pull request #22574 from braders/send_unsub_response-phpdoc
Tim Otten [Thu, 20 Jan 2022 00:00:34 +0000 (16:00 -0800)]
Merge pull request #22574 from braders/send_unsub_response-phpdoc

(NFC) Minor phpdoc fixes to CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response

2 years agoMerge pull request #22480 from eileenmcnaughton/create_date
colemanw [Wed, 19 Jan 2022 22:50:28 +0000 (17:50 -0500)]
Merge pull request #22480 from eileenmcnaughton/create_date

Add created_date & modified_date to civicrm_relationship

2 years agoRemove method getWordReplacement.
Bradley Taylor [Wed, 19 Jan 2022 22:31:50 +0000 (22:31 +0000)]
Remove method getWordReplacement.

It appears to have never been used since its introduction 8 years ago,
and furthermore calls functions which don't exist.

Therefore, it would be unlikely to work even if it were used.

2 years agoMerge pull request #22575 from braders/getGroupByFromSelectColumns-tidy
Seamus Lee [Wed, 19 Jan 2022 22:30:49 +0000 (09:30 +1100)]
Merge pull request #22575 from braders/getGroupByFromSelectColumns-tidy

(NFC) Minor amends to getGroupByFromSelectColumns

2 years ago[REF] Upgrade JQuery UI to 1.13.0
Seamus Lee [Wed, 19 Jan 2022 22:27:36 +0000 (09:27 +1100)]
[REF] Upgrade JQuery UI to 1.13.0

2 years ago(NFC) Minor amends to getGroupByFromSelectColumns
Bradley Taylor [Wed, 19 Jan 2022 20:05:32 +0000 (20:05 +0000)]
(NFC) Minor amends to getGroupByFromSelectColumns

2 years ago(NFC) Minor phpdoc fixes to CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response
Bradley Taylor [Wed, 19 Jan 2022 19:24:16 +0000 (19:24 +0000)]
(NFC) Minor phpdoc fixes to CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response

2 years agoMerge pull request #22562 from braders/hook-preevent-docblock
Eileen McNaughton [Wed, 19 Jan 2022 19:03:26 +0000 (08:03 +1300)]
Merge pull request #22562 from braders/hook-preevent-docblock

(NFC) Correctly document CRM_Utils_Hook::pre to allow null ID

2 years agoMerge pull request #22573 from colemanw/componentFn
Eileen McNaughton [Wed, 19 Jan 2022 19:02:30 +0000 (08:02 +1300)]
Merge pull request #22573 from colemanw/componentFn

[REF] Components - Use extracted function

2 years agoSearchKit - Update operator labels
Coleman Watts [Tue, 18 Jan 2022 01:02:54 +0000 (20:02 -0500)]
SearchKit - Update operator labels

2 years agoComponents - Use extracted function
Coleman Watts [Wed, 19 Jan 2022 16:01:30 +0000 (11:01 -0500)]
Components - Use extracted function

Uses function extracted in #22567

2 years agoMerge pull request #22458 from eileenmcnaughton/test
colemanw [Wed, 19 Jan 2022 14:29:42 +0000 (09:29 -0500)]
Merge pull request #22458 from eileenmcnaughton/test

dev/core#2757 test to demonstrate contact delete actions were not called for v4 api

2 years ago(dev/core#3012) Expose more options for email on hold as filter for lybunt report
yashodha [Wed, 19 Jan 2022 10:42:10 +0000 (16:12 +0530)]
(dev/core#3012) Expose more options for email on hold as filter for lybunt report

2 years agoMerge pull request #22565 from braders/report-form-docblock
Eileen McNaughton [Wed, 19 Jan 2022 07:59:33 +0000 (20:59 +1300)]
Merge pull request #22565 from braders/report-form-docblock

(NFC) CiviReport, etal - More phpdoc fixes

2 years agoMerge pull request #22507 from colemanw/searchImportCleanup
Eileen McNaughton [Wed, 19 Jan 2022 05:43:42 +0000 (18:43 +1300)]
Merge pull request #22507 from colemanw/searchImportCleanup

[REF] SearchKit - Simplify import/export popup code

2 years agoMerge pull request #22568 from demeritcowboy/details-wrong-name
Seamus Lee [Wed, 19 Jan 2022 04:53:03 +0000 (15:53 +1100)]
Merge pull request #22568 from demeritcowboy/details-wrong-name

Activity Details field on batch update via profile has wrong fieldname

2 years agoAdd created_date & modified_date to civicrm_relationship
Eileen McNaughton [Wed, 12 Jan 2022 03:00:59 +0000 (16:00 +1300)]
Add created_date & modified_date to civicrm_relationship

As with other tables we have done this to, knowing when we added a record to the
DB is useful (and differs from the relationship start_date).

I'm not sure yet if I will try to expose in the UI or whether search-kit
is all we need

2 years agoMerge pull request #22569 from demeritcowboy/duplicate-file
demeritcowboy [Wed, 19 Jan 2022 03:59:56 +0000 (22:59 -0500)]
Merge pull request #22569 from demeritcowboy/duplicate-file

Remove duplicate file

2 years agoremove duplicate file
demeritcowboy [Wed, 19 Jan 2022 02:12:18 +0000 (21:12 -0500)]
remove duplicate file

2 years agoRemove silly calls to contactSubTypes
Eileen McNaughton [Wed, 19 Jan 2022 01:50:26 +0000 (14:50 +1300)]
Remove silly calls to contactSubTypes

2 years agoMerge pull request #22563 from braders/alterDeferredRevenueItems-phpdoc
Eileen McNaughton [Wed, 19 Jan 2022 01:35:59 +0000 (14:35 +1300)]
Merge pull request #22563 from braders/alterDeferredRevenueItems-phpdoc

(NFC) Update PHPDoc for alterDeferredRevenueItems

2 years agoMerge pull request #22567 from eileenmcnaughton/enabled
Eileen McNaughton [Wed, 19 Jan 2022 01:02:48 +0000 (14:02 +1300)]
Merge pull request #22567 from eileenmcnaughton/enabled

(REF) Extract function `CRM_Core_Component::isEnabled()`

2 years agofix wrong field name
demeritcowboy [Tue, 18 Jan 2022 23:29:04 +0000 (18:29 -0500)]
fix wrong field name

2 years agoAdd function Core_Component::isEnabled
Eileen McNaughton [Tue, 18 Jan 2022 22:08:45 +0000 (11:08 +1300)]
Add function Core_Component::isEnabled

It always feels like there should be an easier to discover way to check if
a component is enabled ....

2 years agoDeprecate unused functions
Eileen McNaughton [Tue, 18 Jan 2022 21:44:44 +0000 (10:44 +1300)]
Deprecate unused functions

2 years agoMore phpdoc fixes, this time related to report form methods
Bradley Taylor [Tue, 18 Jan 2022 20:57:02 +0000 (20:57 +0000)]
More phpdoc fixes, this time related to report form methods

2 years agoMerge pull request #22555 from eileenmcnaughton/stricter
Tim Otten [Tue, 18 Jan 2022 20:43:18 +0000 (12:43 -0800)]
Merge pull request #22555 from eileenmcnaughton/stricter

(NFC) Comment fixes Stricter phpcs

2 years agoMerge pull request #22553 from eileenmcnaughton/css
Tim Otten [Tue, 18 Jan 2022 20:41:54 +0000 (12:41 -0800)]
Merge pull request #22553 from eileenmcnaughton/css

(NFC) Remaining css phpcs fixes

2 years agoUpdate PHPDoc for alterDeferredRevenueItems
Bradley Taylor [Tue, 18 Jan 2022 20:33:39 +0000 (20:33 +0000)]
Update PHPDoc for alterDeferredRevenueItems

2 years agoCorrectly document CRM_Utils_Hook::pre to allow null ID
Bradley Taylor [Tue, 18 Jan 2022 20:27:39 +0000 (20:27 +0000)]
Correctly document CRM_Utils_Hook::pre to allow null ID

2 years agoFix return values for API3 Job.delete
Matthew Wire [Tue, 18 Jan 2022 10:52:26 +0000 (10:52 +0000)]
Fix return values for API3 Job.delete

2 years ago[dev/core#3029] Throw and catch exception instead of risking a TypeError when evaluat...
Jens Schuppe [Mon, 17 Jan 2022 10:49:17 +0000 (11:49 +0100)]
[dev/core#3029] Throw and catch exception instead of risking a TypeError when evaluating tokens for non-existent custom fields

2 years agoMerge pull request #22556 from eileenmcnaughton/from_where
Eileen McNaughton [Tue, 18 Jan 2022 05:19:14 +0000 (18:19 +1300)]
Merge pull request #22556 from eileenmcnaughton/from_where

Follow up fn removal

2 years agoUse tokens in offline receipt
Eileen McNaughton [Tue, 18 Jan 2022 04:46:36 +0000 (17:46 +1300)]
Use tokens in offline receipt

This gets us away from the empty checks & the isset that causes a crash with smarty modifiers.
There is no change at the moment as to what is assigned so we don't need to make any changes to existing sites.

The goal is to specify the mappings on the workflow template class later. That will allow
us to remove significant amounts of code (& leakage points) from the form layer.
However we still need to resolve https://github.com/civicrm/civicrm-core/pull/22547
because at the moment values in this template expect raw values - which is
not the case with mapped params at the moment.

Note the biggest thing to contemplate in this PR is the addition of an
-always-there-in-contribution-smarty-templates smarty value isShowTax.
The way it is currently checking is that there should pretty much
be 'something' assigned if invoicing is enabled & it makes sense
that tax would show even if zero if enabled - which is what I *think*
is already happening (with maybe some random variation).

I added 'taxTerm' as a domain token and I do kinda prefer that but
it is available more places (unless we change the audience).
invoice_notes is another contribution setting that effects display.

2 years agoMerge pull request #22549 from eileenmcnaughton/tool_clean
Seamus Lee [Tue, 18 Jan 2022 03:11:55 +0000 (14:11 +1100)]
Merge pull request #22549 from eileenmcnaughton/tool_clean

Remove obsolete scripts

2 years agoAPIv4 - Make Permission 'group' discoverable in API Explorer
Coleman Watts [Tue, 18 Jan 2022 02:52:45 +0000 (21:52 -0500)]
APIv4 - Make Permission 'group' discoverable in API Explorer

2 years agoFollow up fn removal
Eileen McNaughton [Tue, 18 Jan 2022 01:39:06 +0000 (14:39 +1300)]
Follow up fn removal

2 years agoMerge pull request #22542 from colemanw/deprecateGetName
Eileen McNaughton [Tue, 18 Jan 2022 01:37:56 +0000 (14:37 +1300)]
Merge pull request #22542 from colemanw/deprecateGetName

[REF] SavedSearch - Deprecate/remove redundant/unused functions

2 years agoRemainin css phpcs fixes
Eileen McNaughton [Tue, 18 Jan 2022 00:59:42 +0000 (13:59 +1300)]
Remainin css phpcs fixes

2 years agoStricter phpcs
Eileen McNaughton [Tue, 18 Jan 2022 01:19:38 +0000 (14:19 +1300)]
Stricter phpcs

2 years agoMerge pull request #22466 from eileenmcnaughton/searchtype
Eileen McNaughton [Tue, 18 Jan 2022 01:08:45 +0000 (14:08 +1300)]
Merge pull request #22466 from eileenmcnaughton/searchtype

Re-fix enotice on searchType to work with default modifiers

2 years agoMerge pull request #22550 from eileenmcnaughton/tool_clean1
Eileen McNaughton [Tue, 18 Jan 2022 01:08:20 +0000 (14:08 +1300)]
Merge pull request #22550 from eileenmcnaughton/tool_clean1

Remove obsolete postIPN script

2 years agoMerge pull request #22529 from eileenmcnaughton/phpcs4
colemanw [Tue, 18 Jan 2022 00:03:19 +0000 (19:03 -0500)]
Merge pull request #22529 from eileenmcnaughton/phpcs4

PHPCS standards on css....

2 years agoMerge pull request #22544 from colemanw/deconstructor
Seamus Lee [Mon, 17 Jan 2022 23:29:59 +0000 (10:29 +1100)]
Merge pull request #22544 from colemanw/deconstructor

(REF) Remove constructors that do nothing

2 years agoMerge pull request #22545 from eileenmcnaughton/build
Seamus Lee [Mon, 17 Jan 2022 23:29:17 +0000 (10:29 +1100)]
Merge pull request #22545 from eileenmcnaughton/build

Remove unused variable

2 years agoRemove obsolete postIPN script
Eileen McNaughton [Mon, 17 Jan 2022 23:16:34 +0000 (12:16 +1300)]
Remove obsolete postIPN script

Per https://github.com/civicrm/civicrm-core/pull/22534#issuecomment-1014934985

2 years agoRemove obsolete scripts
Eileen McNaughton [Mon, 17 Jan 2022 23:15:14 +0000 (12:15 +1300)]
Remove obsolete scripts

Per https://github.com/civicrm/civicrm-core/pull/22534#issuecomment-1014932778

2 years agoMerge pull request #22534 from eileenmcnaughton/tools
Tim Otten [Mon, 17 Jan 2022 22:42:40 +0000 (14:42 -0800)]
Merge pull request #22534 from eileenmcnaughton/tools

Remove some old scripts

2 years agoRe-fix enotice on searchType to work with default modifiers
Eileen McNaughton [Tue, 11 Jan 2022 00:40:14 +0000 (13:40 +1300)]
Re-fix enotice on searchType to work with default modifiers

Use a value that we ensure we assign

2 years agoRemove unused variable
Eileen McNaughton [Mon, 17 Jan 2022 21:34:37 +0000 (10:34 +1300)]
Remove unused variable

This is over-written a couple of lines later in the template so
we don't need it & ergo don't need to assign it either

Note that the paramter is assigned in postProcess for the
receipt so this is just this usage

2 years agoRemove unused pass-by-reference
Coleman Watts [Mon, 17 Jan 2022 21:13:34 +0000 (16:13 -0500)]
Remove unused pass-by-reference

This pass-by-ref was causing `civilint` to crash and appears to be unnecessary and possibly harmful.

2 years agoRemove constructors that do nothing
Coleman Watts [Mon, 17 Jan 2022 20:54:46 +0000 (15:54 -0500)]
Remove constructors that do nothing

2 years agoMerge pull request #22541 from braders/buildpremiumpreviewblock-refactor2
Eileen McNaughton [Mon, 17 Jan 2022 20:44:02 +0000 (09:44 +1300)]
Merge pull request #22541 from braders/buildpremiumpreviewblock-refactor2

Refactor buildPremiumPreviewBlock function to make intended usage clearer

2 years agoSavedSearch - Deprecate/remove redundant/unused functions
Coleman Watts [Mon, 17 Jan 2022 19:34:18 +0000 (14:34 -0500)]
SavedSearch - Deprecate/remove redundant/unused functions

2 years agoRefactor buildPremiumPreviewBlock function to make intended usage clearer.
Bradley Taylor [Mon, 17 Jan 2022 19:08:01 +0000 (19:08 +0000)]
Refactor buildPremiumPreviewBlock function to make intended usage clearer.

2 years agoMerge pull request #22540 from civicrm/5.46
Eileen McNaughton [Mon, 17 Jan 2022 18:54:19 +0000 (07:54 +1300)]
Merge pull request #22540 from civicrm/5.46

5.46 to master

2 years agoMerge pull request #22539 from colemanw/searchKitTokenFix
Eileen McNaughton [Mon, 17 Jan 2022 18:53:48 +0000 (07:53 +1300)]
Merge pull request #22539 from colemanw/searchKitTokenFix

SearchKit - Fix token selector to use expression alias

2 years agoMerge pull request #22533 from eileenmcnaughton/phpcs
colemanw [Mon, 17 Jan 2022 17:38:42 +0000 (12:38 -0500)]
Merge pull request #22533 from eileenmcnaughton/phpcs

More comments & style fixes

2 years agoSearchKit - Fix token selector to use expression alias
Coleman Watts [Mon, 17 Jan 2022 17:22:44 +0000 (12:22 -0500)]
SearchKit - Fix token selector to use expression alias

2 years agoMerge pull request #22470 from eileenmcnaughton/isAdmin
demeritcowboy [Mon, 17 Jan 2022 16:45:09 +0000 (11:45 -0500)]
Merge pull request #22470 from eileenmcnaughton/isAdmin

Smarty notice fix on Email help

2 years agoMerge pull request #22536 from eileenmcnaughton/regen
Eileen McNaughton [Mon, 17 Jan 2022 08:56:34 +0000 (21:56 +1300)]
Merge pull request #22536 from eileenmcnaughton/regen

Re-run regen