Seamus Lee [Sun, 20 Sep 2020 22:03:30 +0000 (08:03 +1000)]
dev/core#2030 ensure that the Country selector is a Select 2 and ensure that if it is not shown on the contribution form that it doesn't prevent form submissions
Eileen McNaughton [Sun, 20 Sep 2020 20:52:37 +0000 (08:52 +1200)]
Merge pull request #18465 from totten/master-greenwich-ext
Greenwich: Add BootstrapCSS support via core extension
Eileen McNaughton [Sun, 20 Sep 2020 20:37:23 +0000 (08:37 +1200)]
Merge pull request #18529 from seamuslee001/core_afform_php74_array_string
[REF] Fix deprecated array and string offset access using curly brace…
Eileen McNaughton [Sun, 20 Sep 2020 20:34:53 +0000 (08:34 +1200)]
Merge pull request #18531 from civicrm/5.30
5.30 to master
Eileen McNaughton [Sun, 20 Sep 2020 20:34:39 +0000 (08:34 +1200)]
Merge pull request #18525 from christianwach/lab-core-1997-530
Fix PayPal Standard session loss in WordPress (5.30)
Eileen McNaughton [Sun, 20 Sep 2020 20:33:34 +0000 (08:33 +1200)]
Merge pull request #18524 from MegaphoneJon/core-2052-rc
fix datepickers to show correct minDate
Eileen McNaughton [Sun, 20 Sep 2020 20:31:26 +0000 (08:31 +1200)]
Merge pull request #18530 from seamuslee001/fix_date_relationship
[NFC] Fix dates in RelationshipTest
Seamus Lee [Sun, 20 Sep 2020 06:00:46 +0000 (16:00 +1000)]
[NFC] Fix dates in RelationshipTest
Seamus Lee [Sat, 19 Sep 2020 22:22:39 +0000 (08:22 +1000)]
[REF] Fix deprecated array and string offset access using curly braces in afform
Matthew Wire [Sat, 19 Sep 2020 18:55:01 +0000 (19:55 +0100)]
Merge pull request #18479 from eileenmcnaughton/just_pay
dev/financial#148 Simplify parameters passed to completeOrder
Christian Wach [Sat, 19 Sep 2020 11:47:26 +0000 (12:47 +0100)]
Fix PayPal Standard session loss in WordPress
Seamus Lee [Fri, 18 Sep 2020 22:50:01 +0000 (08:50 +1000)]
Merge pull request #18523 from civicrm/5.30
5.30
Jon Goldberg [Fri, 18 Sep 2020 20:21:22 +0000 (16:21 -0400)]
fix datepickers to show correct minDate
Seamus Lee [Fri, 18 Sep 2020 21:18:22 +0000 (07:18 +1000)]
Merge pull request #18520 from colemanw/searchGroupBy
Search ext: Aggregate field fixes
Coleman Watts [Fri, 18 Sep 2020 15:27:20 +0000 (11:27 -0400)]
Search ext: Ensure all non-grouped columns are aggregated if using GROUP BY
Coleman Watts [Fri, 18 Sep 2020 15:16:16 +0000 (11:16 -0400)]
Search ext: When removing a column from SELECT, also remove from ORDER BY
Coleman Watts [Fri, 18 Sep 2020 14:34:27 +0000 (10:34 -0400)]
Search ext: Fix field label for aggregate fields
Matthew Wire [Fri, 18 Sep 2020 13:51:56 +0000 (14:51 +0100)]
Merge pull request #18427 from mattwire/membershipbackendcached
Switch backend membership form to use non-deprecated/cached functions to get membership types
colemanw [Fri, 18 Sep 2020 11:50:30 +0000 (07:50 -0400)]
Merge pull request #18485 from eileenmcnaughton/ref2
dev/core#2043 remove pass-by-reference
Eileen McNaughton [Fri, 18 Sep 2020 08:45:15 +0000 (20:45 +1200)]
Merge pull request #18505 from seamuslee001/afform_container_fix
[REF] Fix visibility of afform_scanner container service for Symfony …
Seamus Lee [Fri, 18 Sep 2020 05:11:46 +0000 (15:11 +1000)]
Merge pull request #18511 from totten/master-aff-test
Afform Tests - Fix extension tests when run via `civi-test-run`
Seamus Lee [Thu, 17 Sep 2020 23:49:54 +0000 (09:49 +1000)]
[REF] Fix visibility of afform_scanner container service for Symfony 3 and 4
Seamus Lee [Fri, 18 Sep 2020 02:36:07 +0000 (12:36 +1000)]
Merge pull request #18506 from totten/master-bundle-array
CRM_Core_Resources::addBundle() - Fix handling of array inputs
Seamus Lee [Fri, 18 Sep 2020 02:32:20 +0000 (12:32 +1000)]
Merge pull request #18507 from eileenmcnaughton/test_fix
Test fix - use valid membership type
Tim Otten [Fri, 18 Sep 2020 02:14:06 +0000 (19:14 -0700)]
afform_clear() - Fix error when running on non-cached container
After switching the tests from an effective policy of `CIVICRM_CONTAINER_CACHE=auto`
to an effective policy of `CIVICRM_CONTAINER_CACHE=never`, this started to fail:
```
1) api_v4_AfformTest::testGetUpdateRevert with data set #0 ('mockPage', array('', '', 'civicrm/mock-page', 'access Foobar'))
Symfony\Component\DependencyInjection\Exception\BadMethodCallException: Setting service "angular" for an unknown or non-synthetic service definition on a compiled container is not allowed.
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/vendor/symfony/dependency-injection/ContainerBuilder.php:532
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/ext/afform/core/afform.php:520
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/ext/afform/core/Civi/Api4/Afform.php:99
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/BasicBatchAction.php:88
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/BasicBatchAction.php:68
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Provider/ActionObjectProvider.php:68
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php:150
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php:238
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php:53
/home/me/bknix/extern/phpunit6/phpunit6.phar:570
```
Tim Otten [Fri, 18 Sep 2020 02:11:19 +0000 (19:11 -0700)]
Container - Disable caching in as many unit-tests as we can
Eileen McNaughton [Fri, 18 Sep 2020 01:16:53 +0000 (13:16 +1200)]
Merge pull request #18503 from colemanw/removeHookCiviCRMTabs
Remove long-deprecated hook_civicrm_tabs
colemanw [Fri, 18 Sep 2020 00:58:54 +0000 (20:58 -0400)]
Merge pull request #18488 from eileenmcnaughton/loc_block
dev/core#1973 Fix Email & Phone storage issues in event location
eileen [Fri, 18 Sep 2020 00:29:06 +0000 (12:29 +1200)]
Test fix - use valid membership type
Addresses cause of https://github.com/civicrm/civicrm-core/pull/18427 fail
Tim Otten [Fri, 18 Sep 2020 00:26:38 +0000 (17:26 -0700)]
CRM_Core_Resources::addBundle() - Fix handling of array inputs
(This fixes a small bug in a new function added during this release -- part of #18247.)
The signature of `addBundle()` optionally accepts an array/iterable -- if
given, then it should add all the items from the array. For example:
```php
Civi::resources()->addBundle(['foo', 'bar']);
```
Before
------
It adds `foo` but then bails out on `bar`.
After
-----
It adds both `foo` and `bar`.
Seamus Lee [Thu, 17 Sep 2020 21:38:55 +0000 (07:38 +1000)]
Merge pull request #18501 from eileenmcnaughton/acltest
dev/core#2039 Fix test to use set up method with more data integrity
eileen [Wed, 16 Sep 2020 03:45:47 +0000 (15:45 +1200)]
dev/core#1973 Fix Email & Phone storage issues in event location
Eileen McNaughton [Thu, 17 Sep 2020 20:26:30 +0000 (08:26 +1200)]
Merge pull request #18492 from colemanw/moveDaoFunctionsToBaseClass
Ensure DAO base class contains functions to be removed from generated files
colemanw [Thu, 17 Sep 2020 20:21:39 +0000 (16:21 -0400)]
Merge pull request #18490 from eileenmcnaughton/emailadd
Remove deprecated code lines
Coleman Watts [Thu, 17 Sep 2020 18:40:38 +0000 (14:40 -0400)]
Remove deprecated hook_civicrm_tabs
This hook has been deprecated for 5 years. Time to remove it.
colemanw [Thu, 17 Sep 2020 11:27:45 +0000 (07:27 -0400)]
Merge pull request #18498 from eileenmcnaughton/opennp
dev/core#2039 Fix OpenID::add to ensure is_primary is set
eileen [Thu, 17 Sep 2020 04:22:20 +0000 (16:22 +1200)]
dev/core#2039 Fix test to use set up method with more data integrity
Using the api rather than CRM_Core_DAO::createTestObject to create the phone ensures it is created with is_primary.
We might need to fix CRM_Core_DAO::createTestObject but for this case simply using the api suffices
eileen [Thu, 17 Sep 2020 00:41:59 +0000 (12:41 +1200)]
dev/core#2039 Fix OpenID::add to ensure is_primary is set
In my efforts to determine the the non-performant line of code that makes sure IM is set is
not required I edited tests to track down when is_primary is not correct & determined it
is missing from the add function - same as https://github.com/civicrm/civicrm-core/pull/18489 for IM
Seamus Lee [Thu, 17 Sep 2020 03:42:07 +0000 (13:42 +1000)]
Merge pull request #18489 from eileenmcnaughton/im
dev/core#2039 Add check to ensure all have a primary address, fix identified but in IM.add
Tim Otten [Mon, 14 Sep 2020 10:38:06 +0000 (03:38 -0700)]
composer.lock - Update composer-compile-plugin
Tim Otten [Mon, 14 Sep 2020 10:37:05 +0000 (03:37 -0700)]
composer.json - Move greenwich-specific rules into the greenwich folder
Tim Otten [Mon, 14 Sep 2020 10:36:12 +0000 (03:36 -0700)]
composer.json - Update composer-compile-plugin
Tim Otten [Mon, 14 Sep 2020 07:40:44 +0000 (00:40 -0700)]
greenwich - Add to civicrm_generated.mysql
Tim Otten [Mon, 14 Sep 2020 07:34:35 +0000 (00:34 -0700)]
greenwich - Activate during upgrade
Tim Otten [Mon, 14 Sep 2020 07:31:41 +0000 (00:31 -0700)]
greenwich - Activate on new builds
Tim Otten [Mon, 14 Sep 2020 07:27:41 +0000 (00:27 -0700)]
composer.lock - Update for Greenwich/SCSS libraries and compilation task
Tim Otten [Mon, 14 Sep 2020 07:24:43 +0000 (00:24 -0700)]
greenwich - Make a more useful readme
Tim Otten [Mon, 14 Sep 2020 07:23:11 +0000 (00:23 -0700)]
greenwich - Quick/weak stab at slightly-less glaringly-mismatched but…
Tim Otten [Mon, 14 Sep 2020 07:21:38 +0000 (00:21 -0700)]
greenwich - Declare theme. Use the new bootstrap3.css
Tim Otten [Mon, 14 Sep 2020 07:17:55 +0000 (00:17 -0700)]
greenwich - Define compilation task
Tim Otten [Mon, 14 Sep 2020 07:14:58 +0000 (00:14 -0700)]
composer.json - Add scssphp, php-autoprefixer, and compile-plugin
Tim Otten [Fri, 11 Sep 2020 21:51:02 +0000 (14:51 -0700)]
greenwich - Download bootstrap-sass
Tim Otten [Wed, 22 Jul 2020 08:22:58 +0000 (01:22 -0700)]
greenwich - Remove unnecessary hook stubs
Tim Otten [Wed, 22 Jul 2020 01:21:07 +0000 (18:21 -0700)]
Import skeletal "greenwich"
Seamus Lee [Thu, 17 Sep 2020 01:43:04 +0000 (11:43 +1000)]
Merge pull request #18497 from eileenmcnaughton/open_primary
dev/core#2039 [NFC] Code cleanup in test class
Eileen McNaughton [Thu, 17 Sep 2020 01:29:30 +0000 (13:29 +1200)]
Merge pull request #18496 from eileenmcnaughton/nfc
dev/core#2039 [NFC] Minor cleanup in tests
Eileen McNaughton [Thu, 17 Sep 2020 01:15:59 +0000 (13:15 +1200)]
Merge pull request #18495 from eileenmcnaughton/email_add
dev/core#2046 Rationalise add vs create on email BAO
eileen [Thu, 17 Sep 2020 00:28:52 +0000 (12:28 +1200)]
[NFC] Code cleanup in test class
Seamus Lee [Thu, 17 Sep 2020 00:08:45 +0000 (10:08 +1000)]
Merge pull request #18494 from eileenmcnaughton/test_clean
dev/core#2039 [NFC] Test cleanup to stop calling Email::add action
eileen [Wed, 16 Sep 2020 23:54:48 +0000 (11:54 +1200)]
[NFC] Minor cleanup in tests
colemanw [Wed, 16 Sep 2020 23:54:06 +0000 (19:54 -0400)]
Merge pull request #18484 from eileenmcnaughton/ref
dev/core#2043 remove pass-by-ref
Eileen McNaughton [Wed, 16 Sep 2020 22:40:24 +0000 (10:40 +1200)]
Merge pull request #18491 from totten/master-ref-gendata
(REF) GenerateData - Make it possible to call this via PHP
eileen [Wed, 16 Sep 2020 20:51:17 +0000 (08:51 +1200)]
dev/core#2046 Rationalise add vs create on email BAO
This folds the 2 functions into one, deprecating add
eileen [Wed, 16 Sep 2020 20:36:34 +0000 (08:36 +1200)]
[NFC] Test cleanup to stop calling Email::add action which does not handle primary
Note I feel like we should further
1) move the contents of email add into create
2) make add a deprecated wrapper for create
Whatever the vision of different add vs create functions it didn't turn out in practice and seems to
only generate confusion. We recommend apiv4 as the preferred create methodology
Coleman Watts [Wed, 16 Sep 2020 14:57:26 +0000 (10:57 -0400)]
Ensure DAO base class contains functions to be removed from generated DAO files.
The functions fieldKeys(), getLog(), and getTableName() are redundant in the generated DAO files,
we don't need 50 copies of each function.
This preliminary commit ensures they are present in the parent class, and in the future we can
regenerate the DAOs without them.
eileen [Wed, 16 Sep 2020 02:44:40 +0000 (14:44 +1200)]
dev/core#2043 remove pass-by-ref
Also shortening of if clause
Eileen McNaughton [Wed, 16 Sep 2020 19:19:03 +0000 (07:19 +1200)]
Merge pull request #18470 from JKingsnorth/dev/core#2027-2
dev/core#2027 Add/update to UK county list
colemanw [Wed, 16 Sep 2020 14:44:23 +0000 (10:44 -0400)]
Merge pull request #18423 from eileenmcnaughton/afform
dev/core#2000 Move afform into core extensions
John Kingsnorth [Wed, 16 Sep 2020 11:11:06 +0000 (12:11 +0100)]
dev/core#2027 Add/update to UK county list
Tim Otten [Wed, 16 Sep 2020 09:58:36 +0000 (02:58 -0700)]
(REF) GenerateData - Allow external control randomness
Tim Otten [Wed, 16 Sep 2020 08:08:03 +0000 (01:08 -0700)]
(REF) GenerateData - Use overrideable 'echo'. Use exceptions.
This removes elements of GenerateData which perform direct output to the user. there
are basically two cases:
1. Outputting advisory/status info (e.g. "echo"). This now goes through a method, which
can be overriden/replaced.
2. Displaying errors from DAO-calls. Now-a-days, DAO-calls can raise their own exceptions,
so we don't need to sprinkle it without error-outputs.
Tim Otten [Wed, 16 Sep 2020 07:39:14 +0000 (00:39 -0700)]
(REF) GenerateData - Extract method 'generateAll()'
Tim Otten [Wed, 16 Sep 2020 09:28:11 +0000 (02:28 -0700)]
GenerateData - Make the generated sample data more stable (wrt shuffle+array_rand)
Tim Otten [Wed, 16 Sep 2020 09:27:15 +0000 (02:27 -0700)]
GenerateData - Make the generated sample data more stable (wrt time)
Tim Otten [Wed, 16 Sep 2020 07:30:56 +0000 (00:30 -0700)]
GenerateData - Make the generated sample data more stable (wrt mt_rand)
Tim Otten [Wed, 16 Sep 2020 07:25:18 +0000 (00:25 -0700)]
(REF) GenerateData - Extract method 'randomInt()'
This it easier to have one random number generator used for all 'randomFoo()' functions.
Tim Otten [Wed, 16 Sep 2020 07:58:19 +0000 (00:58 -0700)]
(REF) Extract `CRM_Core_CodeGen_GenerateData` - Fix path reference
When this class moved to a new folder, the relative paths changed.
eileen [Wed, 16 Sep 2020 10:31:05 +0000 (22:31 +1200)]
Remove deprecated code lines
eileen [Tue, 15 Sep 2020 23:48:49 +0000 (11:48 +1200)]
Add check to ensure all have a primary address, fix identified but in IM.add
Monish Deb [Wed, 16 Sep 2020 07:29:11 +0000 (12:59 +0530)]
Merge pull request #18486 from eileenmcnaughton/part
dev/event#42 [Ref] Separate url path calculation into the relevant classes
Tim Otten [Wed, 16 Sep 2020 07:00:50 +0000 (00:00 -0700)]
(REF) Extract `CRM_Core_CodeGen_GenerateData`
This moves the class from `sql/GenerateData.php` to `CRM/Core/CodeGen/GenerateData.php`, which makes
it easier to reference in other workflows.
Seamus Lee [Wed, 16 Sep 2020 05:57:44 +0000 (15:57 +1000)]
Merge pull request #18480 from eileenmcnaughton/dom_org
dev/core#2039 Set is_primary to 1 on email, address for domain contacts
Seamus Lee [Wed, 16 Sep 2020 05:51:04 +0000 (15:51 +1000)]
Merge pull request #18487 from civicrm/5.30
5.30
eileen [Wed, 16 Sep 2020 03:53:39 +0000 (15:53 +1200)]
[Ref] Separate url path calculation into the relevant classes
Eileen McNaughton [Wed, 16 Sep 2020 04:17:47 +0000 (16:17 +1200)]
Merge pull request #18482 from seamuslee001/5.30
release-notes/5.29.1.md
Eileen McNaughton [Wed, 16 Sep 2020 04:17:04 +0000 (16:17 +1200)]
Merge pull request #18478 from seamuslee001/api_v4_fin_acl_test
[NFC] Enable APIv4 testing on the Fin ACL Extension Line Item test
Monish Deb [Wed, 16 Sep 2020 03:41:41 +0000 (09:11 +0530)]
Merge pull request #18464 from eileenmcnaughton/urlparamms
[REF] Start the process of separating the search action from the participant form
Monish Deb [Wed, 16 Sep 2020 03:11:10 +0000 (08:41 +0530)]
Merge pull request #18463 from eileenmcnaughton/searchhhook
dev/core#2017 remove unused SearchTaskHookSample.php
eileen [Wed, 16 Sep 2020 02:03:04 +0000 (14:03 +1200)]
Regenerate sql
eileen [Wed, 16 Sep 2020 00:52:52 +0000 (12:52 +1200)]
dev/core#2039 Set is_primary to 1 on email, address for domain contacts
I'm digging into the places where the code handles is_primary due to duplicate handling/ queries
- see https://lab.civicrm.org/dev/core/-/issues/2039
One distraction is that the domain contact's address & email are not marked is_primary. This
doesn't make sense to me as they ARE a contact in the DB
eileen [Wed, 16 Sep 2020 02:50:09 +0000 (14:50 +1200)]
dev/core#2043 remove pass-by-reference
Technical details in https://lab.civicrm.org/dev/core/-/issues/2043
eileen [Thu, 10 Sep 2020 20:34:50 +0000 (08:34 +1200)]
Phpcs fix
eileen [Thu, 10 Sep 2020 03:47:37 +0000 (15:47 +1200)]
Remove commented out line
eileen [Thu, 10 Sep 2020 03:41:36 +0000 (15:41 +1200)]
Remove more commented out code that is upsetting CI
eileen [Thu, 10 Sep 2020 03:09:37 +0000 (15:09 +1200)]
Remove more commented out function
eileen [Thu, 10 Sep 2020 01:18:00 +0000 (13:18 +1200)]
Style fixes
I removed the commented out functions rather than figuring out how to style them right
eileen [Wed, 9 Sep 2020 21:31:53 +0000 (09:31 +1200)]
Misc style fix
eileen [Wed, 9 Sep 2020 21:31:41 +0000 (09:31 +1200)]
Re-run civix upgrader
eileen [Wed, 9 Sep 2020 21:17:02 +0000 (09:17 +1200)]
Re-run civix
Coleman Watts [Fri, 17 Jul 2020 14:07:09 +0000 (10:07 -0400)]
Update API factory functions with checkPermissions