Seamus Lee [Wed, 18 Aug 2021 10:07:21 +0000 (20:07 +1000)]
Merge pull request #21172 from colemanw/searchTokenPlaceholder
SearchKit - Add placeholder to token select
Seamus Lee [Wed, 18 Aug 2021 09:46:25 +0000 (19:46 +1000)]
Merge pull request #21119 from eileenmcnaughton/member
Update MembershipType.duration and MembershipStatus.name to be required
Coleman Watts [Wed, 18 Aug 2021 02:02:18 +0000 (22:02 -0400)]
SearchKit - Add placeholder to token select
Eileen McNaughton [Wed, 18 Aug 2021 00:50:26 +0000 (12:50 +1200)]
Merge pull request #21170 from eileenmcnaughton/notice
Enotice fixes in tpl
Eileen McNaughton [Tue, 17 Aug 2021 23:02:18 +0000 (11:02 +1200)]
Enotice fixes in tpl
Seamus Lee [Tue, 17 Aug 2021 23:00:25 +0000 (09:00 +1000)]
Merge pull request #21071 from colemanw/api4JoinFixes
APIv4 - Support multiple implicit joins to the same table
colemanw [Tue, 17 Aug 2021 22:48:15 +0000 (18:48 -0400)]
Merge pull request #21166 from eileenmcnaughton/cache2
dev/core#2763 cache clearing fix
Eileen McNaughton [Tue, 17 Aug 2021 21:02:22 +0000 (09:02 +1200)]
Merge pull request #21082 from colemanw/fixSearchKitPermissions
Fix search display access for non-admin users
demeritcowboy [Tue, 17 Aug 2021 13:08:13 +0000 (09:08 -0400)]
Merge pull request #21167 from greenpeace-cee/fix-contribution-activity-campaign-propagation
dev/core#2758 - Fix contribution activity campaign propagation
demeritcowboy [Tue, 17 Aug 2021 13:05:52 +0000 (09:05 -0400)]
Merge pull request #21161 from eileenmcnaughton/reinit
[Ref] remove unused variable
Patrick Figel [Tue, 17 Aug 2021 09:34:43 +0000 (11:34 +0200)]
dev/core#2758 - Fix contribution activity campaign propagation
This fixes an issue where contribution campaigns may not be propagated
to the corresponding contribution activity when the request that
triggers activity creation does not explicitly set the campaign_id
parameter.
Seamus Lee [Tue, 17 Aug 2021 09:04:13 +0000 (19:04 +1000)]
Merge pull request #21156 from colemanw/searchKitRef
[REF] SearchKit - Refactor search task code to share a trait
Eileen McNaughton [Tue, 17 Aug 2021 08:29:55 +0000 (20:29 +1200)]
Merge pull request #21164 from civicrm/5.41
5.41
Eileen McNaughton [Tue, 17 Aug 2021 07:51:41 +0000 (19:51 +1200)]
dev/core#2763 cache clearing fix
Eileen McNaughton [Tue, 17 Aug 2021 05:43:25 +0000 (17:43 +1200)]
[Ref] remove unused variable
Seamus Lee [Tue, 17 Aug 2021 06:49:42 +0000 (16:49 +1000)]
Merge pull request #21163 from seamuslee001/5.41
Add release-notes/5.40.2.md release-notes/5.40.1.md
Tim Otten [Tue, 17 Aug 2021 06:23:00 +0000 (23:23 -0700)]
Add release-notes/5.40.2.md release-notes/5.40.1.md
Eileen McNaughton [Tue, 17 Aug 2021 05:43:25 +0000 (17:43 +1200)]
[Ref] remove unused variable
Eileen McNaughton [Mon, 16 Aug 2021 20:15:16 +0000 (08:15 +1200)]
Merge pull request #21158 from colemanw/fileApi
APIv4 - Add File entity
Eileen McNaughton [Mon, 16 Aug 2021 19:42:17 +0000 (07:42 +1200)]
Merge pull request #21155 from demeritcowboy/regiontest
[NFC] Update CRM_Core_RegionTest so it doesn't need the error-suppression operator
Coleman Watts [Mon, 16 Aug 2021 18:58:24 +0000 (14:58 -0400)]
SearchKit - Refactor refresh code into traits
Coleman Watts [Mon, 16 Aug 2021 15:43:51 +0000 (11:43 -0400)]
SearchKit - Refactor search task code to share a trait
Coleman Watts [Mon, 16 Aug 2021 16:33:50 +0000 (12:33 -0400)]
APIv4 - Add File entity
demeritcowboy [Mon, 16 Aug 2021 13:41:34 +0000 (09:41 -0400)]
avoid error-suppression operator
Eileen McNaughton [Mon, 16 Aug 2021 09:16:17 +0000 (21:16 +1200)]
Merge pull request #21154 from civicrm/5.41
5.41
Eileen McNaughton [Mon, 16 Aug 2021 07:06:49 +0000 (19:06 +1200)]
Merge pull request #21151 from eileenmcnaughton/541m
Membership batch processing error
Eileen McNaughton [Mon, 16 Aug 2021 04:37:30 +0000 (16:37 +1200)]
Membership batch processing error
This fixes a fatal because of incorrect typing
Affects 5.40
Seamus Lee [Mon, 16 Aug 2021 03:38:35 +0000 (13:38 +1000)]
Merge pull request #21148 from civicrm/5.41
5.41
Eileen McNaughton [Mon, 16 Aug 2021 01:19:21 +0000 (13:19 +1200)]
Merge pull request #21143 from seamuslee001/fix_enotice_php8
[REF] Fix e-notice in APIv3 Profile Test on PHP8
Seamus Lee [Sun, 15 Aug 2021 23:57:44 +0000 (09:57 +1000)]
Merge pull request #21147 from eileenmcnaughton/541
dev/core#2758 fix task tiles
Eileen McNaughton [Sun, 15 Aug 2021 22:05:57 +0000 (10:05 +1200)]
Merge pull request #21146 from demeritcowboy/smarty-default-caserole
[NFC] Update testCaseActivityCopyTemplate to provide variable that would usually be present
Eileen McNaughton [Sun, 15 Aug 2021 22:01:07 +0000 (10:01 +1200)]
dev/core#2758 fix task tiles
Seamus Lee [Sat, 14 Aug 2021 23:27:39 +0000 (09:27 +1000)]
[REF] Fix e-notice in APIv3 Profile Test on PHP8
Remove e-notice issue found by dave d
demeritcowboy [Sun, 15 Aug 2021 14:04:38 +0000 (10:04 -0400)]
missing variable in template
Eileen McNaughton [Sat, 14 Aug 2021 21:57:29 +0000 (09:57 +1200)]
Merge pull request #21140 from demeritcowboy/smarty-long
Use convenience function for one-off token evaluations to avoid too-long filenames and possible privacy issues
demeritcowboy [Sat, 14 Aug 2021 15:05:08 +0000 (11:05 -0400)]
avoid fails for file too long, and possible privacy issues
demeritcowboy [Sat, 14 Aug 2021 14:31:29 +0000 (10:31 -0400)]
Merge pull request #21075 from eileenmcnaughton/email3
[Ref] Move id fetching to the classes
Eileen McNaughton [Sat, 14 Aug 2021 04:01:44 +0000 (16:01 +1200)]
Merge pull request #20168 from larssandergreen/add-recurring-filter-to-contribution-summary-report
dev/search#63 Add recurring contributions to contribution reports
Seamus Lee [Sat, 14 Aug 2021 03:17:28 +0000 (13:17 +1000)]
Merge pull request #21138 from civicrm/5.41
5.41
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
Tim Otten [Sat, 14 Aug 2021 02:02:11 +0000 (19:02 -0700)]
Merge pull request #21114 from totten/master-refl-finders
(REF) ReflectionUtils - Add findStandardProperties() and findMethodHelpers()
Eileen McNaughton [Sat, 14 Aug 2021 00:33:01 +0000 (12:33 +1200)]
Merge pull request #21129 from civicrm/5.41
5.41
Andie Hunt [Fri, 13 Aug 2021 22:15:31 +0000 (18:15 -0400)]
5.41.0 release notes: added boilerplate
Andie Hunt [Fri, 13 Aug 2021 22:12:51 +0000 (18:12 -0400)]
5.41.0 release notes: raw from script
Eileen McNaughton [Fri, 13 Aug 2021 22:03:41 +0000 (10:03 +1200)]
Merge pull request #20907 from demeritcowboy/report-entitylabel
dev/core#2691 - On logging detail civireport show words instead of numbers (part 2)
Eileen McNaughton [Fri, 13 Aug 2021 22:00:12 +0000 (10:00 +1200)]
Merge pull request #21125 from colemanw/refCommentFix
NFC - Fix docblock in CRM_Core_Transaction
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
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
Eileen McNaughton [Tue, 10 Aug 2021 01:46:39 +0000 (13:46 +1200)]
[Ref] Move id fetching to the classes
Eileen McNaughton [Fri, 13 Aug 2021 20:48:20 +0000 (08:48 +1200)]
Merge pull request #21127 from civicrm/5.41
5.41 to master
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
Coleman Watts [Fri, 13 Aug 2021 19:59:49 +0000 (15:59 -0400)]
NFC - Fix docblock in CRM_Core_Transaction
Jon Goldberg [Fri, 13 Aug 2021 17:50:54 +0000 (13:50 -0400)]
fix crmValidate() not loading on event registration pages
demeritcowboy [Fri, 13 Aug 2021 13:46:34 +0000 (09:46 -0400)]
Merge pull request #21116 from eileenmcnaughton/nfc
[NFC] {Test} Minor cleanup
demeritcowboy [Fri, 13 Aug 2021 12:37:25 +0000 (08:37 -0400)]
Merge pull request #21103 from mlutfy/ui38
dev/user-interface#38 Contact Edit: Only display signatures if contact has a CMS account
Eileen McNaughton [Fri, 13 Aug 2021 06:32:16 +0000 (18:32 +1200)]
Update MembershipType.duration and MembershipStatus.name to be required
This updates these fields to be required as that appears to be the case.
We could alternatively go with a default of 'month' for
MembershipType.duration_unit
Eileen McNaughton [Fri, 13 Aug 2021 09:31:24 +0000 (21:31 +1200)]
Merge pull request #21121 from totten/master-rendertpl-rem
Replace deprecated calls to `renderMessageTemplate()`
Tim Otten [Fri, 13 Aug 2021 06:58:25 +0000 (23:58 -0700)]
CRM_Core_BAO_MessageTemplate - Remove `renderMessageTemplate()`
Tim Otten [Fri, 13 Aug 2021 06:14:01 +0000 (23:14 -0700)]
CRM_Core_BAO_MessageTemplateTest - Convert `renderMessageTemplate()` to `renderTemplate()`
Tim Otten [Fri, 13 Aug 2021 06:12:39 +0000 (23:12 -0700)]
CRM_SMS_Form_Upload - Convert `renderMessageTemplate()` to `CRM_Core_TokenSmarty::render()`
Tim Otten [Fri, 13 Aug 2021 06:10:39 +0000 (23:10 -0700)]
CRM_Contribute_Form_Task_PDFLetter - Convert `renderMessageTemplate()` to `CRM_Core_TokenSmarty::render()`
Eileen McNaughton [Fri, 13 Aug 2021 06:21:15 +0000 (18:21 +1200)]
Merge pull request #21115 from totten/master-rendertpl
MessageTemplate - Add renderTemplate(). Deprecate renderMessageTemplate().
Eileen McNaughton [Fri, 13 Aug 2021 06:03:03 +0000 (18:03 +1200)]
Merge pull request #21117 from civicrm/5.41
5.41 to master
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
Eileen McNaughton [Fri, 13 Aug 2021 05:00:00 +0000 (17:00 +1200)]
[NFC] {Test} Minor cleanup
Tim Otten [Mon, 12 Jul 2021 04:24:38 +0000 (21:24 -0700)]
MessageTemplate - Deprecate renderMessageTemplate(). Prefer renderTemplate() and TokenSmarty::render(). Add tests
Seamus Lee [Fri, 13 Aug 2021 01:27:48 +0000 (11:27 +1000)]
Merge pull request #21113 from seamuslee001/master
5.41
Seamus Lee [Fri, 13 Aug 2021 01:26:44 +0000 (11:26 +1000)]
Merge in 5.41
Tim Otten [Tue, 6 Jul 2021 01:54:04 +0000 (18:54 -0700)]
(REF) ReflectionUtils - Add findStandardProperties() and findMethodHelpers()
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
Seamus Lee [Fri, 13 Aug 2021 01:22:11 +0000 (11:22 +1000)]
Merge pull request #21111 from civicrm/5.41
5.41
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
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
Seamus Lee [Thu, 12 Aug 2021 22:21:06 +0000 (08:21 +1000)]
[REF] Upgrade CKEditor to 4.16.2
Seamus Lee [Thu, 12 Aug 2021 22:12:29 +0000 (08:12 +1000)]
Merge pull request #21046 from eileenmcnaughton/camp
dev/core#2747 Reconcile remaining fields between scheduled reminders and legacy tokens
Jon Goldberg [Thu, 12 Aug 2021 21:55:57 +0000 (17:55 -0400)]
delocalize total amount before passing to setOverrideTotal
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.
Mathieu Lutfy [Thu, 12 Aug 2021 13:29:11 +0000 (09:29 -0400)]
dev/user-interface#38 Contact Edit: Only display email signatures for contacts that have a user/CMS account
colemanw [Thu, 12 Aug 2021 14:28:37 +0000 (10:28 -0400)]
Merge pull request #21094 from mattwire/hideextensionkeyupgrade
Replace extension key with label during install/upgrade/disable/uninstall
demeritcowboy [Thu, 12 Aug 2021 12:55:18 +0000 (08:55 -0400)]
Merge pull request #21096 from mattwire/guzzletimeout
Respect http_timeout core setting for Guzzle HTTP requests
Monish Deb [Thu, 12 Aug 2021 12:11:30 +0000 (17:41 +0530)]
Merge pull request #20936 from eileenmcnaughton/mem_order
dev/core#2717 Use Same order ->payment flow for non recurring back of…
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
Eileen McNaughton [Thu, 12 Aug 2021 04:29:46 +0000 (16:29 +1200)]
Merge pull request #21076 from eileenmcnaughton/camp_name
Token Parser - Allow tokens with multiple dots (eg {contribution.contribution_recur_id.amount})
Eileen McNaughton [Thu, 12 Aug 2021 02:04:18 +0000 (14:04 +1200)]
Merge pull request #20991 from eileenmcnaughton/invoice
dev/core#2719 [REF] Remove a couple more (tested) references to legacy contribution_invoice_settings
Tim Otten [Thu, 12 Aug 2021 00:53:11 +0000 (17:53 -0700)]
TokenProcessorTest - Ensure that tokens with dots and colons are processable
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
Tim Otten [Thu, 12 Aug 2021 00:24:45 +0000 (17:24 -0700)]
Merge pull request #21080 from twomice/2673_subject_token_empty_body
(dev/core#2673) Email Tokens - Custom tokens in `subject` block similar tokens in `body`
Eileen McNaughton [Thu, 12 Aug 2021 00:06:05 +0000 (12:06 +1200)]
Fix one test & remove 2 that covered the error message
Eileen McNaughton [Wed, 11 Aug 2021 20:19:22 +0000 (08:19 +1200)]
Simplify calls to is_email_pdf
Per reviewer feedback - we don't need to check more than just the one setting. The
UI (for better or worse) ties the 2 together so under normal operation
they will be set together but we don't need to check that
Eileen McNaughton [Mon, 2 Aug 2021 00:33:29 +0000 (12:33 +1200)]
dev/core#2719 [REF] Remove a couple more (tested) references to legacy contribution_invoice_settings
Eileen McNaughton [Wed, 11 Aug 2021 23:04:09 +0000 (11:04 +1200)]
Merge pull request #21095 from colemanw/searchDisplayFix
[REF] SearchKit - Use non-deprecated join syntax when loading standalone displays
Eileen McNaughton [Wed, 11 Aug 2021 22:28:50 +0000 (10:28 +1200)]
dev/core#2743 fix api v3 to not unnecessarily load options
Eileen McNaughton [Wed, 11 Aug 2021 22:20:54 +0000 (10:20 +1200)]
Merge pull request #21098 from totten/master-action-batch-nfc
(NFC) MailingQueryEvent - Add more docblocks about query-writing and `tokenContext_*`
Matthew Wire [Wed, 11 Aug 2021 21:16:18 +0000 (22:16 +0100)]
tpl notice fixes
Matthew Wire [Wed, 11 Aug 2021 14:26:20 +0000 (15:26 +0100)]
Replace extension key with label during install/upgrade/disable/uninstall
Tim Otten [Wed, 11 Aug 2021 20:46:38 +0000 (13:46 -0700)]
(NFC) MailingQueryEvent - Add more docblocks about query-writing and `tokenContext_*`
Matthew Wire [Wed, 11 Aug 2021 20:44:32 +0000 (21:44 +0100)]
Merge pull request #21088 from totten/master-action-batch
ActionSchedule - Pass real batches into TokenProcessor. Simplify CRM_Activity_Tokens.
Matthew Wire [Wed, 11 Aug 2021 20:40:28 +0000 (21:40 +0100)]
Merge pull request #21091 from totten/master-schedui-acttok
Scheduled Reminders UI - Show more activity tokens in admin GUI
colemanw [Wed, 11 Aug 2021 20:34:21 +0000 (16:34 -0400)]
Merge pull request #21089 from colemanw/afformCleanup
[REF] Afform - Code cleanup in LoadAdminData API action
Matthew Wire [Wed, 11 Aug 2021 16:20:14 +0000 (17:20 +0100)]
Respect http_timeout core setting for Guzzle HTTP requests