civicrm-core.git
3 years agodev/core#2758 fix task tiles
Eileen McNaughton [Sun, 15 Aug 2021 22:01:07 +0000 (10:01 +1200)]
dev/core#2758 fix task tiles

3 years agoMerge pull request #21136 from agh1/5.41.0-releasenotes-initial
Seamus Lee [Sat, 14 Aug 2021 03:12:41 +0000 (13:12 +1000)]
Merge pull request #21136 from agh1/5.41.0-releasenotes-initial

5.41.0 release notes initial run

3 years ago5.41.0 release notes: added boilerplate
Andie Hunt [Fri, 13 Aug 2021 22:15:31 +0000 (18:15 -0400)]
5.41.0 release notes: added boilerplate

3 years ago5.41.0 release notes: raw from script
Andie Hunt [Fri, 13 Aug 2021 22:12:51 +0000 (18:12 -0400)]
5.41.0 release notes: raw from script

3 years agoMerge pull request #21099 from eileenmcnaughton/camp54
Seamus Lee [Fri, 13 Aug 2021 21:27:18 +0000 (07:27 +1000)]
Merge pull request #21099 from eileenmcnaughton/camp54

dev/core#2743 fix api v3 to not unnecessarily load options

3 years agoMerge pull request #21102 from artfulrobot/ui/37
Seamus Lee [Fri, 13 Aug 2021 21:23:27 +0000 (07:23 +1000)]
Merge pull request #21102 from artfulrobot/ui/37

dev/user-interface#37 Reinstate jQueryUI visible focus effect in quicksearch

3 years agoMerge pull request #21124 from MegaphoneJon/fix-event-validation
Eileen McNaughton [Fri, 13 Aug 2021 20:13:05 +0000 (08:13 +1200)]
Merge pull request #21124 from MegaphoneJon/fix-event-validation

fix crmValidate() not loading on event registration pages

3 years agofix crmValidate() not loading on event registration pages
Jon Goldberg [Fri, 13 Aug 2021 17:50:54 +0000 (13:50 -0400)]
fix crmValidate() not loading on event registration pages

3 years agoMerge pull request #21107 from MegaphoneJon/clean-override-total
Eileen McNaughton [Fri, 13 Aug 2021 05:56:17 +0000 (17:56 +1200)]
Merge pull request #21107 from MegaphoneJon/clean-override-total

delocalize total amount before passing to setOverrideTotal

3 years agoMerge pull request #21108 from seamuslee001/5.41
Seamus Lee [Fri, 13 Aug 2021 01:22:45 +0000 (11:22 +1000)]
Merge pull request #21108 from seamuslee001/5.41

[REF] Upgrade CKEditor to 4.16.2

3 years agoMerge pull request #21104 from totten/5.41-typo
Seamus Lee [Thu, 12 Aug 2021 23:35:09 +0000 (09:35 +1000)]
Merge pull request #21104 from totten/5.41-typo

(NFC) release-notes - Fix typo

3 years agoMerge pull request #21100 from eileenmcnaughton/exceptless
Seamus Lee [Thu, 12 Aug 2021 23:34:36 +0000 (09:34 +1000)]
Merge pull request #21100 from eileenmcnaughton/exceptless

dev/core#2749 remove exception when no payment processor configured when no payment processor configured

3 years ago[REF] Upgrade CKEditor to 4.16.2
Seamus Lee [Thu, 12 Aug 2021 22:21:06 +0000 (08:21 +1000)]
[REF] Upgrade CKEditor to 4.16.2

3 years agodelocalize total amount before passing to setOverrideTotal
Jon Goldberg [Thu, 12 Aug 2021 21:55:57 +0000 (17:55 -0400)]
delocalize total amount before passing to setOverrideTotal

3 years ago(NFC) release-notes/5.39.1.md - Fix typo
Tim Otten [Thu, 12 Aug 2021 20:47:59 +0000 (13:47 -0700)]
(NFC) release-notes/5.39.1.md - Fix typo

Typo was autogenerated from a template. Template is also fixed.

3 years agoReinstate jQueryUI visible focus effect in quicksearch user-interface issue 37
Rich Lott / Artful Robot [Thu, 12 Aug 2021 06:56:47 +0000 (07:56 +0100)]
Reinstate jQueryUI visible focus effect in quicksearch user-interface issue 37

3 years agodev/core#2749 remove exception when no payment processor configuredhen no payment...
Eileen McNaughton [Wed, 11 Aug 2021 22:43:52 +0000 (10:43 +1200)]
dev/core#2749 remove exception when no payment processor configuredhen no payment processor configured

This is an attempt to fix a regression https://lab.civicrm.org/dev/core/-/issues/2749
when there are legitimately no payment processors assigned to a page.

I feel like the configuration screens are adequate to enforce this & having an exception like
this in the assign function is the wrong place.

The original issue is that the is_monetary box was not checked & hence the
processor wasn't assigned. This felt like asking users to understand that
a payment method when money options are configured

3 years agoFix one test & remove 2 that covered the error message
Eileen McNaughton [Thu, 12 Aug 2021 00:06:05 +0000 (12:06 +1200)]
Fix one test & remove 2 that covered the error message

3 years agodev/core#2743 fix api v3 to not unnecessarily load options
Eileen McNaughton [Wed, 11 Aug 2021 22:28:50 +0000 (10:28 +1200)]
dev/core#2743 fix api v3 to not unnecessarily load options

3 years agoMerge pull request #21001 from seamuslee001/fix_utf8mb4_test
Seamus Lee [Sat, 7 Aug 2021 04:46:48 +0000 (14:46 +1000)]
Merge pull request #21001 from seamuslee001/fix_utf8mb4_test

[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of databas…

3 years ago[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of database in the v3...
Seamus Lee [Mon, 2 Aug 2021 22:34:47 +0000 (08:34 +1000)]
[REF] Fix utf8mb4 test in APIv4 and re-enable the altering of database in the v3 version of the test and fix handling for first name field

3 years agoSet version to 5.41.beta1
CiviCRM [Sat, 7 Aug 2021 02:12:01 +0000 (02:12 +0000)]
Set version to 5.41.beta1

3 years agoMerge pull request #21053 from eileenmcnaughton/group_odd
Tim Otten [Sat, 7 Aug 2021 02:11:16 +0000 (19:11 -0700)]
Merge pull request #21053 from eileenmcnaughton/group_odd

dev/core#2742 fix group type on group create from form

3 years agoMerge pull request #21051 from eileenmcnaughton/allan
Tim Otten [Sat, 7 Aug 2021 01:57:33 +0000 (18:57 -0700)]
Merge pull request #21051 from eileenmcnaughton/allan

dev/core#2740 fix dashboard regression on links

3 years agoMerge pull request #21050 from eileenmcnaughton/notice
Eileen McNaughton [Sat, 7 Aug 2021 01:14:32 +0000 (13:14 +1200)]
Merge pull request #21050 from eileenmcnaughton/notice

Tpl notice fixes

3 years agodev/core#2742 fix group type on group create from form
Eileen McNaughton [Sat, 7 Aug 2021 00:37:53 +0000 (12:37 +1200)]
dev/core#2742 fix group type on group create from form

3 years agodev/core#2740 fix dashboard regression on links
Eileen McNaughton [Fri, 6 Aug 2021 23:59:50 +0000 (11:59 +1200)]
dev/core#2740 fix dashboard regression on links

3 years agoMerge pull request #21045 from colemanw/fixSearchKitTaskPermissions
Eileen McNaughton [Fri, 6 Aug 2021 23:30:49 +0000 (11:30 +1200)]
Merge pull request #21045 from colemanw/fixSearchKitTaskPermissions

SearchKit - Fix permission to access task list

3 years agoTpl notice fixes
Eileen McNaughton [Fri, 6 Aug 2021 22:38:59 +0000 (10:38 +1200)]
Tpl notice fixes

These fields are both conditionally assigned to the template

3 years agoMerge pull request #21044 from mlutfy/fixContribSymbiotic
demeritcowboy [Fri, 6 Aug 2021 17:57:37 +0000 (13:57 -0400)]
Merge pull request #21044 from mlutfy/fixContribSymbiotic

contributor-key.yml: updates for Symbiotic

3 years agoSearchKit - Fix permission to access task list
Coleman Watts [Fri, 6 Aug 2021 15:08:27 +0000 (11:08 -0400)]
SearchKit - Fix permission to access task list

This regressed in 06ea32c, as a new api action was added but permissions were not declared.

3 years agocontributor-key.yml: updates for Symbiotic
Mathieu Lutfy [Fri, 6 Aug 2021 14:57:49 +0000 (10:57 -0400)]
contributor-key.yml: updates for Symbiotic

3 years agoMerge pull request #21039 from eileenmcnaughton/tok_pseudo
colemanw [Fri, 6 Aug 2021 14:55:47 +0000 (10:55 -0400)]
Merge pull request #21039 from eileenmcnaughton/tok_pseudo

Reconcile tokens misnamed or missing on legacy class

3 years agoMerge pull request #21038 from eileenmcnaughton/tok_names
colemanw [Fri, 6 Aug 2021 14:51:20 +0000 (10:51 -0400)]
Merge pull request #21038 from eileenmcnaughton/tok_names

Switch to using apiv4 for metadata

3 years agoMerge pull request #21041 from eileenmcnaughton/notice2
demeritcowboy [Fri, 6 Aug 2021 14:28:07 +0000 (10:28 -0400)]
Merge pull request #21041 from eileenmcnaughton/notice2

Enotice fix

3 years agoMerge pull request #21040 from eileenmcnaughton/tpl
Eileen McNaughton [Fri, 6 Aug 2021 09:03:13 +0000 (21:03 +1200)]
Merge pull request #21040 from eileenmcnaughton/tpl

Enotice fix

3 years agoMerge pull request #20752 from samuelsov/ReportGroup
Eileen McNaughton [Fri, 6 Aug 2021 07:26:02 +0000 (19:26 +1200)]
Merge pull request #20752 from samuelsov/ReportGroup

Make report subtotals work for custom fields

3 years agoEnotice fix
Eileen McNaughton [Fri, 6 Aug 2021 06:56:39 +0000 (18:56 +1200)]
Enotice fix

This one is a bit of a brain twister but I'm pretty sure the re-ordered IF has the
same result - but one less enotice

3 years agoMerge pull request #20989 from mattwire/mailtasks
Eileen McNaughton [Fri, 6 Aug 2021 06:51:07 +0000 (18:51 +1200)]
Merge pull request #20989 from mattwire/mailtasks

Fix mailing task when there are no tasks

3 years agoEnotice fix
Eileen McNaughton [Fri, 6 Aug 2021 06:32:05 +0000 (18:32 +1200)]
Enotice fix

3 years agoReconcile tokens misnamed on legacy class
Eileen McNaughton [Fri, 6 Aug 2021 03:17:56 +0000 (15:17 +1200)]
Reconcile tokens misnamed on legacy class

This switches to using the same metadata based record for both classes

3 years agoSwitch to using apiv4 for metadata
Eileen McNaughton [Fri, 6 Aug 2021 01:55:04 +0000 (13:55 +1200)]
Switch to using apiv4 for metadata

3 years agoMerge pull request #21036 from eileenmcnaughton/act_mon
Eileen McNaughton [Fri, 6 Aug 2021 04:39:28 +0000 (16:39 +1200)]
Merge pull request #21036 from eileenmcnaughton/act_mon

Reconcile contribution amount tokens

3 years agoReconcile contribution amount tokens
Eileen McNaughton [Fri, 6 Aug 2021 00:38:49 +0000 (12:38 +1200)]
Reconcile contribution amount tokens

This adds non_deductible_amount, as identified in https://github.com/civicrm/civicrm-core/pull/21034

It also moves the metadata functions to a parent class - this class might wind up
being a temporary class as there are 3 other contenders for where this functionality
should go - the TokenTrait, the abstractProvider or the tokenRow class. The intent
is not to make that decision yet - just to provide visual clarity about
what is generic

Note - I've figured out how to switch over to v4 api for this but will do that in a separate PR

3 years agoMerge pull request #21037 from eileenmcnaughton/act_source
Eileen McNaughton [Fri, 6 Aug 2021 02:59:35 +0000 (14:59 +1200)]
Merge pull request #21037 from eileenmcnaughton/act_source

Fix advertised token for source

3 years agoMerge pull request #21035 from eileenmcnaughton/act_more
Eileen McNaughton [Fri, 6 Aug 2021 02:47:29 +0000 (14:47 +1200)]
Merge pull request #21035 from eileenmcnaughton/act_more

Update contribution_page_id token in sched reminders

3 years agoUpdate contribution_page_id token in sched reminders
Eileen McNaughton [Thu, 5 Aug 2021 23:12:43 +0000 (11:12 +1200)]
Update contribution_page_id token in sched reminders

3 years agoFix advertised token for source
Eileen McNaughton [Fri, 6 Aug 2021 00:51:38 +0000 (12:51 +1200)]
Fix advertised token for source

3 years agoMerge pull request #21000 from eileenmcnaughton/act_more
Seamus Lee [Thu, 5 Aug 2021 23:11:11 +0000 (09:11 +1000)]
Merge pull request #21000 from eileenmcnaughton/act_more

 Reconcile and upgrade tokens for payment instrument, financial type

3 years agoReconcile and upgrade tokens for payment instrument, financial type
Eileen McNaughton [Mon, 2 Aug 2021 21:40:32 +0000 (09:40 +1200)]
Reconcile and upgrade tokens for payment instrument, financial type

This switches the last 2 'alias' tokens from Contribute_Tokens to the preferred format,
adds tests & upgrade and switches the advertised tokens. I tested & the token
removed from the sent letter collection still works

Next step is to analyse the remaining differences between the 2 sets of tokens.
My suspicion is that we have enough metadata that we use in search kit that we
don't need a hard-coded white list of tokens in 2 different places & can just
expose 'all the fields' that are not acl or otherwise limited

3 years agoMerge pull request #20999 from eileenmcnaughton/act_up
Seamus Lee [Thu, 5 Aug 2021 21:21:39 +0000 (07:21 +1000)]
Merge pull request #20999 from eileenmcnaughton/act_up

Switch contribution action schedule tokens to use advertised tokens for cancel_date & source

3 years agoMerge pull request #21019 from ejegg/customFieldBulkLog
Seamus Lee [Thu, 5 Aug 2021 21:20:24 +0000 (07:20 +1000)]
Merge pull request #21019 from ejegg/customFieldBulkLog

Fix bulk adding custom fields with logging on

3 years agoMerge pull request #21033 from kurund/patch-2
Mathieu Lu [Thu, 5 Aug 2021 13:10:59 +0000 (09:10 -0400)]
Merge pull request #21033 from kurund/patch-2

Update contributor-key.yml

3 years agoUpdate contributor-key.yml
Kurund Jalmi [Thu, 5 Aug 2021 13:09:32 +0000 (14:09 +0100)]
Update contributor-key.yml

3 years agoMerge pull request #21032 from seamuslee001/master
Seamus Lee [Thu, 5 Aug 2021 10:09:13 +0000 (20:09 +1000)]
Merge pull request #21032 from seamuslee001/master

5.40 up merge

3 years agoMerge in 5.40
Seamus Lee [Thu, 5 Aug 2021 10:08:31 +0000 (20:08 +1000)]
Merge in 5.40

3 years agoMerge pull request #21031 from totten/5.40-bump0
Tim Otten [Thu, 5 Aug 2021 10:03:40 +0000 (03:03 -0700)]
Merge pull request #21031 from totten/5.40-bump0

5.40.0 - Version bump. More release notes.

3 years agoSet version to 5.40.0
Tim Otten [Thu, 5 Aug 2021 09:15:21 +0000 (02:15 -0700)]
Set version to 5.40.0

3 years agoTweak release-notes/5.40.0.md
Tim Otten [Thu, 5 Aug 2021 09:14:06 +0000 (02:14 -0700)]
Tweak release-notes/5.40.0.md

3 years agoMerge pull request #21028 from eileenmcnaughton/540
Seamus Lee [Thu, 5 Aug 2021 09:11:32 +0000 (19:11 +1000)]
Merge pull request #21028 from eileenmcnaughton/540

dev/event#62 - Expose all price fields to backend form (5.40)

3 years agoAdd release-notes/5.39.1.md
Tim Otten [Thu, 5 Aug 2021 08:35:00 +0000 (01:35 -0700)]
Add release-notes/5.39.1.md

3 years agodev/event#62 expose all price fields to backend form
Brian Shaughnessy [Thu, 29 Jul 2021 14:56:41 +0000 (10:56 -0400)]
dev/event#62 expose all price fields to backend form

3 years agoMerge pull request #21020 from colemanw/fixWPUrlHash
Eileen McNaughton [Thu, 5 Aug 2021 06:10:13 +0000 (18:10 +1200)]
Merge pull request #21020 from colemanw/fixWPUrlHash

[REGRESSION] Fix CRM.url to not encode hash on WP

3 years agoMerge pull request #21014 from eileenmcnaughton/pf
Tim Otten [Thu, 5 Aug 2021 06:09:09 +0000 (23:09 -0700)]
Merge pull request #21014 from eileenmcnaughton/pf

dev/core#2739 - Fix contribution tasks using wrong IDs

3 years agoMerge pull request #21012 from eileenmcnaughton/540
Seamus Lee [Thu, 5 Aug 2021 04:10:22 +0000 (14:10 +1000)]
Merge pull request #21012 from eileenmcnaughton/540

dev/core#2725 Fix regression permitting circular group resolution

3 years agoMerge pull request #21022 from eileenmcnaughton/sched
Seamus Lee [Thu, 5 Aug 2021 04:08:51 +0000 (14:08 +1000)]
Merge pull request #21022 from eileenmcnaughton/sched

dev/core#2735 fix for effective start & end date not updating

3 years agoFix CRM.url to not encode hash on WP
Coleman Watts [Thu, 5 Aug 2021 01:38:12 +0000 (21:38 -0400)]
Fix CRM.url to not encode hash on WP

3 years agodev/core#2735 fix for effective start & end date not updating
Eileen McNaughton [Thu, 5 Aug 2021 02:23:14 +0000 (14:23 +1200)]
dev/core#2735 fix for effective start & end date not updating

3 years agodev/core#2725 Fix regression permitting circular group resolution
Eileen McNaughton [Wed, 4 Aug 2021 21:39:59 +0000 (09:39 +1200)]
dev/core#2725 Fix regression permitting circular group resolution

3 years agoMerge pull request #21005 from colemanw/afformFieldDefaults
Eileen McNaughton [Thu, 5 Aug 2021 02:07:11 +0000 (14:07 +1200)]
Merge pull request #21005 from colemanw/afformFieldDefaults

Afform - support default values for fields

3 years agoMerge pull request #21017 from totten/5.40-captcha-link
Eileen McNaughton [Thu, 5 Aug 2021 02:00:29 +0000 (14:00 +1200)]
Merge pull request #21017 from totten/5.40-captcha-link

dev/core#2728 - ReCAPTCHA - Consistently present link to settings

3 years agoMerge pull request #21016 from eileenmcnaughton/jamie
Seamus Lee [Thu, 5 Aug 2021 01:41:11 +0000 (11:41 +1000)]
Merge pull request #21016 from eileenmcnaughton/jamie

Temporary revert of changes in 20002 which caused a regression

3 years agoFix adding many custom fields with logging on
Elliott Eggleston [Thu, 5 Aug 2021 01:23:29 +0000 (21:23 -0400)]
Fix adding many custom fields with logging on

This code is only triggered in the 'bulk' writeRecords codepath,
not in the createField codepath which is used for creating custom
fields via the UI.

To replicate: on a wmff build, turn loggin on, check out
https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/709873
and run drush update-custom-fields

Result prior to this patch: SQL syntax error message and new field
not added to logging table

Result with this patch: no error message, new field created on log
table.

3 years agoMerge pull request #21015 from civicrm/5.40
Seamus Lee [Thu, 5 Aug 2021 01:06:35 +0000 (11:06 +1000)]
Merge pull request #21015 from civicrm/5.40

5.40

3 years agodev/core#2728 - ReCAPTCHA - Consistently present link to settings
Tim Otten [Thu, 5 Aug 2021 00:27:28 +0000 (17:27 -0700)]
dev/core#2728 - ReCAPTCHA - Consistently present link to settings

See also: https://lab.civicrm.org/dev/core/-/issues/2728

Before
------

"ReCAPTCHA Settings" appears in "Customize Data and Screens" in the nav-menu, and it is missing in the `civicrm/admin` dashboard.

After
-----

"ReCAPTCHA Settings" appears "System Settings" for both the nav-menu and the `civicrm/admin` dashboard.

3 years agoAfform - support default values for fields
Coleman Watts [Wed, 4 Aug 2021 02:32:38 +0000 (22:32 -0400)]
Afform - support default values for fields

This adds an "afform_default" property to the field definition.
It does not use the "default_value" property from getFields because that's more
to do with Civi's schema and often not appropriate for a form.
Fixes dev/core#2734

3 years agoAvoid test failures on revert
Eileen McNaughton [Wed, 4 Aug 2021 23:49:47 +0000 (11:49 +1200)]
Avoid test failures on revert

3 years agoRevert "Issue 53 (2)"
Eileen McNaughton [Wed, 4 Aug 2021 23:45:46 +0000 (11:45 +1200)]
Revert "Issue 53 (2)"

This reverts commit 4f4fb809a77cdfb7876d662f331d524fb2eeb1b3.

3 years agoAdd related contact display test
Eileen McNaughton [Wed, 4 Aug 2021 23:43:26 +0000 (11:43 +1200)]
Add related contact display test

3 years agoMerge pull request #21013 from seamuslee001/apiv4_utf8mb4
Seamus Lee [Wed, 4 Aug 2021 23:23:01 +0000 (09:23 +1000)]
Merge pull request #21013 from seamuslee001/apiv4_utf8mb4

[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors

3 years agoMerge pull request #20929 from eileenmcnaughton/5.40
Seamus Lee [Wed, 4 Aug 2021 22:39:22 +0000 (08:39 +1000)]
Merge pull request #20929 from eileenmcnaughton/5.40

dev/wordpress#109 fix bug when is_monetary is not checked

3 years agodev/core#2739 - Fix contribution tasks using wrong IDs
Patrick Figel [Wed, 4 Aug 2021 15:20:48 +0000 (17:20 +0200)]
dev/core#2739 - Fix contribution tasks using wrong IDs

This fixes an issue where contribution tasks may perform actions
on unrelated contribution IDs when they're called via contact
search forms.

3 years agoMerge pull request #21008 from jmcclelland/grant-pagination
Eileen McNaughton [Wed, 4 Aug 2021 21:21:50 +0000 (09:21 +1200)]
Merge pull request #21008 from jmcclelland/grant-pagination

enable paging if contact has more then 50 grants.

3 years ago[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors
Seamus Lee [Wed, 4 Aug 2021 21:12:22 +0000 (07:12 +1000)]
[NFC] Fix APIv4 Utf8mb4 test to ensure no mixed collation errors

3 years agoMerge pull request #21011 from seamuslee001/master
Seamus Lee [Wed, 4 Aug 2021 21:08:00 +0000 (07:08 +1000)]
Merge pull request #21011 from seamuslee001/master

5.40

3 years agoMerge branch '5.40'
Seamus Lee [Wed, 4 Aug 2021 21:05:35 +0000 (07:05 +1000)]
Merge branch '5.40'

3 years agoMerge pull request #21009 from agh1/5.40.0-releasenotes-final
Eileen McNaughton [Wed, 4 Aug 2021 21:03:04 +0000 (09:03 +1200)]
Merge pull request #21009 from agh1/5.40.0-releasenotes-final

5.40.0 release notes - final edits

3 years ago5.40.0 release notes: reorganized and final edits
Andie Hunt [Wed, 4 Aug 2021 17:55:00 +0000 (13:55 -0400)]
5.40.0 release notes: reorganized and final edits

3 years ago5.40.0 release notes: added late changes
Andie Hunt [Wed, 4 Aug 2021 17:39:25 +0000 (13:39 -0400)]
5.40.0 release notes: added late changes

3 years agoenable paging if contact has more then 50 grants.
Jamie McClelland [Wed, 4 Aug 2021 17:35:06 +0000 (13:35 -0400)]
enable paging if contact has more then 50 grants.

3 years agoRelease notes: Contributor key no longer needs Jira handles
Andie Hunt [Wed, 4 Aug 2021 17:19:04 +0000 (13:19 -0400)]
Release notes: Contributor key no longer needs Jira handles

3 years agoIt's Andie ;)
Andie Hunt [Wed, 4 Aug 2021 17:11:25 +0000 (13:11 -0400)]
It's Andie ;)

3 years agoMerge pull request #21003 from eileenmcnaughton/swapsies
demeritcowboy [Wed, 4 Aug 2021 13:28:57 +0000 (09:28 -0400)]
Merge pull request #21003 from eileenmcnaughton/swapsies

Use template variable to add or remove swap button.

3 years agoMerge pull request #20990 from eileenmcnaughton/cs
demeritcowboy [Wed, 4 Aug 2021 13:20:29 +0000 (09:20 -0400)]
Merge pull request #20990 from eileenmcnaughton/cs

[Ref] [Test] Move custom search tests to extension

3 years agoMerge pull request #20996 from colemanw/fixAfformContactType
Eileen McNaughton [Wed, 4 Aug 2021 06:12:49 +0000 (18:12 +1200)]
Merge pull request #20996 from colemanw/fixAfformContactType

Afform - Use correct contact type when loading field options

3 years agoMerge pull request #21004 from seamuslee001/teardownftsquery
Seamus Lee [Wed, 4 Aug 2021 03:23:20 +0000 (13:23 +1000)]
Merge pull request #21004 from seamuslee001/teardownftsquery

[NFC] Do a proper tear down of fts in QueryFormatterTest

3 years ago[NFC] Do a proper tear down of fts in QueryFormatterTest
Seamus Lee [Wed, 4 Aug 2021 01:05:13 +0000 (11:05 +1000)]
[NFC] Do a proper tear down of fts in QueryFormatterTest

3 years ago[NFC] Do a proper tear down of fts in QueryFormatterTest
Seamus Lee [Wed, 4 Aug 2021 00:58:48 +0000 (10:58 +1000)]
[NFC] Do a proper tear down of fts in QueryFormatterTest

3 years agoUse template variable to add or remove swap button.
Eileen McNaughton [Tue, 3 Aug 2021 23:30:19 +0000 (11:30 +1200)]
Use template variable to add or remove swap button.

In combination with email notifications this button can be dangerous - ie an accidental click and
a donor rather than a staff member gets the email.

My thinking is to disable this via the activity assignee extension,
https://lab.civicrm.org/extensions/assignee/-/issues/2 - but it's cleaner for
an extension to intervene by setting a smarty variable than using javascript
to remove the button and I feel like it makes more sense for the form to
assign 'instruction variables' than for the decision to freeze to
also have 'hidden' effects further down

3 years agoSwitch contribution action schedule tokens to use advertised tokens for cancel_date...
Eileen McNaughton [Mon, 2 Aug 2021 21:09:54 +0000 (09:09 +1200)]
Switch contribution action schedule tokens to use advertised tokens for cancel_date & source

Scheduled reminders was working with the incorrect and not advertised variants - this
switches over and upgrades ( a bit precautionary since the removed ones were not
in the widget)