Maria [Wed, 20 Oct 2021 09:33:17 +0000 (11:33 +0200)]
Update pcp_notify_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.
Seamus Lee [Wed, 20 Oct 2021 06:08:22 +0000 (17:08 +1100)]
Merge pull request #21868 from yashodha/typo
typo fixes
yashodha [Wed, 20 Oct 2021 02:22:56 +0000 (07:52 +0530)]
typo fixes
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
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
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
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
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
Seamus Lee [Tue, 19 Oct 2021 03:37:08 +0000 (14:37 +1100)]
Merge pull request #21856 from civicrm/5.43
5.43
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
Coleman Watts [Sat, 16 Oct 2021 20:19:19 +0000 (16:19 -0400)]
RelationshipCache - Add case_id column
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.
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
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)
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
demeritcowboy [Mon, 18 Oct 2021 14:35:50 +0000 (10:35 -0400)]
show extension name not key
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
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.
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.
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
Eileen McNaughton [Mon, 18 Oct 2021 03:46:42 +0000 (16:46 +1300)]
Fix test to use postProcess flow
Eileen McNaughton [Thu, 14 Oct 2021 01:21:29 +0000 (14:21 +1300)]
dev/core#2914 Fix for incorrect sent count in message
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
Eileen McNaughton [Sat, 16 Oct 2021 22:11:46 +0000 (11:11 +1300)]
Preparatory cleanup in test class
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
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
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
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
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
demeritcowboy [Sat, 16 Oct 2021 16:10:06 +0000 (12:10 -0400)]
put back missing placeholder
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
Bradley Taylor [Sat, 16 Oct 2021 14:18:38 +0000 (15:18 +0100)]
Remove use of hardcoded strings in Dedupe templates
Bradley Taylor [Sat, 16 Oct 2021 13:15:31 +0000 (14:15 +0100)]
Makes hardcoded placeholder strings translatable
Christian Wach [Sat, 16 Oct 2021 10:46:51 +0000 (11:46 +0100)]
Restrict "Oops" to administrative errors
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
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
Bradley Taylor [Fri, 15 Oct 2021 16:09:29 +0000 (17:09 +0100)]
Use SVG for 'Empowered by' logo
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
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.
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
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
Tim Otten [Fri, 15 Oct 2021 06:00:35 +0000 (23:00 -0700)]
(NFC) TokenConsistencyTest - More aggressive test cleanup
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
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
Tim Otten [Fri, 15 Oct 2021 00:53:04 +0000 (17:53 -0700)]
(NFC) TokenConsistencyTest - Add some examples of HTML escaping
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
Eileen McNaughton [Thu, 14 Oct 2021 19:42:44 +0000 (08:42 +1300)]
Merge pull request #21832 from civicrm/5.43
5.43
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
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.
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
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.
Seamus Lee [Thu, 14 Oct 2021 06:08:16 +0000 (17:08 +1100)]
Merge pull request #21828 from colemanw/api4RecursionFix
APIv4 - Fix possible recursion during Entity::get()
Seamus Lee [Thu, 14 Oct 2021 06:06:15 +0000 (17:06 +1100)]
Merge pull request #21831 from seamuslee001/5.43
Add release-notes/5.42.1.md
Tim Otten [Thu, 14 Oct 2021 04:03:27 +0000 (21:03 -0700)]
Add release-notes/5.42.1.md
Tim Otten [Thu, 14 Oct 2021 05:52:28 +0000 (22:52 -0700)]
Merge pull request #21826 from eileenmcnaughton/cancellabel
Fix translation regression in recurring edit workflow template
Tim Otten [Thu, 14 Oct 2021 04:27:33 +0000 (21:27 -0700)]
Regenerate `sql/civicrm_generated.mysql`
Tim Otten [Thu, 14 Oct 2021 04:22:19 +0000 (21:22 -0700)]
bin/regen.sh - Fix misnamed extension
The script tries to filter the list of extensions that wind up in the sample data-set.
The filter list targets `full_name` (ie long name), but some of the values are inaccurate.
Coleman Watts [Thu, 14 Oct 2021 02:45:29 +0000 (22:45 -0400)]
APIv4 - Fix possible recursion during Entity::get()
Eileen McNaughton [Wed, 13 Oct 2021 23:28:32 +0000 (12:28 +1300)]
Fix translation regression in recurring edit workflow template
Eileen McNaughton [Wed, 13 Oct 2021 22:51:04 +0000 (11:51 +1300)]
Merge pull request #21825 from civicrm/5.43
5.43 to master
Eileen McNaughton [Wed, 13 Oct 2021 22:50:20 +0000 (11:50 +1300)]
Merge pull request #21824 from eileenmcnaughton/getfields
Use preferred entity name (Website not website)
Eileen McNaughton [Wed, 13 Oct 2021 20:03:16 +0000 (09:03 +1300)]
Use preferred entity name (Website not website)
Eileen McNaughton [Wed, 13 Oct 2021 19:24:06 +0000 (08:24 +1300)]
Merge pull request #21823 from civicrm/5.43
5.43 to master
Eileen McNaughton [Wed, 13 Oct 2021 19:20:00 +0000 (08:20 +1300)]
Merge pull request #21815 from demeritcowboy/case-token
dev/core#2895 - Failing test demonstrating case token not resolved
Eileen McNaughton [Wed, 13 Oct 2021 19:18:42 +0000 (08:18 +1300)]
Merge pull request #21821 from totten/5.43-event-actres
(REF) Tokens - Populate "Event"/"Participant" without direct access to actionSearchResult
Jamie McClelland [Tue, 12 Oct 2021 19:08:12 +0000 (15:08 -0400)]
ensure events with single quotes can be share via social
demeritcowboy [Wed, 13 Oct 2021 15:13:58 +0000 (11:13 -0400)]
Merge pull request #21804 from eileenmcnaughton/pdf
[REF] Paramter simplification
demeritcowboy [Fri, 8 Oct 2021 17:40:30 +0000 (13:40 -0400)]
test demonstrating failure to resolve token
Eileen McNaughton [Wed, 13 Oct 2021 04:53:29 +0000 (17:53 +1300)]
Merge pull request #21822 from civicrm/5.43
5.43 to master
Eileen McNaughton [Wed, 13 Oct 2021 04:52:49 +0000 (17:52 +1300)]
Merge pull request #21818 from alifrumin/rn5.43
[NFC] First Pass Release notes 5.43
Eileen McNaughton [Wed, 13 Oct 2021 04:52:32 +0000 (17:52 +1300)]
Merge pull request #21819 from colemanw/APIv4EntityEvent2
REF - Fix loop in APIv4 Entity.get to only load ad-hoc entities once
Eileen McNaughton [Wed, 13 Oct 2021 03:49:10 +0000 (16:49 +1300)]
Merge pull request #21812 from eileenmcnaughton/gdpr_tokens
dev/core#2907 fix for gdpr clobering contact tokens
Tim Otten [Wed, 13 Oct 2021 03:06:25 +0000 (20:06 -0700)]
(REF) ParticipantTokens - Simplify
The previous commit passes `eventId` through the front-door of `$context`,
so we shouldn't need as much special effort to bring it in the side-door.
Tim Otten [Wed, 13 Oct 2021 03:02:51 +0000 (20:02 -0700)]
(REF) Tokens - Populate "Event"/"Participant" without direct access to actionSearchResult
Overview
--------
When sending a scheduled remidner for a `civicrm_participant` record, it supports
tokens for both `{participant.*}` (`$context['participantId']`) and `{event.*}`
(`$context['eventId']`). This creates a special requirement to load the `eventId`
in addition to the `participantId`.
This patch changes the way in which `eventId` is loaded.
Before
------
In `ParticipantToken`, the token-evaluation-step for `{participant.*}`
tokens has a side-effect of copying `$context['eventId']` based on reading
`actionSearchResult` (although this appears indirect).
After
-----
The action-search returns `tokenContext_eventId`, which automatically maps
to `$context['eventId']`.
This means that the `eventId` will be set before evaluation begins.
Alice Frumin [Tue, 12 Oct 2021 17:32:59 +0000 (13:32 -0400)]
[NFC] first pass at 5.43 release notes
Coleman Watts [Wed, 13 Oct 2021 01:51:59 +0000 (21:51 -0400)]
REF - Fix loop in APIv4 Entity.get to only load ad-hoc entities once
Eileen McNaughton [Wed, 13 Oct 2021 01:27:47 +0000 (14:27 +1300)]
Merge pull request #21817 from civicrm/5.43
5.43 to master
Eileen McNaughton [Tue, 12 Oct 2021 19:46:39 +0000 (08:46 +1300)]
dev/core#2907 fix for gdpr clobering contact tokens
This is a fix for contact tokens not rendering when gdpr tokens is installed.
Gdpr declares some addtional tokens with the namespace 'contact'. I am inclined to
agree this counts as 'naughty' and so while I have fixed the clobbering by
not processing contact-metadata tokens I have not fixed the enotices.
If we think it is non-naughty I can kill those - but I've already loosened
some strictness that I think had benefits in order to facilitate this
Eileen McNaughton [Wed, 13 Oct 2021 01:19:38 +0000 (14:19 +1300)]
Merge pull request #21803 from colemanw/APIv4EntityEvent
[REF] APIv4 - Dispatch event during Entity.get
demeritcowboy [Wed, 13 Oct 2021 00:03:05 +0000 (20:03 -0400)]
Merge pull request #21801 from eileenmcnaughton/case1
dev/core#2895 handle case ids passed via url
Eileen McNaughton [Tue, 12 Oct 2021 22:37:53 +0000 (11:37 +1300)]
Merge pull request #21814 from civicrm/5.43
5.43 to master
Eileen McNaughton [Tue, 12 Oct 2021 22:37:13 +0000 (11:37 +1300)]
Merge pull request #21806 from totten/5.43-as-ctx
EntityTokens - Normalize data-loading via myEntityId (eg activityId)
Coleman Watts [Tue, 12 Oct 2021 02:32:28 +0000 (22:32 -0400)]
APIv4 - Dispatch event during Entity.get
This allows extensions to modify the list of entities,
enabling "virtual" entities not based on php files.
Eileen McNaughton [Tue, 12 Oct 2021 01:24:49 +0000 (14:24 +1300)]
dev/core#2895 handle case ids passed via url
Eileen McNaughton [Tue, 12 Oct 2021 21:23:40 +0000 (10:23 +1300)]
Merge pull request #21810 from braders/feature/missing-translations
Make hardcoded strings translatable.
Bradley Taylor [Tue, 12 Oct 2021 20:24:02 +0000 (21:24 +0100)]
Update to remove use of spacer.gif in ordering component
Eileen McNaughton [Tue, 12 Oct 2021 19:57:21 +0000 (08:57 +1300)]
Merge pull request #21800 from civicrm/5.43
5.43
Bradley Taylor [Tue, 12 Oct 2021 18:46:23 +0000 (19:46 +0100)]
Make hardcoded strings translatable.
Wraps previously hardcoded strings in {ts} in Smarty .tpl files.
Bradley Taylor [Tue, 12 Oct 2021 15:04:23 +0000 (16:04 +0100)]
Add alt text to spacer elements
All HTML img elements should contain an alt attribute.
For decorative or spacer elements this alt text should be a blank string,
which indicates to assistive technologies that the image should not be announced.
Longer-term these spacer gifs could be replaced with empty <span> elements.
Inline-block css has been added to allow for this change in future,
however, the HTML element has not been changed for now to avoid breakage with non-default themes
(e.g. civicrm-admin-utilities WordPress plugin which replaces the default css/civicrm.css file)
Tim Otten [Tue, 12 Oct 2021 08:56:14 +0000 (01:56 -0700)]
(NFC) MailingQueryEvent - Update docblock
Tim Otten [Tue, 12 Oct 2021 07:51:15 +0000 (00:51 -0700)]
EntityTokens - getFieldValue() does not need to support actionSearchResult
Tim Otten [Tue, 12 Oct 2021 07:43:17 +0000 (00:43 -0700)]
EntityTokens - Normalize data-loading via `myEntityId` (eg `activityId`)
Before
======
EntityTokens has two protocols for fetching data:
1. For scheduled-reminders, hook into the main query. Add N-ary columns to select
any fields used by tokens.
2. For everything else, expect a parameter `$row->context['activityId']`. Collect
the `activityId`s and fetch the needful via APIv4.
This poses a few challenges, but TLDR it's duplicate functionality. That
means that listeners who consume the `activityId` must check multiple
places. It means that the data-loading could return slightly different data
(ie based on SQL query vs API data-loader).
After
=====
* EntityTokens has one protocol for fetching data: it must receive `activityId`s and then
call APIv4 for the batch.
* For scheduled-reminders, EntityTokens uses a small adapter to ensure that `activityId`s
are available.
Tim Otten [Tue, 12 Oct 2021 05:11:00 +0000 (22:11 -0700)]
Merge pull request #21783 from eileenmcnaughton/money
Use money formatting for currency in templates
Eileen McNaughton [Tue, 12 Oct 2021 05:09:06 +0000 (18:09 +1300)]
[REF] Paramter simplification
Seamus Lee [Tue, 12 Oct 2021 04:35:30 +0000 (15:35 +1100)]
Merge pull request #21796 from eileenmcnaughton/543
dev/core#2904 ensure skipStatusCal not passed from the order api
Seamus Lee [Tue, 12 Oct 2021 03:46:15 +0000 (14:46 +1100)]
Merge pull request #21784 from eileenmcnaughton/api3
dev/core#2902 revert apiv3 handling of membership
Seamus Lee [Tue, 12 Oct 2021 03:45:21 +0000 (14:45 +1100)]
Merge pull request #21799 from eileenmcnaughton/refs
Do not find references for empty values
Francis Whittle [Tue, 12 Oct 2021 02:17:26 +0000 (13:17 +1100)]
dev/core#2904 Add tests for automatic date calculation for Memberships in Order API.
Eileen McNaughton [Mon, 11 Oct 2021 20:23:27 +0000 (09:23 +1300)]
dev/core#2904 ensure skipStatusCal not passed from the order api
Eileen McNaughton [Tue, 12 Oct 2021 01:53:37 +0000 (14:53 +1300)]
Merge pull request #21794 from eileenmcnaughton/sms
Remove another call to getTokenDetails