civicrm-core.git
2 years agoMerge pull request #21875 from mariav0/patch-13
demeritcowboy [Fri, 22 Oct 2021 14:59:43 +0000 (10:59 -0400)]
Merge pull request #21875 from mariav0/patch-13

Update membership_autorenew_cancelled_html.tpl

2 years agoMerge pull request #21874 from mariav0/patch-12
demeritcowboy [Fri, 22 Oct 2021 14:59:26 +0000 (10:59 -0400)]
Merge pull request #21874 from mariav0/patch-12

Update membership_autorenew_billing_html.tpl

2 years agoMerge pull request #21873 from mariav0/patch-11
demeritcowboy [Fri, 22 Oct 2021 14:59:08 +0000 (10:59 -0400)]
Merge pull request #21873 from mariav0/patch-11

Update friend_html.tpl

2 years agoMerge pull request #21872 from mariav0/patch-10
demeritcowboy [Fri, 22 Oct 2021 14:58:52 +0000 (10:58 -0400)]
Merge pull request #21872 from mariav0/patch-10

Update event_online_receipt_html.tpl

2 years agoMerge pull request #21871 from mariav0/patch-9
demeritcowboy [Fri, 22 Oct 2021 14:58:32 +0000 (10:58 -0400)]
Merge pull request #21871 from mariav0/patch-9

Update event_offline_receipt_html.tpl

2 years agoMerge pull request #21870 from mariav0/patch-8
demeritcowboy [Fri, 22 Oct 2021 14:58:15 +0000 (10:58 -0400)]
Merge pull request #21870 from mariav0/patch-8

Update contribution_recurring_edit_html.tpl

2 years agoMerge pull request #21869 from mariav0/patch-7
demeritcowboy [Fri, 22 Oct 2021 14:58:00 +0000 (10:58 -0400)]
Merge pull request #21869 from mariav0/patch-7

Update contribution_recurring_cancelled_html.tpl

2 years agoMerge pull request #21862 from mariav0/patch-5
demeritcowboy [Fri, 22 Oct 2021 14:57:42 +0000 (10:57 -0400)]
Merge pull request #21862 from mariav0/patch-5

Update contribution_offline_receipt_html.tpl

2 years agoMerge pull request #21861 from mariav0/patch-4
demeritcowboy [Fri, 22 Oct 2021 14:57:24 +0000 (10:57 -0400)]
Merge pull request #21861 from mariav0/patch-4

Update contribution_dupalert_html.tpl

2 years agoMerge pull request #21860 from mariav0/patch-3
demeritcowboy [Fri, 22 Oct 2021 14:57:11 +0000 (10:57 -0400)]
Merge pull request #21860 from mariav0/patch-3

Update case_activity_html.tpl

2 years agoMerge pull request #21859 from mariav0/patch-2
demeritcowboy [Fri, 22 Oct 2021 14:56:47 +0000 (10:56 -0400)]
Merge pull request #21859 from mariav0/patch-2

Update contribution_recurring_notify_html.tpl

2 years agoMerge pull request #21176 from mattwire/unsubscribesmartgroups
demeritcowboy [Fri, 22 Oct 2021 14:55:20 +0000 (10:55 -0400)]
Merge pull request #21176 from mattwire/unsubscribesmartgroups

Handle checking smartgroups when generating list of groups to unsubscribe

2 years agoMerge pull request #21857 from colemanw/saveMatch
demeritcowboy [Fri, 22 Oct 2021 12:48:23 +0000 (08:48 -0400)]
Merge pull request #21857 from colemanw/saveMatch

APIv4 - Add 'match' param to save action

2 years agoMerge pull request #21903 from eileenmcnaughton/ref
demeritcowboy [Fri, 22 Oct 2021 12:47:25 +0000 (08:47 -0400)]
Merge pull request #21903 from eileenmcnaughton/ref

Remove unnecessary pass-by-reference

2 years agoMerge pull request #21391 from eileenmcnaughton/fp
Monish Deb [Fri, 22 Oct 2021 07:27:19 +0000 (12:57 +0530)]
Merge pull request #21391 from eileenmcnaughton/fp

dev/core#2715 remove the  mystery self::_trxns property

2 years agoMerge pull request #21644 from sunilpawar/processed_token
Eileen McNaughton [Fri, 22 Oct 2021 03:59:52 +0000 (16:59 +1300)]
Merge pull request #21644 from sunilpawar/processed_token

show processed token in greeting dropdown

2 years agoMerge pull request #21697 from agileware/CIVICRM-1858
Eileen McNaughton [Fri, 22 Oct 2021 03:32:36 +0000 (16:32 +1300)]
Merge pull request #21697 from agileware/CIVICRM-1858

CiviCRM APIv3, Improve API Exception error message when trying to subscribe to a non-Public Mailing Group

2 years agoRemove unnecessary pass-by-reference
Eileen McNaughton [Fri, 22 Oct 2021 03:27:40 +0000 (16:27 +1300)]
Remove unnecessary pass-by-reference

2 years agoMerge pull request #21813 from christianwach/lab-core-2909
Eileen McNaughton [Fri, 22 Oct 2021 03:02:48 +0000 (16:02 +1300)]
Merge pull request #21813 from christianwach/lab-core-2909

Repair "Norwegian BokmÃ¥l" string

2 years agoAPIv4 - Add 'match' param to save action
Coleman Watts [Tue, 19 Oct 2021 00:09:52 +0000 (20:09 -0400)]
APIv4 - Add 'match' param to save action

This works similarly to the 'match' param in v3 `create`,
it checks for records matching the given fields, and will update instead of create
if an existing record is found.

2 years agoMerge pull request #21902 from eileenmcnaughton/tok
Seamus Lee [Thu, 21 Oct 2021 23:47:11 +0000 (10:47 +1100)]
Merge pull request #21902 from eileenmcnaughton/tok

Add help tip to comment block

2 years agoMerge pull request #21351 from colemanw/spreadsheetFormats
Eileen McNaughton [Thu, 21 Oct 2021 23:04:18 +0000 (12:04 +1300)]
Merge pull request #21351 from colemanw/spreadsheetFormats

SearchKit - Support download formats xlsx, ods, pdf

2 years agoMerge pull request #21573 from demeritcowboy/null-null
Eileen McNaughton [Thu, 21 Oct 2021 21:42:27 +0000 (10:42 +1300)]
Merge pull request #21573 from demeritcowboy/null-null

Change DAO's that have `'default' => 'NULL'` into `'default' => NULL`, i.e. true NULL

2 years agoAdd help tip
Eileen McNaughton [Thu, 21 Oct 2021 21:00:04 +0000 (10:00 +1300)]
Add help tip

2 years agoMerge pull request #21893 from MegaphoneJon/minute-as-recurring-unit
Eileen McNaughton [Thu, 21 Oct 2021 20:41:05 +0000 (09:41 +1300)]
Merge pull request #21893 from MegaphoneJon/minute-as-recurring-unit

add 'minute' as recurring unit

2 years agoMerge pull request #21901 from civicrm/5.43
Eileen McNaughton [Thu, 21 Oct 2021 20:39:20 +0000 (09:39 +1300)]
Merge pull request #21901 from civicrm/5.43

5.43 to master

2 years agoMerge pull request #21894 from colemanw/sortable
Eileen McNaughton [Thu, 21 Oct 2021 20:29:36 +0000 (09:29 +1300)]
Merge pull request #21894 from colemanw/sortable

[Unreleased Regression] SearchKit - Fix console errors when adding non-field columns

2 years agoMerge pull request #21900 from herbdool/backdrop-2
Eileen McNaughton [Thu, 21 Oct 2021 19:59:46 +0000 (08:59 +1300)]
Merge pull request #21900 from herbdool/backdrop-2

Correct CMS name on profile UF group types

2 years agoShow correct CMS name for profile uf group types
Herb v/d Dool [Thu, 21 Oct 2021 17:10:24 +0000 (13:10 -0400)]
Show correct CMS name for profile uf group types

2 years agoMerge pull request #21897 from mattwire/alterpaymenthookparams
demeritcowboy [Thu, 21 Oct 2021 13:47:32 +0000 (09:47 -0400)]
Merge pull request #21897 from mattwire/alterpaymenthookparams

Update docblock for alterPaymentProcessorParams because rawParams might be a payment propertyBag

2 years agoMerge pull request #21898 from jensschuppe/afformUndefinedIndexNotice
colemanw [Thu, 21 Oct 2021 13:46:14 +0000 (09:46 -0400)]
Merge pull request #21898 from jensschuppe/afformUndefinedIndexNotice

Prevent Undefined Index PHP notices with Afform entity metadata without an icon

2 years agoPrevent Undefined Index PHP notices with Afform entity metadata without an icon
Jens Schuppe [Thu, 21 Oct 2021 10:18:26 +0000 (12:18 +0200)]
Prevent Undefined Index PHP notices with Afform entity metadata without an icon

2 years agoUpdate docblock for alterPaymentProcessorParams because rawParams might be a payment...
Matthew Wire [Thu, 21 Oct 2021 08:54:49 +0000 (09:54 +0100)]
Update docblock for alterPaymentProcessorParams because rawParams might be a payment propertyBag

2 years agoSearchKit - Fix console errors when adding non-field columns
Coleman Watts [Wed, 20 Oct 2021 18:50:51 +0000 (14:50 -0400)]
SearchKit - Fix console errors when adding non-field columns

2 years agoMerge pull request #21891 from colemanw/initHideBoxes
Eileen McNaughton [Wed, 20 Oct 2021 20:31:03 +0000 (09:31 +1300)]
Merge pull request #21891 from colemanw/initHideBoxes

Export - Fix undefined tpl var

2 years agoadd 'minute' as recurring unit
Jon Goldberg [Wed, 20 Oct 2021 17:13:03 +0000 (13:13 -0400)]
add 'minute' as recurring unit

2 years agoExport - Fix undefined tpl var
Coleman Watts [Wed, 20 Oct 2021 15:17:38 +0000 (11:17 -0400)]
Export - Fix undefined tpl var

This varable was a string of javascript leftover from the old export UI,
no longer used or needed by the new Angular UI.

2 years agoUpdate membership_autorenew_cancelled_html.tpl
Maria [Wed, 20 Oct 2021 09:27:01 +0000 (11:27 +0200)]
Update membership_autorenew_cancelled_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate membership_autorenew_billing_html.tpl
Maria [Wed, 20 Oct 2021 09:26:04 +0000 (11:26 +0200)]
Update membership_autorenew_billing_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate friend_html.tpl
Maria [Wed, 20 Oct 2021 09:25:28 +0000 (11:25 +0200)]
Update friend_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate event_online_receipt_html.tpl
Maria [Wed, 20 Oct 2021 09:23:50 +0000 (11:23 +0200)]
Update event_online_receipt_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate event_offline_receipt_html.tpl
Maria [Wed, 20 Oct 2021 09:22:41 +0000 (11:22 +0200)]
Update event_offline_receipt_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate contribution_recurring_edit_html.tpl
Maria [Wed, 20 Oct 2021 09:21:39 +0000 (11:21 +0200)]
Update contribution_recurring_edit_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate contribution_recurring_cancelled_html.tpl
Maria [Wed, 20 Oct 2021 09:20:45 +0000 (11:20 +0200)]
Update contribution_recurring_cancelled_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoMerge pull request #21868 from yashodha/typo
Seamus Lee [Wed, 20 Oct 2021 06:08:22 +0000 (17:08 +1100)]
Merge pull request #21868 from yashodha/typo

typo fixes

2 years agotypo fixes
yashodha [Wed, 20 Oct 2021 02:22:56 +0000 (07:52 +0530)]
typo fixes

2 years agoMerge pull request #21867 from civicrm/5.43
Eileen McNaughton [Wed, 20 Oct 2021 00:50:34 +0000 (13:50 +1300)]
Merge pull request #21867 from civicrm/5.43

5.43 to master

2 years agoMerge pull request #21866 from seamuslee001/fix_pdf_test
Eileen McNaughton [Wed, 20 Oct 2021 00:50:01 +0000 (13:50 +1300)]
Merge pull request #21866 from seamuslee001/fix_pdf_test

[REF] Fix PDF Test failure on php versions 7.4 and later

2 years ago[REF] Fix PDF Test failure on php versions 7.4 and later
Seamus Lee [Tue, 19 Oct 2021 22:06:24 +0000 (09:06 +1100)]
[REF] Fix PDF Test failure on php versions 7.4 and later

2 years agoMerge pull request #21864 from civicrm/5.43
Eileen McNaughton [Tue, 19 Oct 2021 19:46:24 +0000 (08:46 +1300)]
Merge pull request #21864 from civicrm/5.43

5.43 to master

2 years agoMerge pull request #21851 from colemanw/entityTypesHookRecursionFix
Eileen McNaughton [Tue, 19 Oct 2021 19:45:42 +0000 (08:45 +1300)]
Merge pull request #21851 from colemanw/entityTypesHookRecursionFix

Entity types hook recursion fix

2 years agoUpdate contribution_offline_receipt_html.tpl
Maria [Tue, 19 Oct 2021 14:38:39 +0000 (16:38 +0200)]
Update contribution_offline_receipt_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate contribution_dupalert_html.tpl
Maria [Tue, 19 Oct 2021 14:36:25 +0000 (16:36 +0200)]
Update contribution_dupalert_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate case_activity_html.tpl
Maria [Tue, 19 Oct 2021 14:34:48 +0000 (16:34 +0200)]
Update case_activity_html.tpl

Text and table do not fit well together when everything is centered (in most message templates). The change should be applied for all message templates for consistency reasons.
More information (including screenshots) can you find here: #21850
Important note: I haven't tested this specific template. I don't think it's a major change and it will look and work as well as all other templates. If you think it is needed, me or anyone else (any help is highly appreciated :) can provide screenshots.

2 years agoUpdate contribution_recurring_notify_html.tpl
Maria [Tue, 19 Oct 2021 14:18:37 +0000 (16:18 +0200)]
Update contribution_recurring_notify_html.tpl

Text and table do not fit well together when everything is centered. More information (including screenshots) can you find here: https://github.com/civicrm/civicrm-core/pull/21850

2 years agoshow processed token in greeting dropdown
Sunil Pawar [Mon, 27 Sep 2021 16:07:55 +0000 (21:37 +0530)]
show processed token in greeting dropdown

replace with new token mechanism

correcting syntax

style fix

2 years agoMerge pull request #21856 from civicrm/5.43
Seamus Lee [Tue, 19 Oct 2021 03:37:08 +0000 (14:37 +1100)]
Merge pull request #21856 from civicrm/5.43

5.43

2 years agoMerge pull request #21845 from colemanw/relationship_cache_case_id
Seamus Lee [Tue, 19 Oct 2021 03:36:56 +0000 (14:36 +1100)]
Merge pull request #21845 from colemanw/relationship_cache_case_id

RelationshipCache - Add case_id column

2 years agocurious
demeritcowboy [Wed, 22 Sep 2021 14:11:26 +0000 (10:11 -0400)]
curious

2 years agoRelationshipCache - Add case_id column
Coleman Watts [Sat, 16 Oct 2021 20:19:19 +0000 (16:19 -0400)]
RelationshipCache - Add case_id column

2 years agoMerge pull request #21808 from braders/feature/pcp-alt-text
Seamus Lee [Mon, 18 Oct 2021 21:49:12 +0000 (08:49 +1100)]
Merge pull request #21808 from braders/feature/pcp-alt-text

Add alt attribute to image on PCPInfo template.

2 years agoMerge pull request #21852 from demeritcowboy/extension-name
Eileen McNaughton [Mon, 18 Oct 2021 19:18:38 +0000 (08:18 +1300)]
Merge pull request #21852 from demeritcowboy/extension-name

dev/core#2876 - When installing an extension that has requirements, show the name not the key

2 years agoAdd alt attribute to image on PCPInfo template.
Bradley Taylor [Tue, 12 Oct 2021 15:30:58 +0000 (16:30 +0100)]
Add alt attribute to image on PCPInfo template.

It is an accessibility best-practice that all images should have alt text.

If a description has been provided, we use that text,
otherwise an empty alt text is used (i.e. the image is treated as decorative)

2 years agoMerge pull request #21838 from christianwach/lab-core-2917
colemanw [Mon, 18 Oct 2021 16:51:49 +0000 (12:51 -0400)]
Merge pull request #21838 from christianwach/lab-core-2917

Restrict "Oops" to administrative errors

2 years agoshow extension name not key
demeritcowboy [Mon, 18 Oct 2021 14:35:50 +0000 (10:35 -0400)]
show extension name not key

2 years agoMerge pull request #21827 from eileenmcnaughton/sent
demeritcowboy [Mon, 18 Oct 2021 14:16:53 +0000 (10:16 -0400)]
Merge pull request #21827 from eileenmcnaughton/sent

dev/core#2914 Fix for incorrect sent count in message

2 years agoCleanup ContactType BAO fixme and comments; use common function
Coleman Watts [Mon, 18 Oct 2021 12:45:26 +0000 (08:45 -0400)]
Cleanup ContactType BAO fixme and comments; use common function

This fixes the fixme in basicTypeInfo to use getAllContactTypes instead of running its
own query, and cleans up some comments.

2 years agoFix possible recursion during Entity::get()
Jens Schuppe [Fri, 15 Oct 2021 10:00:08 +0000 (12:00 +0200)]
Fix possible recursion during Entity::get()

Use plain SQL instead of APIv4 in a function that is called by APIv4 Entity.get
to avoid an infinite loop.

2 years agoMerge pull request #21849 from eileenmcnaughton/testy
Seamus Lee [Mon, 18 Oct 2021 08:46:22 +0000 (19:46 +1100)]
Merge pull request #21849 from eileenmcnaughton/testy

Fix test to use postProcess flow

2 years agoFix test to use postProcess flow
Eileen McNaughton [Mon, 18 Oct 2021 03:46:42 +0000 (16:46 +1300)]
Fix test to use postProcess flow

2 years agodev/core#2914 Fix for incorrect sent count in message
Eileen McNaughton [Thu, 14 Oct 2021 01:21:29 +0000 (14:21 +1300)]
dev/core#2914 Fix for incorrect sent count in message

2 years agoMerge pull request #21846 from eileenmcnaughton/nfc
Eileen McNaughton [Sun, 17 Oct 2021 01:29:25 +0000 (14:29 +1300)]
Merge pull request #21846 from eileenmcnaughton/nfc

Preparatory cleanup in test class

2 years agoPreparatory cleanup in test class
Eileen McNaughton [Sat, 16 Oct 2021 22:11:46 +0000 (11:11 +1300)]
Preparatory cleanup in test class

2 years agoMerge pull request #21839 from jensschuppe/api4CreateRequestEvent
colemanw [Sat, 16 Oct 2021 21:08:38 +0000 (17:08 -0400)]
Merge pull request #21839 from jensschuppe/api4CreateRequestEvent

Load the API kernel service prior to dispatching the `civi.api4.createRequest` event when creating an API4 request

2 years agoMerge pull request #21841 from braders/feature/core-2913
colemanw [Sat, 16 Oct 2021 20:40:39 +0000 (16:40 -0400)]
Merge pull request #21841 from braders/feature/core-2913

Use SVG for 'Empowered by' logo

2 years agoMerge pull request #21843 from braders/feature/translatable-dedupe-placeholders
colemanw [Sat, 16 Oct 2021 20:37:56 +0000 (16:37 -0400)]
Merge pull request #21843 from braders/feature/translatable-dedupe-placeholders

Remove use of hardcoded strings in Dedupe templates

2 years agoMerge pull request #21844 from demeritcowboy/repourl
colemanw [Sat, 16 Oct 2021 20:37:45 +0000 (16:37 -0400)]
Merge pull request #21844 from demeritcowboy/repourl

dev/core#2903 - Put back missing placeholder

2 years agoAPIv4 - Add component metadata to Relationship.case_id field
Coleman Watts [Sat, 16 Oct 2021 20:00:57 +0000 (16:00 -0400)]
APIv4 - Add component metadata to Relationship.case_id field

This will hide that field when CiviCase is disabled

2 years agoput back missing placeholder
demeritcowboy [Sat, 16 Oct 2021 16:10:06 +0000 (12:10 -0400)]
put back missing placeholder

2 years agoMerge pull request #21842 from braders/feature/transalte-hardcoded-placeholder-strings
demeritcowboy [Sat, 16 Oct 2021 15:44:18 +0000 (11:44 -0400)]
Merge pull request #21842 from braders/feature/transalte-hardcoded-placeholder-strings

Makes hardcoded placeholder strings translatable

2 years agoRemove use of hardcoded strings in Dedupe templates
Bradley Taylor [Sat, 16 Oct 2021 14:18:38 +0000 (15:18 +0100)]
Remove use of hardcoded strings in Dedupe templates

2 years agoMakes hardcoded placeholder strings translatable
Bradley Taylor [Sat, 16 Oct 2021 13:15:31 +0000 (14:15 +0100)]
Makes hardcoded placeholder strings translatable

2 years agoRestrict "Oops" to administrative errors
Christian Wach [Sat, 16 Oct 2021 10:46:51 +0000 (11:46 +0100)]
Restrict "Oops" to administrative errors

2 years agoMerge pull request #21836 from eileenmcnaughton/hook_toke
Tim Otten [Fri, 15 Oct 2021 22:04:26 +0000 (15:04 -0700)]
Merge pull request #21836 from eileenmcnaughton/hook_toke

Fix hookTokens to be clearable outside the class

2 years agoMerge pull request #21840 from braders/feature/core-2903
Tim Otten [Fri, 15 Oct 2021 21:32:05 +0000 (14:32 -0700)]
Merge pull request #21840 from braders/feature/core-2903

Remove reference to CiviCRM forum in HTTP error message

2 years agoUse SVG for 'Empowered by' logo
Bradley Taylor [Fri, 15 Oct 2021 16:09:29 +0000 (17:09 +0100)]
Use SVG for 'Empowered by' logo

2 years agoMerge pull request #21811 from jmcclelland/urlencodesocial
demeritcowboy [Fri, 15 Oct 2021 15:46:36 +0000 (11:46 -0400)]
Merge pull request #21811 from jmcclelland/urlencodesocial

ensure events with single quotes can be share via social

2 years agoRemove reference to CiviCRM forum in HTTP error message
Bradley Taylor [Fri, 15 Oct 2021 15:23:02 +0000 (16:23 +0100)]
Remove reference to CiviCRM forum in HTTP error message

Replace with instruction to contact the site administrator for assistance.

2 years agoLoad the API kernel service prior to dispatching the `civi.api4.createRequest` event...
Jens Schuppe [Fri, 15 Oct 2021 12:23:51 +0000 (14:23 +0200)]
Load the API kernel service prior to dispatching the `civi.api4.createRequest` event when creating an API4 request

2 years agoMerge pull request #21837 from totten/5.43-nfc-escape
Eileen McNaughton [Fri, 15 Oct 2021 08:51:17 +0000 (21:51 +1300)]
Merge pull request #21837 from totten/5.43-nfc-escape

(NFC) TokenConsistencyTest - Add some examples of HTML escaping

2 years ago(NFC) TokenConsistencyTest - More aggressive test cleanup
Tim Otten [Fri, 15 Oct 2021 06:00:35 +0000 (23:00 -0700)]
(NFC) TokenConsistencyTest - More aggressive test cleanup

2 years agoMerge pull request #21833 from eileenmcnaughton/test_cache
colemanw [Fri, 15 Oct 2021 05:07:53 +0000 (01:07 -0400)]
Merge pull request #21833 from eileenmcnaughton/test_cache

Stop flushing caches on enable civiCampaign

2 years agoMerge pull request #21816 from eileenmcnaughton/pdf2
Seamus Lee [Fri, 15 Oct 2021 03:29:12 +0000 (14:29 +1100)]
Merge pull request #21816 from eileenmcnaughton/pdf2

dev/core#2864 Remove call to getTokenDetails from Contribute pdf letter

2 years ago(NFC) TokenConsistencyTest - Add some examples of HTML escaping
Tim Otten [Fri, 15 Oct 2021 00:53:04 +0000 (17:53 -0700)]
(NFC) TokenConsistencyTest - Add some examples of HTML escaping

2 years agoFix hookTokens to be clearable outside the class
Eileen McNaughton [Thu, 14 Oct 2021 08:21:04 +0000 (21:21 +1300)]
Fix hookTokens to be clearable outside the class

Tests can't unset the proerty in the class easily but just using the static makes it easier

2 years agoMerge pull request #21832 from civicrm/5.43
Eileen McNaughton [Thu, 14 Oct 2021 19:42:44 +0000 (08:42 +1300)]
Merge pull request #21832 from civicrm/5.43

5.43

2 years agoMerge pull request #21807 from braders/feature/replace-spacer-img-elements
Tim Otten [Thu, 14 Oct 2021 08:08:06 +0000 (01:08 -0700)]
Merge pull request #21807 from braders/feature/replace-spacer-img-elements

Remove use of spacer.gif img elements in CRM_Utils_Weight

2 years agoMerge pull request #21830 from totten/5.43-regen
Tim Otten [Thu, 14 Oct 2021 08:03:15 +0000 (01:03 -0700)]
Merge pull request #21830 from totten/5.43-regen

(dev/core#2836) regen.sh - Fix incorrect reference to "flexmailer". Update data file.

2 years agoRemove call to getTokenDetails from Contribute pdf letter
Eileen McNaughton [Tue, 12 Oct 2021 05:25:17 +0000 (18:25 +1300)]
Remove call to getTokenDetails from Contribute pdf letter

On digging this is just a glorifed api call. The parameters loaded are only used in emailLetter for filtering

2 years agoStop flushing caches on enable civiCampaign
Eileen McNaughton [Thu, 14 Oct 2021 06:09:51 +0000 (19:09 +1300)]
Stop flushing caches on enable civiCampaign

We should be able to get the 'right' cache clearing via the core function.