Coleman Watts [Mon, 12 Jul 2021 18:32:44 +0000 (14:32 -0400)]
Remove unused variables
Eileen McNaughton [Mon, 12 Jul 2021 10:18:13 +0000 (22:18 +1200)]
Merge pull request #20830 from eileenmcnaughton/ttp
E-notice fix
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
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
Eileen McNaughton [Mon, 12 Jul 2021 08:30:48 +0000 (20:30 +1200)]
Merge pull request #20828 from colemanw/tplFix
Fix undefined tpl vars
Eileen McNaughton [Mon, 12 Jul 2021 08:11:31 +0000 (20:11 +1200)]
E-notice fix
Eileen McNaughton [Fri, 18 Jun 2021 04:10:35 +0000 (16:10 +1200)]
Enable check on created participant payment rows
Extend participant check
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
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
Coleman Watts [Mon, 12 Jul 2021 01:17:20 +0000 (21:17 -0400)]
Fix undefined tpl vars
colemanw [Mon, 12 Jul 2021 01:09:16 +0000 (21:09 -0400)]
Merge pull request #20827 from eileenmcnaughton/tpl3
tpl enotice fix
Eileen McNaughton [Sun, 11 Jul 2021 23:02:05 +0000 (11:02 +1200)]
tpl enotice fix
Eileen McNaughton [Sat, 19 Jun 2021 03:22:55 +0000 (15:22 +1200)]
Fix transfer registration to transfer participant_payment row
colemanw [Sun, 11 Jul 2021 21:49:41 +0000 (17:49 -0400)]
Merge pull request #20818 from sadashivdalvi/crm-2685
Fix for issue 2685
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
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
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
Matthew Wire [Sun, 16 May 2021 19:07:21 +0000 (20:07 +0100)]
Add helper functions for reCAPTCHA extension
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
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
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.
sadashiv [Fri, 9 Jul 2021 03:38:55 +0000 (09:08 +0530)]
Fix for issue 2685
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…
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
Coleman Watts [Fri, 9 Jul 2021 00:38:51 +0000 (20:38 -0400)]
Fix dumb typo breaking color lookup
Coleman Watts [Fri, 9 Jul 2021 00:04:19 +0000 (20:04 -0400)]
PHP notice fixes on options page
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
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…
Eileen McNaughton [Thu, 8 Jul 2021 22:51:53 +0000 (10:51 +1200)]
Merge pull request #20813 from colemanw/tplFixes
Fix undefined tpl variables
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
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
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
Coleman Watts [Thu, 8 Jul 2021 20:34:47 +0000 (16:34 -0400)]
Fix undefined tpl variables
demeritcowboy [Thu, 8 Jul 2021 17:34:24 +0000 (13:34 -0400)]
Merge pull request #20812 from nirodaonline/patch-1
Update contributor-key.yml
nirodaonline [Thu, 8 Jul 2021 16:35:17 +0000 (17:35 +0100)]
Update contributor-key.yml
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
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…
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.
Jaap Jansma [Thu, 27 May 2021 08:33:09 +0000 (10:33 +0200)]
Fix for dev/core#2624
Fix for dev/core#2624
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
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.
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
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
CiviCRM [Thu, 8 Jul 2021 03:51:15 +0000 (03:51 +0000)]
Set version to 5.41.alpha1
CiviCRM [Thu, 8 Jul 2021 03:42:16 +0000 (03:42 +0000)]
Set version to 5.40.beta1
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
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
```
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
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`
Tim Otten [Thu, 8 Jul 2021 01:44:21 +0000 (18:44 -0700)]
release-notes/5.39.0.md - Add recent PR
Tim Otten [Thu, 8 Jul 2021 01:37:23 +0000 (18:37 -0700)]
release-notes/5.39.0.md - Random tiny edits
Eileen McNaughton [Sat, 3 Jul 2021 01:16:43 +0000 (13:16 +1200)]
dev/core#2659 Move group cleanup to latest release
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
Eileen McNaughton [Thu, 8 Jul 2021 00:29:05 +0000 (12:29 +1200)]
Merge pull request #20600 from ixiam/dev#SettingsTraitCheckboxes
Force cleanup of setting value type "checkboxes" when is empty
Eileen McNaughton [Wed, 7 Jul 2021 23:48:25 +0000 (11:48 +1200)]
Add deprecation warning for modifiedDates
This is only accessed from log_date
colemanw [Wed, 7 Jul 2021 23:29:54 +0000 (19:29 -0400)]
Merge pull request #20764 from colemanw/multiContactRefJoins
SearchKit - Add ability to join on multi-select ContactRef fields
colemanw [Wed, 7 Jul 2021 23:22:52 +0000 (19:22 -0400)]
Merge pull request #20785 from eileenmcnaughton/baseipn
Fix BaseIPN test to (mostly) pass invalid financials checks
Eileen McNaughton [Wed, 7 Jul 2021 23:04:22 +0000 (11:04 +1200)]
Merge pull request #20746 from colemanw/locBlockFixes
dev/core#2676 SearchKit - Add LocBlock entity to display Event location data
Coleman Watts [Wed, 7 Jul 2021 22:34:57 +0000 (18:34 -0400)]
SearchKit - Remove automatic filter from address
Eileen McNaughton [Wed, 7 Jul 2021 22:22:28 +0000 (10:22 +1200)]
Merge pull request #20780 from eileenmcnaughton/pay_order
Fix test set up to user Order api
Eileen McNaughton [Wed, 7 Jul 2021 22:09:07 +0000 (10:09 +1200)]
Merge pull request #20802 from civicrm/5.39
5.39 to master
Eileen McNaughton [Wed, 7 Jul 2021 22:08:31 +0000 (10:08 +1200)]
Merge pull request #20798 from agh1/5.39.0-releasenotes-final
5.39.0 release notes: added late changes
Eileen McNaughton [Wed, 7 Jul 2021 21:45:18 +0000 (09:45 +1200)]
Merge pull request #20765 from colemanw/apiDeprecatePassingIdField
APIv4 - Deprecate passing 'id' to basic actions
Eileen McNaughton [Wed, 7 Jul 2021 20:44:57 +0000 (08:44 +1200)]
Merge pull request #20719 from mattwire/deprecatedwarningcaller
Add calling function to deprecatedWarning log message
Eileen McNaughton [Tue, 6 Jul 2021 07:32:32 +0000 (19:32 +1200)]
Fix test set up to user Order api
Note this includes the order api ensuring that the contribution_recur_id is passed through to
any created memberships
Eileen McNaughton [Wed, 7 Jul 2021 20:38:13 +0000 (08:38 +1200)]
Merge pull request #20797 from colemanw/reportTplFixes
Fix undefined tpl vars in CiviReport
Tim Otten [Wed, 7 Jul 2021 20:36:06 +0000 (13:36 -0700)]
CRM_Utils_JS::stripComments() - Mitigation for string which includes newline and comment
Andrew Hunt [Wed, 7 Jul 2021 19:36:55 +0000 (15:36 -0400)]
5.39.0 release notes: added late changes
Matthew Wire [Wed, 7 Jul 2021 18:39:14 +0000 (19:39 +0100)]
Add deprecated flag to functions
Matthew Wire [Mon, 28 Jun 2021 08:43:02 +0000 (09:43 +0100)]
Add calling function to deprecatedWarning log message
Coleman Watts [Wed, 7 Jul 2021 13:44:22 +0000 (09:44 -0400)]
Fix undefined tpl vars in CiviReport
colemanw [Wed, 7 Jul 2021 15:01:55 +0000 (11:01 -0400)]
Merge pull request #20796 from demeritcowboy/smartactlinks
Unused smarty variable
colemanw [Wed, 7 Jul 2021 14:00:31 +0000 (10:00 -0400)]
Merge pull request #20795 from demeritcowboy/smartycasehlp
smarty notices - New case screen - Case.hlp
colemanw [Wed, 7 Jul 2021 13:56:25 +0000 (09:56 -0400)]
Merge pull request #20793 from eileenmcnaughton/order2
[Ref] Remove (more) unreachable code from order api
demeritcowboy [Wed, 7 Jul 2021 13:12:28 +0000 (09:12 -0400)]
unused
demeritcowboy [Wed, 7 Jul 2021 13:02:33 +0000 (09:02 -0400)]
sometimes legitimately missing
Eileen McNaughton [Wed, 7 Jul 2021 05:49:52 +0000 (17:49 +1200)]
Further cleanup on order
Follow up to https://github.com/civicrm/civicrm-core/pull/20792
- although that can be closed if this is merged
Eileen McNaughton [Wed, 7 Jul 2021 05:41:37 +0000 (17:41 +1200)]
[REF] Remove unreachable code from order api
malmeida [Wed, 7 Jul 2021 09:00:47 +0000 (10:00 +0100)]
dev/core#2652 - Civi\Report - Add is null / is not null to OP_MULTISELECT_SEPARATOR
Matthew Wire [Wed, 7 Jul 2021 08:30:39 +0000 (09:30 +0100)]
Merge pull request #18517 from JMAConsulting/financial-issue-150
dev/financial#150: civicrm/payment/form url got empty currency argument in backoffice live CC form
Eileen McNaughton [Wed, 7 Jul 2021 06:31:07 +0000 (18:31 +1200)]
Merge pull request #20392 from seamuslee001/ckeditor4
[REF] Extract CKEditor into its own core extension
Eileen McNaughton [Wed, 7 Jul 2021 05:24:21 +0000 (17:24 +1200)]
Merge pull request #20790 from eileenmcnaughton/partor
Handle participant payment create in line item
colemanw [Wed, 7 Jul 2021 04:48:18 +0000 (00:48 -0400)]
Merge pull request #20789 from totten/master-crmui-selecting
(REF) crmUi - Support onCrmUiSelect for using select2 as a picklist
Seamus Lee [Sat, 22 May 2021 23:03:03 +0000 (09:03 +1000)]
Extract CKEditor into its own core extension
Update civicrm_generated and shift js files into the new extension
Update to use E::path and E::url as appropriate
Add in Upgrade step to update option label to be consistant
Make changes for CKeditor 4 label now
Add in upgrade step to enable extension on upgrade
Eileen McNaughton [Fri, 18 Jun 2021 07:02:17 +0000 (19:02 +1200)]
Handle participant payment create in line item
Remove participant payment create from order api
This is now done in the line item create & we went through to 'prove' that it works with
extra validation
Eileen McNaughton [Wed, 7 Jul 2021 03:13:49 +0000 (15:13 +1200)]
Merge pull request #20783 from JMAConsulting/issue_2681
dev#2861: Prevent duplicate names in mailing labels
colemanw [Wed, 7 Jul 2021 01:42:29 +0000 (21:42 -0400)]
Merge pull request #20788 from totten/master-array-rotate
CRM_Utils_Array::asColumns() - Add helper to rotate a matrix (from rows to columns)
Eileen McNaughton [Wed, 7 Jul 2021 00:47:14 +0000 (12:47 +1200)]
Merge pull request #20787 from totten/master-path-unset
CRM_Utils_Array - Implement pathUnset() method
Tim Otten [Tue, 22 Jun 2021 02:53:34 +0000 (19:53 -0700)]
crmUi - Add onCrmUiSelect for using select2 as a picklist
Eileen McNaughton [Tue, 6 Jul 2021 22:04:27 +0000 (10:04 +1200)]
Fix BaseIPN test to (mostly) pass invalid financials
colemanw [Tue, 6 Jul 2021 23:25:02 +0000 (19:25 -0400)]
Merge pull request #20779 from eileenmcnaughton/batch2
Clean up code to determine line items for membership batch entry
Tim Otten [Wed, 23 Jun 2021 02:53:07 +0000 (19:53 -0700)]
CRM_Utils_Array - Add helper to rotate an array (from rows to columns)
Tim Otten [Wed, 30 Jun 2021 03:12:28 +0000 (20:12 -0700)]
CRM_Utils_Array - Implement pathUnset() method
Tim Otten [Mon, 21 Jun 2021 22:44:19 +0000 (15:44 -0700)]
composer.json - Update Monaco
Tim Otten [Mon, 21 Jun 2021 00:17:14 +0000 (17:17 -0700)]
crmMonaco - Add option to receive inserted snippets
Tim Otten [Mon, 21 Jun 2021 00:16:24 +0000 (17:16 -0700)]
crmMonaco - Provide internal access to `$ctrl.editor` / `crmMonaco.editor` instances
Tim Otten [Wed, 16 Jun 2021 10:20:33 +0000 (03:20 -0700)]
crmMonaco - Accept option to specify relative height
demeritcowboy [Tue, 6 Jul 2021 19:32:26 +0000 (15:32 -0400)]
Merge pull request #20781 from colemanw/tplFixes
Fix undefined indexes in tpls
Eileen McNaughton [Tue, 6 Jul 2021 01:26:33 +0000 (13:26 +1200)]
Clean up code to determine line items for batch entry
This removes a chunk of weird code & further consolidates on the internal BAO_Order helper.
Note the test cover is in CRM_Batch_Form_EntryTest, which has
validateFinancials enabled
Coleman Watts [Sun, 4 Jul 2021 00:41:57 +0000 (20:41 -0400)]
Afform - Support implicit joins in SearchDisplay filter fields