civicrm-core.git
3 years agoMerge pull request #20820 from eileenmcnaughton/tpl
Eileen McNaughton [Fri, 16 Jul 2021 05:23:18 +0000 (17:23 +1200)]
Merge pull request #20820 from eileenmcnaughton/tpl

dev/core#2684 Fix filters tpl in civi reports to permit more than one  table in a grouping

3 years agoMerge pull request #20829 from eileenmcnaughton/order
Monish Deb [Fri, 16 Jul 2021 02:52:51 +0000 (08:22 +0530)]
Merge pull request #20829 from eileenmcnaughton/order

[REF] Further order api cleanup

3 years agoMerge pull request #20863 from eileenmcnaughton/api4
colemanw [Fri, 16 Jul 2021 01:20:53 +0000 (21:20 -0400)]
Merge pull request #20863 from eileenmcnaughton/api4

Fix v4 api to do custom field delete in tearDown

3 years agoFix v4 api to do custom field delete in tearDown
Eileen McNaughton [Thu, 15 Jul 2021 22:44:34 +0000 (10:44 +1200)]
Fix v4 api to do custom field delete in tearDown

This existing efforts are wrong because
1) the delete has to go in the tearDown not the clean up
2) it is rigid about the custom group table name - which
will get us into problems as the name can be set and we
should be ensuring that it can in our tests

3 years agoMerge pull request #20578 from eileenmcnaughton/admin_data
demeritcowboy [Thu, 15 Jul 2021 21:10:18 +0000 (17:10 -0400)]
Merge pull request #20578 from eileenmcnaughton/admin_data

Give administer CiviCRM data access to administer custom groups

3 years agodev/core#2684 Fix filters tpl in civi reports to permit more than one table in a...
Eileen McNaughton [Fri, 9 Jul 2021 01:46:51 +0000 (13:46 +1200)]
dev/core#2684 Fix filters tpl in civi reports to permit more than one table in a grouping

3 years agoMerge pull request #20860 from civicrm/5.40
Eileen McNaughton [Thu, 15 Jul 2021 20:57:34 +0000 (08:57 +1200)]
Merge pull request #20860 from civicrm/5.40

5.40 to master

3 years agoMerge pull request #20859 from agh1/5.40.0-releasenotes-initial
Eileen McNaughton [Thu, 15 Jul 2021 20:57:05 +0000 (08:57 +1200)]
Merge pull request #20859 from agh1/5.40.0-releasenotes-initial

5.40.0 release notes initial run

3 years ago5.40.0 release notes: added boilerplate
Andrew Hunt [Thu, 15 Jul 2021 19:29:30 +0000 (15:29 -0400)]
5.40.0 release notes: added boilerplate

3 years ago5.40.0 release notes: raw from script
Andrew Hunt [Thu, 15 Jul 2021 19:26:09 +0000 (15:26 -0400)]
5.40.0 release notes: raw from script

3 years agoMerge pull request #20840 from colemanw/membershipTypeAutoRenewFix
Eileen McNaughton [Thu, 15 Jul 2021 01:32:10 +0000 (13:32 +1200)]
Merge pull request #20840 from colemanw/membershipTypeAutoRenewFix

APIv4 - Fix output of membershipType auto_renew field

3 years agoMerge pull request #20852 from eileenmcnaughton/paypal
Eileen McNaughton [Thu, 15 Jul 2021 01:14:48 +0000 (13:14 +1200)]
Merge pull request #20852 from eileenmcnaughton/paypal

[REF] [towards dev/core#2693] Use getter rather than passing variable

3 years agoMerge pull request #20849 from civicrm/5.40
Seamus Lee [Thu, 15 Jul 2021 00:51:14 +0000 (10:51 +1000)]
Merge pull request #20849 from civicrm/5.40

5.40

3 years agoMerge pull request #20847 from eileenmcnaughton/ref
Eileen McNaughton [Thu, 15 Jul 2021 00:24:33 +0000 (12:24 +1200)]
Merge pull request #20847 from eileenmcnaughton/ref

Minor simplification - use casting

3 years agoMerge pull request #20718 from eileenmcnaughton/ipn
colemanw [Thu, 15 Jul 2021 00:18:27 +0000 (20:18 -0400)]
Merge pull request #20718 from eileenmcnaughton/ipn

[REF] Minor auth.net ipn simplification

3 years agoMerge pull request #20844 from demeritcowboy/report-rectype
Eileen McNaughton [Thu, 15 Jul 2021 00:07:28 +0000 (12:07 +1200)]
Merge pull request #20844 from demeritcowboy/report-rectype

dev/core#2691 - On logging detail civireport show words instead of numbers

3 years ago[REF] Use getter rather than passing variable
Eileen McNaughton [Wed, 14 Jul 2021 23:47:43 +0000 (11:47 +1200)]
[REF] Use getter rather than passing variable

txnType is a required parameter for recurring & unused for single. This switches to retrieving
it as needed rather than passing it around. It removes one check for whether it is
set because the abort will exit if not

3 years agoMerge pull request #20846 from colemanw/fixCkEditorExtension
Seamus Lee [Wed, 14 Jul 2021 22:41:09 +0000 (08:41 +1000)]
Merge pull request #20846 from colemanw/fixCkEditorExtension

CKEditor - Fix .tpl insertion on every form

3 years agoMinor simplification
Eileen McNaughton [Wed, 14 Jul 2021 22:30:15 +0000 (10:30 +1200)]
Minor simplification

3 years agoMerge pull request #20843 from demeritcowboy/smartyreptable
Eileen McNaughton [Wed, 14 Jul 2021 20:12:36 +0000 (08:12 +1200)]
Merge pull request #20843 from demeritcowboy/smartyreptable

Smarty notices - Missing type on logging civireport

3 years agoMerge pull request #20768 from eileenmcnaughton/mem_type_acl
colemanw [Wed, 14 Jul 2021 18:52:35 +0000 (14:52 -0400)]
Merge pull request #20768 from eileenmcnaughton/mem_type_acl

dev/core#2115 Switch membership type browse page to use v4api for get, thus using acls properly

3 years agoCKEditor - Fix .tpl insertion on every form
Coleman Watts [Wed, 14 Jul 2021 18:45:58 +0000 (14:45 -0400)]
CKEditor - Fix .tpl insertion on every form

3 years agoMerge pull request #20842 from in2part/add-to-contributors-file
colemanw [Wed, 14 Jul 2021 18:28:13 +0000 (14:28 -0400)]
Merge pull request #20842 from in2part/add-to-contributors-file

Add to contributors file

3 years agoMerge pull request #20821 from colemanw/afformBeta
colemanw [Wed, 14 Jul 2021 18:27:29 +0000 (14:27 -0400)]
Merge pull request #20821 from colemanw/afformBeta

Mark afform extensions as beta

3 years agoAPIv4 - Fix output of membershipType auto_renew field.
Coleman Watts [Tue, 13 Jul 2021 14:44:29 +0000 (10:44 -0400)]
APIv4 - Fix output of membershipType auto_renew field.

The field had been declared a "boolean" in the schema, which at a SQL level
is exactly the same as "tinyint" but it was resulting in incorrect API output.

3 years agoshow words instead of numbers
demeritcowboy [Wed, 14 Jul 2021 15:32:11 +0000 (11:32 -0400)]
show words instead of numbers

3 years agomissing type
demeritcowboy [Wed, 14 Jul 2021 15:06:05 +0000 (11:06 -0400)]
missing type

3 years agoAdd to contributors file
Mads Mitchell [Wed, 14 Jul 2021 09:19:21 +0000 (12:19 +0300)]
Add to contributors file

3 years agoMerge pull request #20839 from in2part/fix-typo-in-social-buttons
Seamus Lee [Wed, 14 Jul 2021 00:16:58 +0000 (10:16 +1000)]
Merge pull request #20839 from in2part/fix-typo-in-social-buttons

Fix a typo in social networking buttons

3 years agoMerge pull request #20833 from colemanw/customPerm
Eileen McNaughton [Tue, 13 Jul 2021 20:09:31 +0000 (08:09 +1200)]
Merge pull request #20833 from colemanw/customPerm

CustomGroup - change admin permission to 'administer CiviCRM data'

3 years agoMerge pull request #20834 from colemanw/fixUnusedVars
demeritcowboy [Tue, 13 Jul 2021 19:41:44 +0000 (15:41 -0400)]
Merge pull request #20834 from colemanw/fixUnusedVars

[REF] Remove unused variables

3 years agoRemove unused variables
Coleman Watts [Mon, 12 Jul 2021 18:32:44 +0000 (14:32 -0400)]
Remove unused variables

3 years agoFix a typo in social networking buttons
Mads Mitchell [Tue, 13 Jul 2021 13:08:01 +0000 (16:08 +0300)]
Fix a typo in social networking buttons

3 years agoMerge pull request #20831 from eileenmcnaughton/order_part
Monish Deb [Tue, 13 Jul 2021 05:40:07 +0000 (11:10 +0530)]
Merge pull request #20831 from eileenmcnaughton/order_part

Remove a couple of instances of 'contribution_mode' from tests

3 years agoMerge pull request #20775 from eileenmcnaughton/loadlines
Monish Deb [Tue, 13 Jul 2021 05:38:56 +0000 (11:08 +0530)]
Merge pull request #20775 from eileenmcnaughton/loadlines

Deprecate guess work in line item handling

3 years ago[REF] Further order api cleanup
Eileen McNaughton [Mon, 12 Jul 2021 02:51:10 +0000 (14:51 +1200)]
[REF] Further order api cleanup

3 years agoDeprecate guess work in processPriceSet
Eileen McNaughton [Sun, 20 Jun 2021 21:16:08 +0000 (09:16 +1200)]
Deprecate guess work in processPriceSet

Testing to see how much of this we can deprecate - line items should
be 'complete' before reaching the processing function

3 years agoMerge pull request #20784 from eileenmcnaughton/pay_fix
Monish Deb [Tue, 13 Jul 2021 03:31:18 +0000 (09:01 +0530)]
Merge pull request #20784 from eileenmcnaughton/pay_fix

Fixes getTemplateContribution to use a more reliable way to load line items

3 years agoMerge pull request #20838 from civicrm/5.40
Seamus Lee [Tue, 13 Jul 2021 01:42:41 +0000 (11:42 +1000)]
Merge pull request #20838 from civicrm/5.40

5.40

3 years agoMerge pull request #20836 from seamuslee001/dev_rc_13
Eileen McNaughton [Mon, 12 Jul 2021 23:50:25 +0000 (11:50 +1200)]
Merge pull request #20836 from seamuslee001/dev_rc_13

Resolve dev/rc#13 by permitting civi.setupui events to be dispatched …

3 years agoResolve dev/rc#13 by permitting civi.setupui events to be dispatched during install
Seamus Lee [Mon, 12 Jul 2021 21:58:25 +0000 (07:58 +1000)]
Resolve dev/rc#13 by permitting civi.setupui events to be dispatched during install

3 years agoMerge pull request #20587 from eileenmcnaughton/rr
Seamus Lee [Mon, 12 Jul 2021 21:52:57 +0000 (07:52 +1000)]
Merge pull request #20587 from eileenmcnaughton/rr

dev/core#2648 update redis class off deprecated functions

3 years agoCustomGroup - change admin permission to 'administer CiviCRM data'
Coleman Watts [Mon, 12 Jul 2021 16:02:24 +0000 (12:02 -0400)]
CustomGroup - change admin permission to 'administer CiviCRM data'

This permission is a subset of 'administer CiviCRM' and is more precise,
allowing finer-grained admin permissions.

3 years agoRemove a couple of instances of 'contribution_mdoe' from tests
Eileen McNaughton [Mon, 12 Jul 2021 10:54:56 +0000 (22:54 +1200)]
Remove a couple of instances of 'contribution_mdoe' from tests

This should not be required - we should pass in correct line items....

3 years agoSwitch membership type to use apiv4
Eileen McNaughton [Sun, 4 Jul 2021 23:36:39 +0000 (11:36 +1200)]
Switch membership type to use apiv4

url is civicrm/admin/member/membershipType?reset=1
test cover in https://github.com/civicrm/civicrm-core/pull/20761

3 years agoMerge pull request #20830 from eileenmcnaughton/ttp
Eileen McNaughton [Mon, 12 Jul 2021 10:18:13 +0000 (22:18 +1200)]
Merge pull request #20830 from eileenmcnaughton/ttp

E-notice fix

3 years agoMerge pull request #20650 from eileenmcnaughton/partorder
Eileen McNaughton [Mon, 12 Jul 2021 10:17:48 +0000 (22:17 +1200)]
Merge pull request #20650 from eileenmcnaughton/partorder

Enable check on created participant payment rows

3 years agoMerge pull request #20799 from colemanw/filterByPrefix
Seamus Lee [Mon, 12 Jul 2021 09:05:50 +0000 (19:05 +1000)]
Merge pull request #20799 from colemanw/filterByPrefix

APIv4 - Fix pseudoconstant matching reliability across joins

3 years agoMerge pull request #20828 from colemanw/tplFix
Eileen McNaughton [Mon, 12 Jul 2021 08:30:48 +0000 (20:30 +1200)]
Merge pull request #20828 from colemanw/tplFix

Fix undefined tpl vars

3 years agoE-notice fix
Eileen McNaughton [Mon, 12 Jul 2021 08:11:31 +0000 (20:11 +1200)]
E-notice fix

3 years agoEnable check on created participant payment rows
Eileen McNaughton [Fri, 18 Jun 2021 04:10:35 +0000 (16:10 +1200)]
Enable check on created participant payment rows

Extend participant check

3 years agoMerge pull request #20670 from eileenmcnaughton/reg
Monish Deb [Mon, 12 Jul 2021 05:45:48 +0000 (11:15 +0530)]
Merge pull request #20670 from eileenmcnaughton/reg

Fix transfer registration to transfer participant_payment row

3 years agoFixes getTemplateContribution to use a more reliable way to load line items
Eileen McNaughton [Tue, 6 Jul 2021 18:54:32 +0000 (06:54 +1200)]
Fixes getTemplateContribution to use a more reliable way to load line items

My efforts to add testing a 'deprecate weird stuff' have identified an odd and fragile
flow for the line items in getTemplateContribution. It calls
getLineItemsByContributionID which, as it turns out, substitues the
actual entity table with 'civicrm_contribution'.

Then this line of weird handling swoops in and saves the day.

https://github.com/civicrm/civicrm-core/pull/20775/files#diff-a16d4d7449cf5f3a0616d1d282a32f27ab6d3f7d2726d076c02ad1d4d655af41R393

This switches us to something cleaner than just loads the line items (with v4 LineItem.get) and
no weird handling

3 years agoMerge pull request #20826 from civicrm/5.40
Seamus Lee [Mon, 12 Jul 2021 02:30:53 +0000 (12:30 +1000)]
Merge pull request #20826 from civicrm/5.40

Merge 5.40 to master

3 years agoFix undefined tpl vars
Coleman Watts [Mon, 12 Jul 2021 01:17:20 +0000 (21:17 -0400)]
Fix undefined tpl vars

3 years agoMerge pull request #20827 from eileenmcnaughton/tpl3
colemanw [Mon, 12 Jul 2021 01:09:16 +0000 (21:09 -0400)]
Merge pull request #20827 from eileenmcnaughton/tpl3

tpl enotice fix

3 years agoGive administer CiviCRM data access to administer custom groups
Eileen McNaughton [Fri, 11 Jun 2021 05:52:24 +0000 (17:52 +1200)]
Give administer CiviCRM data access to administer custom groups

3 years agotpl enotice fix
Eileen McNaughton [Sun, 11 Jul 2021 23:02:05 +0000 (11:02 +1200)]
tpl enotice fix

3 years agoFix transfer registration to transfer participant_payment row
Eileen McNaughton [Sat, 19 Jun 2021 03:22:55 +0000 (15:22 +1200)]
Fix transfer registration to transfer participant_payment row

3 years agoMerge pull request #20818 from sadashivdalvi/crm-2685
colemanw [Sun, 11 Jul 2021 21:49:41 +0000 (17:49 -0400)]
Merge pull request #20818 from sadashivdalvi/crm-2685

Fix for issue 2685

3 years agoMerge pull request #20824 from colemanw/fixUpdateOperators
colemanw [Sun, 11 Jul 2021 21:47:07 +0000 (17:47 -0400)]
Merge pull request #20824 from colemanw/fixUpdateOperators

SearchKit - Fix reloading a search with an OR group in the WHERE clause

3 years agoSearchKit - Fix reloading a search with an OR group in the WHERE clause
Coleman Watts [Sun, 11 Jul 2021 19:43:20 +0000 (15:43 -0400)]
SearchKit - Fix reloading a search with an OR group in the WHERE clause

Fixes dev/report#71

3 years agoMerge pull request #20315 from mattwire/recaptchahelpers
Eileen McNaughton [Sun, 11 Jul 2021 02:34:20 +0000 (14:34 +1200)]
Merge pull request #20315 from mattwire/recaptchahelpers

(REF) dev/core#2571 - Add helper functions for reCAPTCHA extension

3 years agoMark afform extensions as beta
Coleman Watts [Fri, 9 Jul 2021 22:16:55 +0000 (18:16 -0400)]
Mark afform extensions as beta

3 years agoAdd helper functions for reCAPTCHA extension
Matthew Wire [Sun, 16 May 2021 19:07:21 +0000 (20:07 +0100)]
Add helper functions for reCAPTCHA extension

3 years agoMerge pull request #20817 from colemanw/fixBasicGetColor
colemanw [Fri, 9 Jul 2021 15:08:51 +0000 (11:08 -0400)]
Merge pull request #20817 from colemanw/fixBasicGetColor

APIv4 - Fix dumb typo breaking color lookup

3 years agoMerge pull request #20816 from colemanw/optionsPageFixes
colemanw [Fri, 9 Jul 2021 15:08:35 +0000 (11:08 -0400)]
Merge pull request #20816 from colemanw/optionsPageFixes

PHP notice fixes on options page

3 years agoMerge pull request #20399 from jaapjansma/dev_2624_2
Matthew Wire [Fri, 9 Jul 2021 10:32:21 +0000 (11:32 +0100)]
Merge pull request #20399 from jaapjansma/dev_2624_2

dev/core#2624  display line items from the template contribution at the view recurring contribution screen.

3 years agoFix for issue 2685
sadashiv [Fri, 9 Jul 2021 03:38:55 +0000 (09:08 +0530)]
Fix for issue 2685

3 years agoMerge pull request #20819 from seamuslee001/fix_apiv4_syntaxtests
Seamus Lee [Fri, 9 Jul 2021 08:19:28 +0000 (18:19 +1000)]
Merge pull request #20819 from seamuslee001/fix_apiv4_syntaxtests

[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance te…

3 years ago[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance test failures...
Seamus Lee [Fri, 9 Jul 2021 04:13:05 +0000 (14:13 +1000)]
[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance test failures on ContributionProduct and EntityBatch APIs

update version

3 years agoFix dumb typo breaking color lookup
Coleman Watts [Fri, 9 Jul 2021 00:38:51 +0000 (20:38 -0400)]
Fix dumb typo breaking color lookup

3 years agoPHP notice fixes on options page
Coleman Watts [Fri, 9 Jul 2021 00:04:19 +0000 (20:04 -0400)]
PHP notice fixes on options page

3 years agoMerge pull request #20815 from civicrm/5.40
Eileen McNaughton [Thu, 8 Jul 2021 23:00:05 +0000 (11:00 +1200)]
Merge pull request #20815 from civicrm/5.40

5.40 to master

3 years agoMerge pull request #20814 from seamuslee001/dev_core_2680
Eileen McNaughton [Thu, 8 Jul 2021 22:59:34 +0000 (10:59 +1200)]
Merge pull request #20814 from seamuslee001/dev_core_2680

dev/core#2680 Remove rows in the civicrm_contribution_product table t…

3 years agoMerge pull request #20813 from colemanw/tplFixes
Eileen McNaughton [Thu, 8 Jul 2021 22:51:53 +0000 (10:51 +1200)]
Merge pull request #20813 from colemanw/tplFixes

Fix undefined tpl variables

3 years agoMerge pull request #20505 from JMAConsulting/contribution_product_api4
Eileen McNaughton [Thu, 8 Jul 2021 22:28:46 +0000 (10:28 +1200)]
Merge pull request #20505 from JMAConsulting/contribution_product_api4

Add ContributionProduct and EntityBatch APIv4 Entity

3 years agodev/core#2680 Remove rows in the civicrm_contribution_product table that have bad...
Seamus Lee [Thu, 8 Jul 2021 21:13:41 +0000 (07:13 +1000)]
dev/core#2680 Remove rows in the civicrm_contribution_product table that have bad product_ids in them

3 years agoMerge pull request #20782 from mlutfy/forwardMail
Tim Otten [Thu, 8 Jul 2021 20:39:46 +0000 (13:39 -0700)]
Merge pull request #20782 from mlutfy/forwardMail

Forward Mailing: remove duplicate buttons, cancel button

3 years agoFix undefined tpl variables
Coleman Watts [Thu, 8 Jul 2021 20:34:47 +0000 (16:34 -0400)]
Fix undefined tpl variables

3 years agoMerge pull request #20812 from nirodaonline/patch-1
demeritcowboy [Thu, 8 Jul 2021 17:34:24 +0000 (13:34 -0400)]
Merge pull request #20812 from nirodaonline/patch-1

Update contributor-key.yml

3 years agoUpdate contributor-key.yml
nirodaonline [Thu, 8 Jul 2021 16:35:17 +0000 (17:35 +0100)]
Update contributor-key.yml

3 years agoMerge pull request #20805 from eileenmcnaughton/log_date
demeritcowboy [Thu, 8 Jul 2021 16:26:24 +0000 (12:26 -0400)]
Merge pull request #20805 from eileenmcnaughton/log_date

Add deprecation warning for modifiedDates

3 years agoMerge pull request #20794 from nirodaonline/feature/core-2652
demeritcowboy [Thu, 8 Jul 2021 15:11:58 +0000 (11:11 -0400)]
Merge pull request #20794 from nirodaonline/feature/core-2652

dev/core#2652 - Civi\Report - Add is null / is not null to OP_MULTISE…

3 years agoAPIv4 - Fix pseudoconstant matching function to pass params correctly across joins
Coleman Watts [Wed, 7 Jul 2021 19:54:57 +0000 (15:54 -0400)]
APIv4 - Fix pseudoconstant matching function to pass params correctly across joins

The getPseudoconstantList() function passes an array of params to core BAO::buildOptions,
that list needs to be transformed to match the prefix on the field, in case that field
belongs to a joined entity rather than the main entity.

3 years agoFix for dev/core#2624
Jaap Jansma [Thu, 27 May 2021 08:33:09 +0000 (10:33 +0200)]
Fix for dev/core#2624

Fix for dev/core#2624

3 years agoMerge pull request #20758 from colemanw/addSearchAfformTest
Seamus Lee [Thu, 8 Jul 2021 09:55:53 +0000 (19:55 +1000)]
Merge pull request #20758 from colemanw/addSearchAfformTest

SearchKit - Auto-apply filters passed in from Afform markup

3 years agoMerge pull request #20786 from totten/master-monaco
Seamus Lee [Thu, 8 Jul 2021 09:44:43 +0000 (19:44 +1000)]
Merge pull request #20786 from totten/master-monaco

crmMonaco - Multiple updates. Toward message-template editing.

3 years agoMerge pull request #20806 from eileenmcnaughton/lines
Eileen McNaughton [Thu, 8 Jul 2021 09:35:26 +0000 (21:35 +1200)]
Merge pull request #20806 from eileenmcnaughton/lines

Fix test to use order api & setup valid financials

3 years agoFix test to use order api & setup valid financials
Eileen McNaughton [Thu, 8 Jul 2021 00:59:33 +0000 (12:59 +1200)]
Fix test to use order api & setup valid financials

Updates a test from 'weird setup' to using the order api

3 years agoSet version to 5.41.alpha1
CiviCRM [Thu, 8 Jul 2021 03:51:15 +0000 (03:51 +0000)]
Set version to 5.41.alpha1

3 years agoSet version to 5.40.beta1
CiviCRM [Thu, 8 Jul 2021 03:42:16 +0000 (03:42 +0000)]
Set version to 5.40.beta1

3 years agoMerge pull request #20810 from totten/master-e2e-timeout
Tim Otten [Thu, 8 Jul 2021 03:39:40 +0000 (20:39 -0700)]
Merge pull request #20810 from totten/master-e2e-timeout

AssetBuilderTest - Raise threshold for timeout

3 years agoAssetBuilderTest - Raise threshold for timeout
Tim Otten [Thu, 8 Jul 2021 03:21:57 +0000 (20:21 -0700)]
AssetBuilderTest - Raise threshold for timeout

Overview
--------

Raise the threshold beforer abandoning execution of this E2E test.

Technical Details
------------------

This aims to mitigate flaky failures like the following:

Example failure: https://test.civicrm.org/job/CiviCRM-Core-Matrix/BKPROF=max,CIVIVER=5.39,SUITES=phpunit-e2e,label=bknix-tmp/9766/testReport/junit/E2E.Core/AssetBuilderTest/testInvalid/

```
E2E\Core\AssetBuilderTest::testInvalid
GuzzleHttp\Exception\ConnectException: cURL error 28: Operation timed out after 1001 milliseconds with 0 bytes received (see https://curl.haxx.se/libcurl/c/libcurl-errors.html)

/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:200
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:155
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:105
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php:43
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php:28
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php:51
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php:37
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Middleware.php:29
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php:70
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Middleware.php:59
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/HandlerStack.php:71
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:351
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:162
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:182
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/E2E/Core/AssetBuilderTest.php:167
/home/jenkins/bknix-max/extern/phpunit8/phpunit8.phar:671
```

3 years agoMerge pull request #20809 from totten/master-fwd
Tim Otten [Thu, 8 Jul 2021 02:48:25 +0000 (19:48 -0700)]
Merge pull request #20809 from totten/master-fwd

Merge forward 5.39 => master

3 years agoset-version.php - Fix autocommit for 'info.xml'
Tim Otten [Thu, 8 Jul 2021 01:48:21 +0000 (18:48 -0700)]
set-version.php - Fix autocommit for 'info.xml'

The 'set-version.php' script has an option `--commit` which should commit any updated files.

Before: Fails to commit changes to `ext/*/info.xml`

After: Does ocmmit changes to `ext/*/info.xml`

3 years agorelease-notes/5.39.0.md - Add recent PR
Tim Otten [Thu, 8 Jul 2021 01:44:21 +0000 (18:44 -0700)]
release-notes/5.39.0.md - Add recent PR

3 years agorelease-notes/5.39.0.md - Random tiny edits
Tim Otten [Thu, 8 Jul 2021 01:37:23 +0000 (18:37 -0700)]
release-notes/5.39.0.md - Random tiny edits

3 years agodev/core#2659 Move group cleanup to latest release
Eileen McNaughton [Sat, 3 Jul 2021 01:16:43 +0000 (13:16 +1200)]
dev/core#2659 Move group cleanup to latest release

3 years agoMerge pull request #20803 from colemanw/addressSearchFilter
Eileen McNaughton [Thu, 8 Jul 2021 02:06:34 +0000 (14:06 +1200)]
Merge pull request #20803 from colemanw/addressSearchFilter

SearchKit - Remove automatic filter from address