Eileen McNaughton [Tue, 4 May 2021 22:24:20 +0000 (10:24 +1200)]
Merge pull request #20215 from colemanw/campaignRef
Set html type of campaign fields
Coleman Watts [Tue, 4 May 2021 13:25:49 +0000 (09:25 -0400)]
Set html type of campaign fields
Afform needs to know that these are fields of type EntityRef.
Otherwise, this metadata is currently unused.
Eileen McNaughton [Mon, 3 May 2021 21:33:22 +0000 (09:33 +1200)]
Merge pull request #20063 from christianwach/lab-wp-93
Fix PayPal IPN URL and WordPress URLs when Permalinks are set to "Plain"
Eileen McNaughton [Mon, 3 May 2021 19:44:11 +0000 (07:44 +1200)]
Merge pull request #20123 from jaapjansma/dev_2505
Fixed dev/core#2505 fix formatting of numbers in civireport
demeritcowboy [Mon, 3 May 2021 17:29:33 +0000 (13:29 -0400)]
Merge pull request #20188 from eileenmcnaughton/contto
dev/core#2568 Enotice fix + test
Jaap Jansma [Thu, 22 Apr 2021 13:05:39 +0000 (15:05 +0200)]
Fixed dev/core#2505
Fixed failing test
Fixed issue with wrong parameters in comment section
Improved settings of NumberFormatter
removed unused function
Seamus Lee [Mon, 3 May 2021 09:09:33 +0000 (19:09 +1000)]
Merge pull request #20156 from colemanw/searchKitExcludeSerializedFromAutoJoins
SearchKit - Exclude serialized fields from implicit join selection
Eileen McNaughton [Mon, 3 May 2021 08:29:33 +0000 (20:29 +1200)]
Merge pull request #20213 from civicrm/5.37
5.37 to master
Eileen McNaughton [Mon, 3 May 2021 08:29:04 +0000 (20:29 +1200)]
Merge pull request #20212 from jitendrapurohit/dev-2583-537
dev/core#2583 - Fix fatal error on membership renewal
Jitendra Purohit [Mon, 3 May 2021 06:33:20 +0000 (12:03 +0530)]
fix fatal error on membership renewal
Seamus Lee [Mon, 3 May 2021 06:32:25 +0000 (16:32 +1000)]
Merge pull request #20153 from eileenmcnaughton/mem
[REF] Cleanup interaction with membership & membership id
Eileen McNaughton [Mon, 3 May 2021 06:26:24 +0000 (18:26 +1200)]
Merge pull request #20203 from seamuslee001/dev_core_2582
dev/core#2582 Fix PCP and Pledge template urls in message templates t…
Seamus Lee [Mon, 3 May 2021 03:23:10 +0000 (13:23 +1000)]
Merge pull request #20207 from seamuslee001/5372
5.37
Seamus Lee [Mon, 3 May 2021 03:21:38 +0000 (13:21 +1000)]
Merge remote-tracking branch 'origin/5.37' into 5372
Seamus Lee [Sun, 2 May 2021 21:49:00 +0000 (07:49 +1000)]
dev/core#2582 Fix PCP and Pledge template urls in message templates to go to front end site rather than backend
Seamus Lee [Mon, 3 May 2021 01:49:27 +0000 (11:49 +1000)]
Merge pull request #20186 from colemanw/searchDisplayPerms
SearchKit - Pass-thu permission checks from SearchDisplay::run to api.get
Coleman Watts [Thu, 29 Apr 2021 00:49:06 +0000 (20:49 -0400)]
SearchKit - Pass-thu permission checks from SearchDisplay::run to underlying API
The SearchDisplay::run api action essentially wraps api.get for the search entity,
so it makes sense to allow open access to the run api but require permission checks
on the delegated api call.
Seamus Lee [Sun, 2 May 2021 21:34:50 +0000 (07:34 +1000)]
Merge pull request #20195 from eileenmcnaughton/537
dev/core#2577 Fix regression - payment edit to new type failing
Eileen McNaughton [Sun, 2 May 2021 21:31:26 +0000 (09:31 +1200)]
Merge pull request #20201 from civicrm/5.37
5.37 to master
Eileen McNaughton [Sun, 2 May 2021 21:30:28 +0000 (09:30 +1200)]
Merge pull request #20198 from alifrumin/rn5.37
[NFC] Release Notes 5.37
colemanw [Sun, 2 May 2021 15:07:25 +0000 (11:07 -0400)]
Merge pull request #20200 from jmcclelland/access-ajax-api
fix capitalization to allow proper access to 'access AJAX API' perm.
Jamie McClelland [Sat, 1 May 2021 16:08:03 +0000 (12:08 -0400)]
fix capitalization to allow proper access to 'access AJAX API' perm.
Maybe this is platform dependent? On my dev instance the access AJAX API
permission to the path /civicrm/ajax/api4/X/X is always denied for anon
users because anon users are granted "access AJAX API" yet the check is
done against "access Ajax API".
This only really matters in CRM/Api4/Permission.php but to avoid any
confusion I'm changing it everywhere the string appears.
Alice Frumin [Mon, 19 Apr 2021 22:55:57 +0000 (18:55 -0400)]
5.37 release notes - first pass
demeritcowboy [Fri, 30 Apr 2021 15:20:21 +0000 (11:20 -0400)]
Merge pull request #20180 from mattwire/recaptchacontribalways
Make reCAPTCHA not conditional on paymentprocessor on contribution page
colemanw [Fri, 30 Apr 2021 14:03:17 +0000 (10:03 -0400)]
Merge pull request #20194 from eileenmcnaughton/tok
[REF] Minor tidy up
Matthew Wire [Wed, 28 Apr 2021 11:04:26 +0000 (12:04 +0100)]
If reCAPTCHA is enabled on contribution page always display (even if we don't have a paymentprocessor)
demeritcowboy [Fri, 30 Apr 2021 13:04:05 +0000 (09:04 -0400)]
Merge pull request #20187 from eileenmcnaughton/dom
Make send letter function available to searchkit, individual contributions
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
eileen [Thu, 29 Apr 2021 22:59:21 +0000 (10:59 +1200)]
dev/core#2577 Fix regression - payment edit to new type failing
Kartik Kathuria [Thu, 29 Apr 2021 22:14:21 +0000 (03:44 +0530)]
Changes made in ref to master
eileen [Thu, 29 Apr 2021 06:14:52 +0000 (18:14 +1200)]
[REF] Minor tidy up
This just removes some unused params & gets rid of the & before the function (it isn't called
in any weird ways and we have removed these before)
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.
eileen [Thu, 29 Apr 2021 03:44:01 +0000 (15:44 +1200)]
dev/core#2568 Enotice fix + test
Same as https://github.com/civicrm/civicrm-core/pull/20178 but with a test
(and a couple of changes to support that)
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
eileen [Thu, 29 Apr 2021 03:06:27 +0000 (15:06 +1200)]
Make send letter function available to searchkit, individual contributions
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 [Mon, 26 Apr 2021 23:52:55 +0000 (11:52 +1200)]
[REF] Cleanup interaction with membership & membership id
This is intended to simplify https://github.com/civicrm/civicrm-core/pull/20077
by switching to using functions to retrieve membership (as an array) and membershipID
rather than passing around variables
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
Coleman Watts [Tue, 27 Apr 2021 03:00:23 +0000 (23:00 -0400)]
SearchKit - Exclude serialized fields from implicit join selection
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