Matthew Wire [Fri, 30 Apr 2021 10:20:14 +0000 (11:20 +0100)]
Merge pull request #20193 from kartik1000/5.37
dev/core#2571: Removed Forced Recaptcha function as it called only once
Eileen McNaughton [Fri, 30 Apr 2021 00:37:12 +0000 (12:37 +1200)]
Merge pull request #20192 from colemanw/deprecateAclCheck
Add deprected warning to apparently unused functions
Kartik Kathuria [Thu, 29 Apr 2021 22:14:21 +0000 (03:44 +0530)]
Changes made in ref to master
Coleman Watts [Thu, 29 Apr 2021 15:59:46 +0000 (11:59 -0400)]
Add deprected warning to apparently unused functions
It looks like one check function is only ever called by the other,
and the other isn't called from anywhere.
What these functions are supposed to do is unclear.
The code comment appears to be wrong; the variable $str
is not a permission string but is inserted into a query
as civicrm_acl.object_table.
Seamus Lee [Thu, 29 Apr 2021 06:06:20 +0000 (16:06 +1000)]
Merge pull request #20138 from eileenmcnaughton/load
[REF] Remove redundant code
Seamus Lee [Thu, 29 Apr 2021 05:37:04 +0000 (15:37 +1000)]
Merge pull request #20185 from civicrm/5.37
5.37
Seamus Lee [Thu, 29 Apr 2021 00:53:40 +0000 (10:53 +1000)]
Merge pull request #20174 from demeritcowboy/api-caseactivity-perm
dev/core#2573 - Set appropriate default permissions to use api4 CaseActivity
Seamus Lee [Thu, 29 Apr 2021 00:50:29 +0000 (10:50 +1000)]
Merge pull request #20181 from colemanw/anotherOneBitesTheDust
APIv4 - Remove unnecessary custom getActions class
Eileen McNaughton [Wed, 28 Apr 2021 22:37:05 +0000 (10:37 +1200)]
Merge pull request #20183 from ufundo/patch-1
add me
ufundo [Wed, 28 Apr 2021 20:40:28 +0000 (21:40 +0100)]
add me
for first merged PR as requested by @demeritcowboy :)
Tim Otten [Wed, 28 Apr 2021 20:37:31 +0000 (13:37 -0700)]
Merge pull request #20162 from lemniscus/oauth-client
oauth-client - Add test for existing Auth Code flow behavior
Eileen McNaughton [Wed, 28 Apr 2021 20:32:08 +0000 (08:32 +1200)]
Merge pull request #20182 from mattwire/sendconfirmationreturn
Contribution.sendconfirmation API3 function should return
Matthew Wire [Wed, 28 Apr 2021 14:04:49 +0000 (15:04 +0100)]
API functions should return otherwise you get 'cannot interpret return values from function'
Coleman Watts [Wed, 28 Apr 2021 13:38:10 +0000 (09:38 -0400)]
APIv4 - Remove unnecessary custom getActions class
The class override was not needed; the generic function works fine with custom entities.
colemanw [Wed, 28 Apr 2021 13:21:12 +0000 (09:21 -0400)]
Merge pull request #20147 from seamuslee001/afform_redirect_html
dev/core#2569 Add in Redirect field into the html afform editor
Seamus Lee [Wed, 28 Apr 2021 09:11:54 +0000 (19:11 +1000)]
Merge pull request #20175 from eileenmcnaughton/nfc
[REF] Minor code cleanup
Seamus Lee [Wed, 28 Apr 2021 08:01:03 +0000 (18:01 +1000)]
Merge pull request #20172 from eileenmcnaughton/pdf
[REF] Complete decommissioning of CRM/Contribute/Form/Task/PDFLetterCommon.php
Eileen McNaughton [Wed, 28 Apr 2021 04:26:53 +0000 (16:26 +1200)]
Merge pull request #20070 from larssandergreen/Clarify-event-scheduled-reminder-options
dev/core#2541 Clarify scheduled reminder options: Event Start Date -> Event Start, etc
Eileen McNaughton [Wed, 28 Apr 2021 04:21:10 +0000 (16:21 +1200)]
Merge pull request #20092 from larssandergreen/fix-is-recur-label
dev/core#1452 Put text inside label tags for recurring contribution selection
Eileen McNaughton [Wed, 28 Apr 2021 03:57:42 +0000 (15:57 +1200)]
Merge pull request #20176 from civicrm/5.37
5.37 to master
Eileen McNaughton [Wed, 28 Apr 2021 03:41:56 +0000 (15:41 +1200)]
Merge pull request #20158 from jitendrapurohit/pricefieldfix
Fix priceset widget on Membership tab
eileen [Wed, 28 Apr 2021 03:36:47 +0000 (15:36 +1200)]
[REF] Minor code cleanup
Minor code cleanups - use strict, declare exceptions, use use statement
Seamus Lee [Wed, 28 Apr 2021 02:33:08 +0000 (12:33 +1000)]
Merge pull request #20173 from colemanw/noCustomReplace
APIv4 - Remove unnecessary class override (handled by generic)
Eileen McNaughton [Wed, 28 Apr 2021 01:18:04 +0000 (13:18 +1200)]
Merge pull request #20161 from eileenmcnaughton/single
Remove apparent copy & paste from Contribution pdf letter function
demeritcowboy [Wed, 28 Apr 2021 01:16:36 +0000 (21:16 -0400)]
without this you need administer CiviCRM permission to use api4 CaseActivity
eileen [Tue, 27 Apr 2021 23:23:29 +0000 (11:23 +1200)]
[REF] Complete decommissioning on CRM/Contribute/Form/Task/PDFLetterCommon.php
This removes the last function fromCRM/Contribute/Form/Task/PDFLetterCommon.php
The function was calling a protected function on the parent which had to be unravelled.
I used the method we used in
https://github.com/civicrm/civicrm-core/blob/
5e67eb7ff3f1f202d5112d15ad5c6a5f23f35795/CRM/SMS/Form/Upload.php#L341
to replace the code with the part that we have tested as being done in via render - ie replacing
hook, contact, domain tokens & smarty parsing.
However, there are quite a few tests on this code & one checked that we don't over-call
the token hook. I added some caching for the results of this hook so we can start to
eliminate these but I also allowed the calls to increment by 1 because it is not 1 per row
I made the results of this hook optional to replaceHookTokens & in general I think that
is the only place it needs to be called - perhaps once it used to pass more parameters &
the results were dynamic but now they really aren't
Coleman Watts [Wed, 28 Apr 2021 00:49:38 +0000 (20:49 -0400)]
APIv4 - Remove unnecessary class override (handled by generic)
eileen [Tue, 27 Apr 2021 06:52:29 +0000 (18:52 +1200)]
Remove apparent copy & paste from Contribution pdf letter function
I have done a bit of digging and I can't see any way these url parameters could be passed in
to this form. I also can't think of any reason, other than our old friend copy
& paste, for us to be retrieving activity or case in the url
I kept the isSingle logic but redirected it to focus on a single contribution which
is something we do want
Seamus Lee [Tue, 27 Apr 2021 22:57:20 +0000 (08:57 +1000)]
Merge pull request #20171 from eileenmcnaughton/actsh
[REF] Add strict types to Utils_Mail::Send
Eileen McNaughton [Tue, 27 Apr 2021 22:36:59 +0000 (10:36 +1200)]
Merge pull request #20166 from mattwire/recaptchacontributionbase
Simplify reCAPTCHA on ContributionBase form
Eileen McNaughton [Tue, 27 Apr 2021 22:31:37 +0000 (10:31 +1200)]
Merge pull request #20167 from mattwire/recaptchaclean
REF Cleanup ReCAPTCHA code
eileen [Tue, 27 Apr 2021 21:25:17 +0000 (09:25 +1200)]
[REF] Add strict types to Utils_Mail::Send
The function only returns a bool - this makes that explicit / forced and also removes handling for it
to return a PEAR_Error in one place that calls it. A couple of unused params are removed
Eileen McNaughton [Tue, 27 Apr 2021 20:39:28 +0000 (08:39 +1200)]
Merge pull request #20160 from eileenmcnaughton/pdf
[REF] Post move cleanup - switch from $form to $this
Eileen McNaughton [Tue, 27 Apr 2021 20:18:05 +0000 (08:18 +1200)]
Merge pull request #20169 from ixiam/dev_issue#2574
Fixes issue with state/province & country not translating values
Eileen McNaughton [Tue, 27 Apr 2021 19:57:20 +0000 (07:57 +1200)]
Merge pull request #20164 from mattwire/recaptcharegistrationbuildcustom
REF reCAPTCHA Simplify buildCustom function on Registration form
eileen [Tue, 27 Apr 2021 06:23:08 +0000 (18:23 +1200)]
[REF] Post move cleanup - switch from form to this
Matthew Wire [Mon, 26 Apr 2021 22:30:21 +0000 (23:30 +0100)]
Cleanup ReCAPTCHA code
Vangelis Pantazis [Tue, 27 Apr 2021 18:09:10 +0000 (19:09 +0100)]
Fixes issue with state/province & country not translating values
demeritcowboy [Tue, 27 Apr 2021 15:23:14 +0000 (11:23 -0400)]
Merge pull request #20165 from mattwire/recaptchasignaturebuildcustom
REF reCAPTCHA Simplify buildCustom function on Signature form
Matthew Wire [Mon, 26 Apr 2021 22:29:47 +0000 (23:29 +0100)]
Remove warning about reCaptcha missing key from contribution page
Matthew Wire [Mon, 26 Apr 2021 21:53:23 +0000 (22:53 +0100)]
Use CRM_Utils_ReCAPTCHA::enableCaptchaOnForm directly in ContributionBase
Matthew Wire [Mon, 26 Apr 2021 21:52:22 +0000 (22:52 +0100)]
viewOnly parameter is not used in buildCustom for Signature
Matthew Wire [Mon, 26 Apr 2021 21:52:43 +0000 (22:52 +0100)]
viewOnly parameter is not used in buildCustom for Registration
Matthew Wire [Tue, 27 Apr 2021 09:49:36 +0000 (10:49 +0100)]
Simplify buildCustom function
Matthew Wire [Tue, 27 Apr 2021 09:46:26 +0000 (10:46 +0100)]
Fix typos in comments and remove unused lines
Seamus Lee [Tue, 27 Apr 2021 09:08:27 +0000 (19:08 +1000)]
Merge pull request #20159 from eileenmcnaughton/actsh
[REF] Minor tidy up - use writeRecord
Noah Miller [Tue, 27 Apr 2021 08:33:35 +0000 (01:33 -0700)]
(NFC) making the whitespace how Jenkins wants it
Noah Miller [Tue, 27 Apr 2021 08:25:03 +0000 (01:25 -0700)]
(NFC) put code into Drupal style
Noah Miller [Tue, 27 Apr 2021 07:04:55 +0000 (00:04 -0700)]
Add test for existing Auth Code flow behavior
Eileen McNaughton [Tue, 27 Apr 2021 06:59:54 +0000 (18:59 +1200)]
Merge pull request #20157 from lemniscus/oauth-client
Fix a copy-and-paste error in the field definitions for OAuthSysToken
Eileen McNaughton [Tue, 27 Apr 2021 06:09:10 +0000 (18:09 +1200)]
Merge pull request #20155 from eileenmcnaughton/pdf
[REF] Move more functions back to pdfLetter class
eileen [Tue, 27 Apr 2021 05:47:35 +0000 (17:47 +1200)]
[REF] Minor tidy up - use writeRecord
This tidy up gets rid of 2 unused variables & an obsolete pass-by-ref and switches to a
preferred function call. Note that as a by-product hooks will now be called
Noah Miller [Tue, 27 Apr 2021 05:19:20 +0000 (22:19 -0700)]
Fix a copy-and-paste error in the field definitions for OAuthSysToken
Jitendra Purohit [Tue, 27 Apr 2021 05:14:55 +0000 (10:44 +0530)]
Fix priceset widget on Membership tab
eileen [Tue, 27 Apr 2021 02:41:34 +0000 (14:41 +1200)]
[REF] Move more functions bask to pdfLetter class
As with the previous moves this is
1) covered by unit tests
2) just code moving around
But note that this doesn't move whole functions but moves the
contents of postProcess & buildQuickForm back into the same functions
on the 'actual' class
colemanw [Tue, 27 Apr 2021 02:52:00 +0000 (22:52 -0400)]
Merge pull request #20134 from colemanw/searchKitLinks
Search Kit links improvements
colemanw [Tue, 27 Apr 2021 02:30:09 +0000 (22:30 -0400)]
Merge pull request #20143 from eileenmcnaughton/pdf
Move more functions to the pdfLetter class
Tim Otten [Tue, 27 Apr 2021 02:25:59 +0000 (19:25 -0700)]
Merge pull request #20154 from civicrm/5.37
5.37
Eileen McNaughton [Tue, 27 Apr 2021 01:58:52 +0000 (13:58 +1200)]
Merge pull request #20111 from seamuslee001/wordpress_security_status_check_fix
[REF] Fix Security status check urls to work on WordPress
Seamus Lee [Tue, 27 Apr 2021 00:45:40 +0000 (10:45 +1000)]
Merge pull request #20148 from seamuslee001/dev_core_2564
dev/core#2564 Fix class constants for when using phpseclib v1
Seamus Lee [Mon, 26 Apr 2021 23:40:09 +0000 (09:40 +1000)]
Merge pull request #19991 from eileenmcnaughton/order
dev/core#2493 Default to not cleaning money for order.create api
Eileen McNaughton [Mon, 26 Apr 2021 23:22:18 +0000 (11:22 +1200)]
Merge pull request #20151 from civicrm/5.37
5.37 to master
Eileen McNaughton [Mon, 26 Apr 2021 23:20:34 +0000 (11:20 +1200)]
Merge pull request #20142 from colemanw/fixMultiValueContactRefFieldDedupe
Fix hard crash when deduping if any multiValued ContactRef fields exist
Coleman Watts [Sun, 25 Apr 2021 18:58:00 +0000 (14:58 -0400)]
Fix hard crash when deduping if any multiValued ContactRef fields exist
Fixes https://lab.civicrm.org/dev/core/-/issues/2561
Tim Otten [Mon, 26 Apr 2021 21:12:29 +0000 (14:12 -0700)]
Merge pull request #20026 from totten/master-authx-details
Authx - Retain authentication outcome/metadata
Tim Otten [Mon, 26 Apr 2021 21:05:45 +0000 (14:05 -0700)]
dev/core#2564 - PhpseclibCipherSuite - Support v1 constants
colemanw [Mon, 26 Apr 2021 19:48:01 +0000 (15:48 -0400)]
Merge pull request #20137 from colemanw/fixCustomSerialize
dev/core#2506 Fix unserializing custom values during form reload
Seamus Lee [Mon, 26 Apr 2021 07:56:55 +0000 (17:56 +1000)]
dev/core#2564 Fix class constants for when using phpseclib v1
Seamus Lee [Mon, 26 Apr 2021 07:41:28 +0000 (17:41 +1000)]
Add in Redirect field into the html afform editor
eileen [Sun, 25 Apr 2021 23:24:37 +0000 (11:24 +1200)]
Move more functions to the pdfLetter function
This 'common' form isn't really common - it's silly. This PR removes all
the gotcha instances of 'self::' to make it easier to decommission this file
Note that there are no calls to the class outside core in git universe
colemanw [Sun, 25 Apr 2021 23:03:15 +0000 (19:03 -0400)]
Merge pull request #20136 from eileenmcnaughton/dom
[REF] Move functions back to class that uses it
Eileen McNaughton [Sun, 25 Apr 2021 20:30:38 +0000 (08:30 +1200)]
Merge pull request #20141 from colemanw/genericTpl
AfformGui - Specify admin tpl in entity config file & fall-back to ge…
Coleman Watts [Sun, 25 Apr 2021 17:51:51 +0000 (13:51 -0400)]
AfformGui - Specify admin tpl in entity config file & fall-back to generic
Matthew Wire [Sun, 25 Apr 2021 10:40:00 +0000 (11:40 +0100)]
Merge pull request #19986 from scardinius/core-2516
dev/core#2516 Invalidate only smart groups
Matthew Wire [Sun, 25 Apr 2021 10:22:33 +0000 (11:22 +0100)]
Merge pull request #20140 from civicrm/5.37
5.37
Matthew Wire [Sun, 25 Apr 2021 10:21:42 +0000 (11:21 +0100)]
Merge pull request #20127 from agileware/CIVICRM-1718
Set default terms = 1 in (edit) Membership form javascript
Matthew Wire [Sun, 25 Apr 2021 10:19:43 +0000 (11:19 +0100)]
Merge pull request #20118 from demeritcowboy/actionlinks-extract
[REF] dev/core#2509 - Pull activity actionLinks creation into separate function
eileen [Sun, 25 Apr 2021 05:35:29 +0000 (17:35 +1200)]
[REF] Remove redundant code
eileen [Sat, 24 Apr 2021 23:20:15 +0000 (11:20 +1200)]
[REF] Move functions back to class that uses it
Coleman Watts [Sun, 25 Apr 2021 02:58:46 +0000 (22:58 -0400)]
Fix unserializing custom values to work during form reload
Fixes https://lab.civicrm.org/dev/core/-/issues/2506
MultiValued custom ContactRef fields were losing their value
during form reload if there was a validation error.
Coleman Watts [Sat, 24 Apr 2021 22:27:11 +0000 (18:27 -0400)]
SearchKit - Improve link titles to match entity titles
Coleman Watts [Sat, 24 Apr 2021 13:49:57 +0000 (09:49 -0400)]
SearchKit - Improve UX for adding links to a search display
When adding links to a column, it will now only show relevant links to the entity in the column.
When adding a column of links/buttons, it will make all links available as before,
but by default will only show the ones relevant to the main entity.
Coleman Watts [Fri, 23 Apr 2021 18:23:20 +0000 (14:23 -0400)]
SearchKit - Fix links to implicitly joined entities
This improves link construction to propery replace tokens in explicit joins and implicit joins.
Eileen McNaughton [Sat, 24 Apr 2021 21:43:56 +0000 (09:43 +1200)]
Merge pull request #20132 from colemanw/renameSearchKit
Replace string org.civicrm.search -> org.civicrm.search_kit
Coleman Watts [Sat, 24 Apr 2021 15:30:21 +0000 (11:30 -0400)]
Replace string org.civicrm.search -> org.civicrm.search_kit
Followup to renaming the extension, this fixes strings with the old name.
colemanw [Fri, 23 Apr 2021 18:25:52 +0000 (14:25 -0400)]
Merge pull request #20130 from colemanw/searchKitLinks
APIv4 - Deprecate nonstandard syntax for implicit joins
Coleman Watts [Fri, 23 Apr 2021 14:55:45 +0000 (10:55 -0400)]
APIv4 - Deprecate nonstandard syntax for implicit joins
The APIv4 prototype used a string-manipulation hack to make implicit joins appear more friendly,
e.g. it would transform `contact_id.*` to `contact.*`.
However this made the generation of such joins less predictable,
as not all FK fields end in `_id` (notably, custom ContactRef fields do not).
This preserves the nonstandard syntax for backward-compat while favoring the new syntx
in the API Explorer.
Seamus Lee [Fri, 23 Apr 2021 07:15:14 +0000 (17:15 +1000)]
Merge pull request #20124 from colemanw/renameSearchKit
dev/core#2556 Rename extension org.civicrm.search -> org.civicrm.search_kit
Francis Whittle [Fri, 23 Apr 2021 03:17:18 +0000 (13:17 +1000)]
CIVICRM-1718: Default terms = 1 in (edit) Membership form javascript
colemanw [Thu, 22 Apr 2021 21:01:10 +0000 (17:01 -0400)]
Merge pull request #20122 from eileenmcnaughton/mgd
Enotice fix
Eileen McNaughton [Thu, 22 Apr 2021 21:00:53 +0000 (09:00 +1200)]
Merge pull request #20112 from francescbassas/patch-19
Add contact source column in some Reports
Coleman Watts [Thu, 22 Apr 2021 19:13:24 +0000 (15:13 -0400)]
Refresh extension cache after renaming search_kit extension
Coleman Watts [Thu, 22 Apr 2021 15:41:58 +0000 (11:41 -0400)]
dev/core#2556 Rename extension org.civicrm.search -> org.civicrm.search_kit
This avoids a namespace conflict in drupal 7, and is generally more descriptive
See https://lab.civicrm.org/dev/core/-/issues/2556
francescbassas [Thu, 22 Apr 2021 07:05:32 +0000 (09:05 +0200)]
Add contact source column for basic contact fields
eileen [Thu, 22 Apr 2021 06:25:53 +0000 (18:25 +1200)]
Enotice fix
Eileen McNaughton [Thu, 22 Apr 2021 02:05:43 +0000 (14:05 +1200)]
Merge pull request #20119 from civicrm/5.37
5.37
colemanw [Wed, 21 Apr 2021 23:35:22 +0000 (19:35 -0400)]
Merge pull request #20117 from colemanw/searchKitFixContactRef
SearchKit - Fix display of contact reference fields (single-value)
Seamus Lee [Wed, 21 Apr 2021 23:03:10 +0000 (09:03 +1000)]
Merge pull request #20085 from mlutfy/fixDrupal8MenuTranslation
Fix Drupal8 CiviCRM menu translation on multilingual (and ajax calls)
CiviCRM [Fri, 16 Apr 2021 23:56:41 +0000 (09:56 +1000)]
Add release notes for 5.36.1, 5.35.2
Coleman Watts [Wed, 21 Apr 2021 19:27:52 +0000 (15:27 -0400)]
SearchKit - Fix display of contact reference fields (single-value)
This fixes the display of contact reference fields, giving feature parity
with other FK fields. Both ID and Display Name are shown as available columns.
This does not address the more difficult question of how to join
multi-valued contact reference fields with contact display names.