civicrm-core.git
3 years agoAdd missing ts
Eileen McNaughton [Sun, 3 Oct 2021 20:20:29 +0000 (09:20 +1300)]
Add missing ts

This list was hard-coded recently & the ts got missed

3 years agoMerge pull request #21700 from totten/master-msgadm-draft
colemanw [Sun, 3 Oct 2021 19:18:14 +0000 (15:18 -0400)]
Merge pull request #21700 from totten/master-msgadm-draft

message_admin - Fix quirk when using "Create Draft"

3 years agoMerge pull request #21675 from colemanw/commentCleanup
colemanw [Sun, 3 Oct 2021 17:50:07 +0000 (13:50 -0400)]
Merge pull request #21675 from colemanw/commentCleanup

NFC - Update code comments

3 years agoMerge pull request #21689 from eileenmcnaughton/not_another
colemanw [Sun, 3 Oct 2021 17:48:02 +0000 (13:48 -0400)]
Merge pull request #21689 from eileenmcnaughton/not_another

Enotice tpl fix

3 years agoMerge pull request #21681 from MegaphoneJon/core-2881
colemanw [Sun, 3 Oct 2021 17:47:13 +0000 (13:47 -0400)]
Merge pull request #21681 from MegaphoneJon/core-2881

fixes core#2881 - APIv3 replace only replaces the first 25 records

3 years agoMerge pull request #21693 from eileenmcnaughton/object
colemanw [Sun, 3 Oct 2021 17:43:36 +0000 (13:43 -0400)]
Merge pull request #21693 from eileenmcnaughton/object

Function cleanup following move to non-static function

3 years agoMerge pull request #21702 from eileenmcnaughton/notice
demeritcowboy [Sun, 3 Oct 2021 17:02:59 +0000 (13:02 -0400)]
Merge pull request #21702 from eileenmcnaughton/notice

enotice fix

3 years agoMerge pull request #21691 from colemanw/sqlExprTitles
Eileen McNaughton [Sat, 2 Oct 2021 07:01:54 +0000 (20:01 +1300)]
Merge pull request #21691 from colemanw/sqlExprTitles

APIv4 - Give every SQL expression a title

3 years agoenotice fix
Eileen McNaughton [Sat, 2 Oct 2021 04:00:46 +0000 (17:00 +1300)]
enotice fix

3 years agocrmMsgadmEditContent - Extract parameter 'msgtpl'. Fix "Create Draft" quirk.
Tim Otten [Sat, 2 Oct 2021 02:18:00 +0000 (19:18 -0700)]
crmMsgadmEditContent - Extract parameter 'msgtpl'. Fix "Create Draft" quirk.

3 years ago(REF) crmMsgadmEditContent - Extract parameter 'disabled'
Tim Otten [Sat, 2 Oct 2021 02:13:46 +0000 (19:13 -0700)]
(REF) crmMsgadmEditContent - Extract parameter 'disabled'

3 years ago(REF) crmMsgadmEditContent - Extract parameter 'token-list'
Tim Otten [Sat, 2 Oct 2021 02:09:37 +0000 (19:09 -0700)]
(REF) crmMsgadmEditContent - Extract parameter 'token-list'

3 years ago(REF) crmMsgadmEditContent - Use ng-disabled. Be more responsive to toggling the...
Tim Otten [Sat, 2 Oct 2021 02:07:31 +0000 (19:07 -0700)]
(REF) crmMsgadmEditContent - Use ng-disabled. Be more responsive to toggling the disabled property.

3 years agocrmMonaco - Optionally listen to `ng-disabled` attribute
Tim Otten [Sat, 2 Oct 2021 02:03:48 +0000 (19:03 -0700)]
crmMonaco - Optionally listen to `ng-disabled` attribute

3 years agoMerge pull request #21698 from totten/master-msgadm-title
Eileen McNaughton [Sat, 2 Oct 2021 02:35:08 +0000 (15:35 +1300)]
Merge pull request #21698 from totten/master-msgadm-title

message_admin - Add titles/hints to hyperlinks

3 years agoMerge pull request #21666 from eileenmcnaughton/ev
colemanw [Sat, 2 Oct 2021 02:19:30 +0000 (22:19 -0400)]
Merge pull request #21666 from eileenmcnaughton/ev

 dev/core#348 Participant tokens on scheduled reminders

3 years agoMerge pull request #21694 from totten/master-msgtpl-wfnull
Eileen McNaughton [Sat, 2 Oct 2021 02:19:04 +0000 (15:19 +1300)]
Merge pull request #21694 from totten/master-msgtpl-wfnull

MessageTemplate API - Fix saving of templates with workflow_name sans workflow_id

3 years agomessage_admin - Add titles/hints to hyperlinks
Tim Otten [Sat, 2 Oct 2021 00:07:14 +0000 (17:07 -0700)]
message_admin - Add titles/hints to hyperlinks

3 years agoMessageTemplate API - Fix saving of templates with workflow_name sans workflow_id
Tim Otten [Fri, 1 Oct 2021 21:56:26 +0000 (14:56 -0700)]
MessageTemplate API - Fix saving of templates with workflow_name sans workflow_id

Overview
--------

This fixes a bug when saving (updating) a `MessageTemplate` record that
involves a `workflow_name` and no `workflow_id`. It is an alternative to #21674.

Steps to  reproduce
-------------------

Suppose you read a MessagTemplate with values:

```php
$values = ['workflow_name' => 'foo', 'workflow_id' => NULL, ...]
```

Then you save it back:

```php
civicrm_api4('MessageTemplate', 'update', [
  'values' => $values
]);
```

Before
------

The `update` raises an exception.

After
-----

The `update` works.

3 years agoFunction cleanup following move to non-static function
Eileen McNaughton [Fri, 1 Oct 2021 21:13:25 +0000 (10:13 +1300)]
Function cleanup following move to non-static function

3 years agoMerge pull request #21668 from eileenmcnaughton/submit
colemanw [Fri, 1 Oct 2021 17:33:01 +0000 (13:33 -0400)]
Merge pull request #21668 from eileenmcnaughton/submit

[REF] Use getSubmittedValue rather than passed values

3 years agoMerge pull request #21682 from eileenmcnaughton/notice
colemanw [Fri, 1 Oct 2021 17:21:52 +0000 (13:21 -0400)]
Merge pull request #21682 from eileenmcnaughton/notice

Another enotice fix

3 years agoMerge pull request #21683 from eileenmcnaughton/notice2
colemanw [Fri, 1 Oct 2021 16:40:23 +0000 (12:40 -0400)]
Merge pull request #21683 from eileenmcnaughton/notice2

And another one

3 years agoMerge pull request #21684 from eileenmcnaughton/notice3
colemanw [Fri, 1 Oct 2021 16:39:07 +0000 (12:39 -0400)]
Merge pull request #21684 from eileenmcnaughton/notice3

Another one bites the dust

3 years agoMerge pull request #21686 from eileenmcnaughton/test_name
demeritcowboy [Fri, 1 Oct 2021 16:00:47 +0000 (12:00 -0400)]
Merge pull request #21686 from eileenmcnaughton/test_name

Rename test clas to reflect tested class name

3 years agoMerge pull request #21687 from eileenmcnaughton/case1
demeritcowboy [Fri, 1 Oct 2021 15:57:25 +0000 (11:57 -0400)]
Merge pull request #21687 from eileenmcnaughton/case1

[REF] Extract getRedirectUrl method

3 years agoAPIv4 - Give every SQL expression a title
Coleman Watts [Fri, 1 Oct 2021 15:20:36 +0000 (11:20 -0400)]
APIv4 - Give every SQL expression a title

Fixes a bug in Afform where it would crash trying to get the title of SQL Equations
on search display forms.

3 years agoEnotice tpl fix
Eileen McNaughton [Fri, 1 Oct 2021 10:32:53 +0000 (23:32 +1300)]
Enotice tpl fix

3 years agoMerge pull request #21685 from eileenmcnaughton/email
Seamus Lee [Fri, 1 Oct 2021 07:23:09 +0000 (17:23 +1000)]
Merge pull request #21685 from eileenmcnaughton/email

Remove unused paramter

3 years ago[REF] Extract getRedirectUrl method
Eileen McNaughton [Fri, 1 Oct 2021 04:29:00 +0000 (17:29 +1300)]
[REF] Extract getRedirectUrl method

3 years agoRename test clas to reflect tested class name
Eileen McNaughton [Fri, 1 Oct 2021 04:12:16 +0000 (17:12 +1300)]
Rename test clas to reflect tested class name

3 years agoRemove unused paramter
Eileen McNaughton [Fri, 1 Oct 2021 04:05:59 +0000 (17:05 +1300)]
Remove unused paramter

3 years agoMerge pull request #21671 from eileenmcnaughton/wf_name
Eileen McNaughton [Fri, 1 Oct 2021 04:03:21 +0000 (17:03 +1300)]
Merge pull request #21671 from eileenmcnaughton/wf_name

Remove workflow_id reference

3 years agoAnother one bites the dust
Eileen McNaughton [Fri, 1 Oct 2021 03:58:10 +0000 (16:58 +1300)]
Another one bites the dust

3 years agoAnd another one
Eileen McNaughton [Fri, 1 Oct 2021 03:55:14 +0000 (16:55 +1300)]
And another one

3 years agoAnother enotice fix
Eileen McNaughton [Fri, 1 Oct 2021 03:50:45 +0000 (16:50 +1300)]
Another enotice fix

3 years agoMerge pull request #21678 from demeritcowboy/test-fileoncase
Eileen McNaughton [Fri, 1 Oct 2021 02:52:53 +0000 (15:52 +1300)]
Merge pull request #21678 from demeritcowboy/test-fileoncase

[NFC] Unit test for file-on-case

3 years agotest for file on case
demeritcowboy [Thu, 30 Sep 2021 20:04:20 +0000 (16:04 -0400)]
test for file on case

3 years agoMerge pull request #21680 from eileenmcnaughton/gogo
Eileen McNaughton [Fri, 1 Oct 2021 00:15:13 +0000 (13:15 +1300)]
Merge pull request #21680 from eileenmcnaughton/gogo

Remove now-silly function

3 years agoang/crmMailing/Templates.js - Dropdown shouldn't show system workflow templates
Tim Otten [Fri, 1 Oct 2021 00:02:40 +0000 (17:02 -0700)]
ang/crmMailing/Templates.js - Dropdown shouldn't show system workflow templates

These are now identified by `workflow_name` rather than `workflow_id`.

3 years agoMessageTemplate - Fix "revert" for msgtpl's that set `workflow_name` sans `workflow_id`
Tim Otten [Fri, 1 Oct 2021 00:01:03 +0000 (17:01 -0700)]
MessageTemplate - Fix "revert" for msgtpl's that set `workflow_name` sans `workflow_id`

3 years agofixes core#2881 - APIv3 replace only replaces the first 25 records
Jon Goldberg [Fri, 1 Oct 2021 00:00:11 +0000 (20:00 -0400)]
fixes core#2881 - APIv3 replace only replaces the first 25 records

3 years agoMerge pull request #21679 from Detsieber/patch-2
Eileen McNaughton [Thu, 30 Sep 2021 23:53:43 +0000 (12:53 +1300)]
Merge pull request #21679 from Detsieber/patch-2

Update SelfSvcUpdate.php

3 years agoRemove now-silly function
Eileen McNaughton [Thu, 30 Sep 2021 22:22:53 +0000 (11:22 +1300)]
Remove now-silly function

3 years agoMerge pull request #21677 from eileenmcnaughton/move
Eileen McNaughton [Thu, 30 Sep 2021 22:00:18 +0000 (11:00 +1300)]
Merge pull request #21677 from eileenmcnaughton/move

Return another function to the email trait

3 years agoUpdate SelfSvcUpdate.php
Detlev Sieber [Thu, 30 Sep 2021 21:27:39 +0000 (23:27 +0200)]
Update SelfSvcUpdate.php

Changing this text is necessary for internationalization, because otherwise we get an ambigous translation in some languages

3 years agoReturn another function to the email trait
Eileen McNaughton [Thu, 30 Sep 2021 19:54:58 +0000 (08:54 +1300)]
Return another function to the email trait

Another function that is only used from one place & is unnecessarily complicated
because of the input & output paramters

3 years agoNFC - Update code comments
Coleman Watts [Thu, 30 Sep 2021 19:08:50 +0000 (15:08 -0400)]
NFC - Update code comments

First docblock to use the new array shapes annotation

3 years agoMerge pull request #21648 from eileenmcnaughton/email_task
demeritcowboy [Thu, 30 Sep 2021 12:43:48 +0000 (08:43 -0400)]
Merge pull request #21648 from eileenmcnaughton/email_task

[REF] Copy another email trait function back to the trait

3 years agoRemove workflow_id reference
Eileen McNaughton [Wed, 29 Sep 2021 23:09:06 +0000 (12:09 +1300)]
Remove workflow_id reference

3 years agoMerge pull request #21472 from mattwire/contributionrecurmodifieddate
demeritcowboy [Thu, 30 Sep 2021 01:15:44 +0000 (21:15 -0400)]
Merge pull request #21472 from mattwire/contributionrecurmodifieddate

ContributionRecur modified_date should update to current_timestamp on update

3 years agoMerge pull request #21403 from GValFr35/fix-session-reference-5.40
demeritcowboy [Thu, 30 Sep 2021 01:15:30 +0000 (21:15 -0400)]
Merge pull request #21403 from GValFr35/fix-session-reference-5.40

(dev/drupal#163) Session erroneously getting set to NULL on change

3 years agoMerge pull request #21670 from eileenmcnaughton/dist
Eileen McNaughton [Thu, 30 Sep 2021 00:22:41 +0000 (13:22 +1300)]
Merge pull request #21670 from eileenmcnaughton/dist

Add message admin to dist

3 years agoAdd message admin to dist
Eileen McNaughton [Wed, 29 Sep 2021 22:49:52 +0000 (11:49 +1300)]
Add message admin to dist

3 years agoMerge pull request #21633 from eileenmcnaughton/notices_s
Eileen McNaughton [Wed, 29 Sep 2021 22:42:51 +0000 (11:42 +1300)]
Merge pull request #21633 from eileenmcnaughton/notices_s

Fix header e-notices

3 years agoMerge pull request #21590 from totten/master-msgtplui
Eileen McNaughton [Wed, 29 Sep 2021 22:06:10 +0000 (11:06 +1300)]
Merge pull request #21590 from totten/master-msgtplui

dev/mail#83 - Import current revision of "Message Admin"

3 years agoMerge pull request #21637 from eileenmcnaughton/cont_test
colemanw [Wed, 29 Sep 2021 20:55:08 +0000 (16:55 -0400)]
Merge pull request #21637 from eileenmcnaughton/cont_test

Tests -  update to use postProcess

3 years agoMerge pull request #21455 from jaapjansma/issue_645
demeritcowboy [Wed, 29 Sep 2021 20:32:23 +0000 (16:32 -0400)]
Merge pull request #21455 from jaapjansma/issue_645

Fixed issue with sending from do-not-reply@domain address

3 years ago Participant tokens on scheduled reminders (wip- upgrade script needed at minimum)
Eileen McNaughton [Tue, 28 Sep 2021 18:31:03 +0000 (07:31 +1300)]
 Participant tokens on scheduled reminders (wip- upgrade script needed at minimum)

3 years agoMerge pull request #21661 from eileenmcnaughton/cleanup
colemanw [Wed, 29 Sep 2021 14:26:12 +0000 (10:26 -0400)]
Merge pull request #21661 from eileenmcnaughton/cleanup

Basic IDE cleanup on test class

3 years agoContributionRecur modified_date should update to current_timestamp on update
Matthew Wire [Tue, 14 Sep 2021 15:22:11 +0000 (16:22 +0100)]
ContributionRecur modified_date should update to current_timestamp on update

3 years agoUser getSubmittedValue rather than passed values
Eileen McNaughton [Wed, 29 Sep 2021 11:51:06 +0000 (00:51 +1300)]
User getSubmittedValue rather than passed values

3 years agoMerge pull request #21613 from eileenmcnaughton/update_from
Eileen McNaughton [Wed, 29 Sep 2021 11:34:28 +0000 (00:34 +1300)]
Merge pull request #21613 from eileenmcnaughton/update_from

Simplify getRecurFromAddress

3 years agoMerge pull request #21665 from civicrm/5.42
Eileen McNaughton [Wed, 29 Sep 2021 11:21:05 +0000 (00:21 +1300)]
Merge pull request #21665 from civicrm/5.42

5.42 to master

3 years agoMerge pull request #21664 from jitendrapurohit/end_event-542
Eileen McNaughton [Wed, 29 Sep 2021 11:20:39 +0000 (00:20 +1300)]
Merge pull request #21664 from jitendrapurohit/end_event-542

Fix missing value of End Adjustment column from Membership status page

3 years agoMerge pull request #21662 from eileenmcnaughton/mem
Eileen McNaughton [Wed, 29 Sep 2021 11:19:48 +0000 (00:19 +1300)]
Merge pull request #21662 from eileenmcnaughton/mem

Test fix

3 years agofix end_event_adjust key
jitendrapurohit [Wed, 29 Sep 2021 08:50:10 +0000 (14:20 +0530)]
fix end_event_adjust key

3 years agoTest fix
Eileen McNaughton [Wed, 29 Sep 2021 07:55:52 +0000 (20:55 +1300)]
Test fix

3 years agoBasic IDE cleanup on test class
Eileen McNaughton [Wed, 29 Sep 2021 07:40:42 +0000 (20:40 +1300)]
Basic IDE cleanup on test class

3 years agoFix header e-notices
Eileen McNaughton [Sun, 26 Sep 2021 22:21:42 +0000 (11:21 +1300)]
Fix header e-notices

This should solve enotices across a bunch of screens

3 years agoSimplify getRecurFromAddress
Eileen McNaughton [Sat, 25 Sep 2021 05:37:31 +0000 (17:37 +1200)]
Simplify getRecurFromAddress

This switches to use the code extracted from the other function

3 years agoMerge pull request #21652 from eileenmcnaughton/cont_render_more
Eileen McNaughton [Wed, 29 Sep 2021 04:03:57 +0000 (17:03 +1300)]
Merge pull request #21652 from eileenmcnaughton/cont_render_more

Remove call to the dreaded replaceMultipleContributionTokens

3 years agoMerge pull request #21521 from eileenmcnaughton/member_tokens
Monish Deb [Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)]
Merge pull request #21521 from eileenmcnaughton/member_tokens

dev/core#2832 Switch membership pdf to use token processor

3 years agoMerge pull request #21658 from eileenmcnaughton/enotice
demeritcowboy [Wed, 29 Sep 2021 02:25:30 +0000 (22:25 -0400)]
Merge pull request #21658 from eileenmcnaughton/enotice

Enotice fix

3 years agoMerge pull request #21659 from eileenmcnaughton/notice2
demeritcowboy [Wed, 29 Sep 2021 02:25:09 +0000 (22:25 -0400)]
Merge pull request #21659 from eileenmcnaughton/notice2

Enotice fixes

3 years agoMerge pull request #21595 from agileware/CIVICRM-1563
demeritcowboy [Wed, 29 Sep 2021 02:16:16 +0000 (22:16 -0400)]
Merge pull request #21595 from agileware/CIVICRM-1563

Find Activities Search, the default search option of "With" criteria excludes Activities by default. Confuses End Users when 0 results are returned when criteria appears to be correct.

3 years agoMerge pull request #21562 from jitendrapurohit/notify-user
demeritcowboy [Wed, 29 Sep 2021 02:14:55 +0000 (22:14 -0400)]
Merge pull request #21562 from jitendrapurohit/notify-user

Do not send email notification to the user if `notify` is not set in the params

3 years agoRemove call to the dreaded replaceMultipleContributionTokens
Eileen McNaughton [Tue, 28 Sep 2021 07:17:57 +0000 (20:17 +1300)]
Remove call to the dreaded replaceMultipleContributionTokens

3 years agoRemove calls to replaceContributionTokens
Eileen McNaughton [Sat, 18 Sep 2021 01:00:22 +0000 (13:00 +1200)]
Remove calls to replaceContributionTokens

3 years agoMerge pull request #21657 from totten/master-wfvn
Eileen McNaughton [Wed, 29 Sep 2021 01:44:09 +0000 (14:44 +1300)]
Merge pull request #21657 from totten/master-wfvn

MessageTemplate - Deprecate `valueName`. Emphasize `workflow`. Consolidate converters.

3 years agoEnotice fixes
Eileen McNaughton [Wed, 29 Sep 2021 00:36:12 +0000 (13:36 +1300)]
Enotice fixes

3 years agoEnotice fix
Eileen McNaughton [Wed, 29 Sep 2021 00:30:33 +0000 (13:30 +1300)]
Enotice fix

3 years agoMerge pull request #21656 from eileenmcnaughton/role
Eileen McNaughton [Tue, 28 Sep 2021 23:10:20 +0000 (12:10 +1300)]
Merge pull request #21656 from eileenmcnaughton/role

Fix label for participant role

3 years agoMerge pull request #21587 from eileenmcnaughton/badge_ev
Eileen McNaughton [Tue, 28 Sep 2021 22:45:30 +0000 (11:45 +1300)]
Merge pull request #21587 from eileenmcnaughton/badge_ev

dev/core#2834 Use event tokens for participant badges

3 years ago(REF) WorkflowMessage - Emphasize the newer 'workflow' instead of 'valueName'
Tim Otten [Tue, 28 Sep 2021 22:05:30 +0000 (15:05 -0700)]
(REF) WorkflowMessage - Emphasize the newer 'workflow' instead of 'valueName'

3 years agoMessageTemplate - Allow 'workflow'/'valueName' as aliases. Consolidate alias bits.
Tim Otten [Tue, 28 Sep 2021 22:01:11 +0000 (15:01 -0700)]
MessageTemplate - Allow 'workflow'/'valueName' as aliases. Consolidate alias bits.

The params given to `MessageTemplate::sendTemplate()` are evolving. But they are also
exposed via hook. Blerg.

This technically does two things:

1. It takes a couple of bits which are responsible for aliasing/transitioning specific
   params, and it moves them to a common `$sync()` function.

2. It deprecates `valueName` in favor of `workflow`, and it updates the hook test
   accordingly.

3 years ago(REF) ExampleWorkflowTest - Add coverage for alterMailParams($params['valueName'])
Tim Otten [Tue, 28 Sep 2021 06:06:32 +0000 (23:06 -0700)]
(REF) ExampleWorkflowTest - Add coverage for alterMailParams($params['valueName'])

3 years ago(REF) hook_civicrm_alterMailParams.evch.php - Soften 'type' check
Tim Otten [Tue, 28 Sep 2021 21:55:44 +0000 (14:55 -0700)]
(REF) hook_civicrm_alterMailParams.evch.php - Soften 'type' check

This changes some of the plumbing in how it interprets 'paramSpecs' - but
doesn't change anything substantive.

Before: You must specify a 'type' constraint for every param.
After: You may omit the 'type' constraint for some params.

Before: If you specify a nullable string with a regex, then null-values will fail.
After: If you specify a nullable string with a regex, then null-values will pass.

3 years ago(REF) CRM_Utils_Array - Add pathSync() helper
Tim Otten [Tue, 28 Sep 2021 21:32:39 +0000 (14:32 -0700)]
(REF) CRM_Utils_Array - Add pathSync() helper

3 years agoFix label for participant role
Eileen McNaughton [Tue, 28 Sep 2021 21:20:01 +0000 (10:20 +1300)]
Fix label for participant role

3 years agodev/core#2834 Use event tokens for participant badges
Eileen McNaughton [Thu, 23 Sep 2021 09:55:20 +0000 (21:55 +1200)]
dev/core#2834 Use event tokens for participant badges

Overview
----------------------------------------
Convert the rest of event badge token replacement to use
the token processor

Before
----------------------------------------
Testing and conversion had been done for contact
and participant tokens within the event badges - but
for the event tokens tests had been added but
the conversion was pending solving date formatting

After
----------------------------------------
Event badges use the token processor for event tokens

At this point all token processing in core for
participant or event tokens is done in the token
processor & attention can switch to cleaning that up

Technical Details
----------------------------------------
The challenge switching over event tokens was that badges used
a custom date format and we needed to figure out how to support
that first.

This also standardises the event.event_id token to participant.event_id
and updates it in the db for scheduled reminders (badges were using
'event.id' format & reminders the event.event_id format).

There are still some tokens on the scheduled reminders to
standarsise and a loading challenge to fix - but this
concludes the badge portion of fixing up event tokens

Note that the tokenConsistencyTest is the main test cover
for event tokens and it turns out we are not quite there
on the dates based on https://github.com/civicrm/civicrm-core/pull/21584

3 years agoMerge pull request #21610 from eileenmcnaughton/rend
Eileen McNaughton [Tue, 28 Sep 2021 20:35:40 +0000 (09:35 +1300)]
Merge pull request #21610 from eileenmcnaughton/rend

(REF) MessageTemplate - Reverse renderTemplate()<=>sendTemplate() call

3 years agoMerge pull request #21423 from demeritcowboy/dompdf-options
Eileen McNaughton [Tue, 28 Sep 2021 19:37:22 +0000 (08:37 +1300)]
Merge pull request #21423 from demeritcowboy/dompdf-options

dev/core#2126 - Allow setting dompdf options, e.g. an external font folder

3 years agoMerge pull request #21655 from kurund/patch-3
Yashodha Chaku [Tue, 28 Sep 2021 16:14:58 +0000 (21:44 +0530)]
Merge pull request #21655 from kurund/patch-3

typo fixes

3 years agoMerge pull request #21653 from eileenmcnaughton/ref
colemanw [Tue, 28 Sep 2021 14:31:17 +0000 (10:31 -0400)]
Merge pull request #21653 from eileenmcnaughton/ref

[REF] stop passing form into createActivities

3 years agotypo fixes
Kurund Jalmi [Tue, 28 Sep 2021 14:07:44 +0000 (15:07 +0100)]
typo fixes

3 years ago[REF] stop passing form into createActivities
Eileen McNaughton [Tue, 28 Sep 2021 10:39:33 +0000 (23:39 +1300)]
[REF] stop passing form into createActivities

This function is now an OO function - so we can make it protected & stop passing form in

3 years agoMerge pull request #21615 from totten/master-event-test-mail
Eileen McNaughton [Tue, 28 Sep 2021 08:19:25 +0000 (21:19 +1300)]
Merge pull request #21615 from totten/master-event-test-mail

tests/events/*.php - Enforce general compliance with hook/event signatures

3 years agoMessageTemplate - Restore filtering of $params
Tim Otten [Tue, 28 Sep 2021 05:41:54 +0000 (22:41 -0700)]
MessageTemplate - Restore filtering of $params

The prior commit had the effect of dropping any filtering that happend on `$params`.

3 years agoMerge pull request #21651 from eileenmcnaughton/tpl
Eileen McNaughton [Tue, 28 Sep 2021 07:52:28 +0000 (20:52 +1300)]
Merge pull request #21651 from eileenmcnaughton/tpl

Set default for civicrm_message_template.is_reserved