civicrm-core.git
4 years ago[REF] Fix a couple of jQuery errors that have cropped up
Seamus Lee [Thu, 16 Jul 2020 23:22:42 +0000 (09:22 +1000)]
[REF] Fix a couple of jQuery errors that have cropped up

4 years agoMerge pull request #17823 from colemanw/upgradeSafe
Seamus Lee [Thu, 16 Jul 2020 23:20:32 +0000 (09:20 +1000)]
Merge pull request #17823 from colemanw/upgradeSafe

Remove unnecessary try/catch per #17729

4 years agoMerge pull request #17458 from eileenmcnaughton/export
Seamus Lee [Thu, 16 Jul 2020 23:14:40 +0000 (09:14 +1000)]
Merge pull request #17458 from eileenmcnaughton/export

dev/core#1725 Only export primary address fields

4 years agoMerge pull request #17860 from eileenmcnaughton/test
Seamus Lee [Thu, 16 Jul 2020 22:44:26 +0000 (08:44 +1000)]
Merge pull request #17860 from eileenmcnaughton/test

api_v3_TaxContributionPageTest fix - remove hard coded processor id

4 years agoMerge pull request #16626 from pradpnayak/lineItemFixes
Eileen McNaughton [Thu, 16 Jul 2020 22:18:40 +0000 (10:18 +1200)]
Merge pull request #16626 from pradpnayak/lineItemFixes

Fixed DB Error: syntax error if line item refers to civicrm_case

4 years agoMerge pull request #17865 from colemanw/summary
Eileen McNaughton [Thu, 16 Jul 2020 21:59:53 +0000 (09:59 +1200)]
Merge pull request #17865 from colemanw/summary

Fix potential js error on summary screen when reloading blocks

4 years agoapi_v3_TaxContributionPageTest fix - remove hard coded processor id
eileen [Thu, 16 Jul 2020 07:12:54 +0000 (19:12 +1200)]
api_v3_TaxContributionPageTest fix - remove hard coded processor id

4 years agoMerge pull request #17864 from colemanw/searchFix
colemanw [Thu, 16 Jul 2020 21:27:19 +0000 (17:27 -0400)]
Merge pull request #17864 from colemanw/searchFix

Search Ext: fix loading options and parsing custom field names

4 years agoFix potential js error on summary screen when reloading blocks
Coleman Watts [Thu, 16 Jul 2020 19:03:08 +0000 (15:03 -0400)]
Fix potential js error on summary screen when reloading blocks

4 years agoMerge pull request #17861 from totten/master-dao-event
Tim Otten [Thu, 16 Jul 2020 18:49:01 +0000 (11:49 -0700)]
Merge pull request #17861 from totten/master-dao-event

EventCart - Resolve BAO identity and uncommitted DAO changes

4 years agoSearch Ext: fix loading options and parsing custom field names
Coleman Watts [Thu, 16 Jul 2020 18:18:48 +0000 (14:18 -0400)]
Search Ext: fix loading options and parsing custom field names

4 years agoMerge pull request #17862 from colemanw/jobCleanup
colemanw [Thu, 16 Jul 2020 18:02:12 +0000 (14:02 -0400)]
Merge pull request #17862 from colemanw/jobCleanup

[REF] ScheduledJob cleanup, remove unused var

4 years agoScheduledJob cleanup, remove unused var
Coleman Watts [Thu, 16 Jul 2020 15:28:21 +0000 (11:28 -0400)]
ScheduledJob cleanup, remove unused var

4 years agoMerge pull request #17855 from seamuslee001/dev_core_1090
Seamus Lee [Thu, 16 Jul 2020 11:13:43 +0000 (21:13 +1000)]
Merge pull request #17855 from seamuslee001/dev_core_1090

dev/core#1090 Update extendedSerializeData to use the Backbone namesp…

4 years agoMerge pull request #17835 from demeritcowboy/test-contact-form
Seamus Lee [Thu, 16 Jul 2020 11:13:11 +0000 (21:13 +1000)]
Merge pull request #17835 from demeritcowboy/test-contact-form

dev/core#1874 - Failing test for new Individual form

4 years agoEventCart - Resolve BAO identity and uncommitted DAO changes
Tim Otten [Thu, 16 Jul 2020 09:33:07 +0000 (02:33 -0700)]
EventCart - Resolve BAO identity and uncommitted DAO changes

Overview
--------

This fixes a recent issue in which `setup.sh` is producing local-only changes to the `Cart`
and `EventInCart` DAO files.

To reduce ambiguity, I'm rephrasing the normal "Before/After" and giving a 3-step evolution/history.

Evolution
---------

(1) Traditionally, the `Cart`/`EventInCart` entities have both BAO+DAO in main source-tree.

(2) With #17743 (685bf3d218a9dad7e90d24aec165c63df12c1f67), the BAO moved away. But then
we get some detritus in the code-tree whenever you run `setup.sh`.

(3) With this patch, we don't get the detritus anymore.

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

When I ran `setup.sh -g`, it produced local modifications like this:

```
diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php
index 4683add13d..3a7f721dc1 100644
--- a/CRM/Event/Cart/DAO/Cart.php
+++ b/CRM/Event/Cart/DAO/Cart.php
@@ -94,7 +94,7 @@ class CRM_Event_Cart_DAO_Cart extends CRM_Core_DAO {
           'where' => 'civicrm_event_carts.id',
           'table_name' => 'civicrm_event_carts',
           'entity' => 'Cart',
-          'bao' => 'CRM_Event_Cart_BAO_Cart',
+          'bao' => 'CRM_Event_Cart_DAO_Cart',
           'localizable' => 0,
           'add' => '4.1',
         ],
```

(Let's ignore the cyclic dependency in this design - that's a messier/pre-existing
problem.)

That metadata is inaccurate.  The `bao` should point to the BAO, sinec the BAO does exist.

It's inaccurate because the BAO exists in a different location.

This patch allows you override the file-existence check -- saying, "this entity will
use BAO's even though they're not in the file-location you might normally expect."

4 years agoMerge pull request #17858 from civicrm/dependabot/npm_and_yarn/lodash-4.17.19
Seamus Lee [Thu, 16 Jul 2020 07:20:51 +0000 (17:20 +1000)]
Merge pull request #17858 from civicrm/dependabot/npm_and_yarn/lodash-4.17.19

Bump lodash from 4.17.15 to 4.17.19

4 years agoMerge pull request #17859 from civicrm/5.28
Eileen McNaughton [Thu, 16 Jul 2020 06:57:59 +0000 (18:57 +1200)]
Merge pull request #17859 from civicrm/5.28

5.28

4 years agoMerge pull request #17836 from seamuslee001/dev_core_1874
Monish Deb [Thu, 16 Jul 2020 06:51:35 +0000 (12:21 +0530)]
Merge pull request #17836 from seamuslee001/dev_core_1874

dev/core#1874 Fix fatal error by passing through the string formatTyp…

4 years agoMerge pull request #17841 from seamuslee001/eventcart_setting
Eileen McNaughton [Thu, 16 Jul 2020 05:52:26 +0000 (17:52 +1200)]
Merge pull request #17841 from seamuslee001/eventcart_setting

[REF] Migrate Event Cart Setting into the Extension

4 years agoBump lodash from 4.17.15 to 4.17.19
dependabot[bot] [Thu, 16 Jul 2020 03:41:11 +0000 (03:41 +0000)]
Bump lodash from 4.17.15 to 4.17.19

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge pull request #17856 from civicrm/5.28
Seamus Lee [Thu, 16 Jul 2020 03:40:41 +0000 (13:40 +1000)]
Merge pull request #17856 from civicrm/5.28

5.28

4 years agoMerge pull request #17851 from alifrumin/5.28rn
Seamus Lee [Thu, 16 Jul 2020 03:40:10 +0000 (13:40 +1000)]
Merge pull request #17851 from alifrumin/5.28rn

[NFC] 5.28 Release Notes First Pass

4 years agoMerge pull request #17857 from demeritcowboy/membershiptest-5.28
Seamus Lee [Thu, 16 Jul 2020 03:39:54 +0000 (13:39 +1000)]
Merge pull request #17857 from demeritcowboy/membershiptest-5.28

[Test framework] - Backport of membership test fix

4 years agoMerge pull request #17854 from demeritcowboy/missing-codeversion-5.28
Seamus Lee [Thu, 16 Jul 2020 01:25:41 +0000 (11:25 +1000)]
Merge pull request #17854 from demeritcowboy/missing-codeversion-5.28

dev/core#1882 - Missing version number in status check message about db version vs code version

4 years agobackport of membership test fix
demeritcowboy [Thu, 16 Jul 2020 01:21:52 +0000 (21:21 -0400)]
backport of membership test fix

4 years agoMerge pull request #17853 from seamuslee001/dev_wordpress_62
Seamus Lee [Thu, 16 Jul 2020 00:42:15 +0000 (10:42 +1000)]
Merge pull request #17853 from seamuslee001/dev_wordpress_62

dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensu…

4 years agodev/core#1090 Update extendedSerializeData to use the Backbone namespace to fix an...
Seamus Lee [Thu, 16 Jul 2020 00:20:28 +0000 (10:20 +1000)]
dev/core#1090 Update extendedSerializeData to use the Backbone namespace to fix an issue with recent versions of elementor wordpress plugin

4 years agomissing version number in message
demeritcowboy [Wed, 15 Jul 2020 23:52:24 +0000 (19:52 -0400)]
missing version number in message

4 years agoMerge pull request #17849 from mattwire/statichandlePaymentNotification
Seamus Lee [Wed, 15 Jul 2020 22:37:39 +0000 (08:37 +1000)]
Merge pull request #17849 from mattwire/statichandlePaymentNotification

handlePaymentNotification() should not be declared as a static method

4 years ago5.28 release notes: first pass
Alice Frumin [Tue, 14 Jul 2020 21:15:53 +0000 (17:15 -0400)]
5.28 release notes: first pass

4 years agodev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensure that sites...
Seamus Lee [Wed, 15 Jul 2020 21:44:41 +0000 (07:44 +1000)]
dev/wordpress#62 Update adrienrn/php-mimetyper gitignore file to ensure that sites that manage their systems using git can access the db.json file

4 years agoMerge pull request #17850 from demeritcowboy/you-only-print-once
Eileen McNaughton [Wed, 15 Jul 2020 20:17:40 +0000 (08:17 +1200)]
Merge pull request #17850 from demeritcowboy/you-only-print-once

[REF] Only printOnly once

4 years agoMerge pull request #17847 from colemanw/versionThreeAndFour
Eileen McNaughton [Wed, 15 Jul 2020 20:12:29 +0000 (08:12 +1200)]
Merge pull request #17847 from colemanw/versionThreeAndFour

API tests - label versions in dataprovider versionThreeAndFour

4 years agoMerge pull request #17848 from lcdservices/dev-core-1880
Eileen McNaughton [Wed, 15 Jul 2020 20:10:55 +0000 (08:10 +1200)]
Merge pull request #17848 from lcdservices/dev-core-1880

dev/core#1880 add backticks to custom field insertions

4 years agoonly printOnly once
demeritcowboy [Wed, 15 Jul 2020 18:53:36 +0000 (14:53 -0400)]
only printOnly once

4 years agoCRM_Core_Payment::handlePaymentNotification() is not a static method
Matthew Wire [Wed, 15 Jul 2020 18:28:27 +0000 (19:28 +0100)]
CRM_Core_Payment::handlePaymentNotification() is not a static method

4 years agodev/core#1880 add backticks to custom field insertions
Brian Shaughnessy [Wed, 15 Jul 2020 17:29:36 +0000 (13:29 -0400)]
dev/core#1880 add backticks to custom field insertions

4 years agoAPI tests - label versions in dataprovider versionThreeAndFour
Coleman Watts [Wed, 15 Jul 2020 13:27:57 +0000 (09:27 -0400)]
API tests - label versions in dataprovider versionThreeAndFour

4 years agoMerge pull request #17845 from totten/master-api4-conf-provider
colemanw [Wed, 15 Jul 2020 13:08:03 +0000 (09:08 -0400)]
Merge pull request #17845 from totten/master-api4-conf-provider

(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests

4 years agoMerge pull request #17844 from demeritcowboy/check-packages
Eileen McNaughton [Wed, 15 Jul 2020 06:50:15 +0000 (18:50 +1200)]
Merge pull request #17844 from demeritcowboy/check-packages

dev/core#1872 - Packages and vendor path calculation used in system check is outdated

4 years ago(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests
Tim Otten [Wed, 15 Jul 2020 05:41:16 +0000 (22:41 -0700)]
(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests

Overview
--------

This updates a unit-test to make the output easier to understand.

We need more output because the test sporadically fails, and we don't know why.

Before
------

There is a function `testConformance()` which internally
loops through a list of entities.

Whenever the test fails, it aborts testing and reports one failure (for all
entities) without indicating the specific entity which failed.

After
-----

There is a test function `testConformance($entity)` which uses
a data provider.

Whenever the test fails, it will be logged with the entity name.
Testing can resume for additional entities.

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

There are a couple technical distinctions between this revision, the
previous revision, and the comparable APIv3 test:

1. Each test-case returned by the '@dataProvider' has a symbolic name.
   These are easier to skim than numeric names.

2. The list of entities is *not* based on runtime services,
   because that constrains how PHPUnit and Civi lifecycles interact.
   It uses a heuristic/low-tech listing (`getEntitiesLotech()`).
   In the rare case where the low-tech list is wrong, it will complain
   and ask for maintenance.

4 years agopaths are no longer always relative to civi root
demeritcowboy [Wed, 15 Jul 2020 04:04:59 +0000 (00:04 -0400)]
paths are no longer always relative to civi root

4 years agoMerge pull request #17842 from seamuslee001/regen
Seamus Lee [Wed, 15 Jul 2020 01:47:19 +0000 (11:47 +1000)]
Merge pull request #17842 from seamuslee001/regen

[NFC] Re run regen after recent merges

4 years agoMerge pull request #17843 from civicrm/5.28
Seamus Lee [Wed, 15 Jul 2020 00:43:12 +0000 (10:43 +1000)]
Merge pull request #17843 from civicrm/5.28

5.28

4 years agoMerge pull request #17840 from seamuslee001/5272_rns
Seamus Lee [Wed, 15 Jul 2020 00:41:00 +0000 (10:41 +1000)]
Merge pull request #17840 from seamuslee001/5272_rns

5.27.1 and 5.27.2 Release Notes

4 years ago[NFC] Re run regen after recent merges
Seamus Lee [Wed, 15 Jul 2020 00:01:08 +0000 (10:01 +1000)]
[NFC] Re run regen after recent merges

4 years agoMerge pull request #17743 from eileenmcnaughton/eventcart
Seamus Lee [Tue, 14 Jul 2020 23:56:17 +0000 (09:56 +1000)]
Merge pull request #17743 from eileenmcnaughton/eventcart

Move BAO and template files into event cart

4 years agoMerge pull request #17839 from eileenmcnaughton/regen
Eileen McNaughton [Tue, 14 Jul 2020 23:30:49 +0000 (11:30 +1200)]
Merge pull request #17839 from eileenmcnaughton/regen

Update regen.sh with new & upcoming core extensions

4 years agoAdd release-notes/5.27.1.md
Tim Otten [Fri, 10 Jul 2020 05:55:29 +0000 (22:55 -0700)]
Add release-notes/5.27.1.md

4 years agoUpdate 5.27.2.md
Tim Otten [Tue, 14 Jul 2020 22:08:56 +0000 (15:08 -0700)]
Update 5.27.2.md

Remove dev/core#1847 - the initial fix caused other regressions, and the full fix merits a longer incubation

4 years ago5.27.2 - Add release notes
Tim Otten [Tue, 14 Jul 2020 21:30:03 +0000 (14:30 -0700)]
5.27.2 - Add release notes

4 years ago[REF] Migrate Event Cart Setting into the Extension
Seamus Lee [Tue, 14 Jul 2020 23:05:43 +0000 (09:05 +1000)]
[REF] Migrate Event Cart Setting into the Extension

4 years agoMerge pull request #17830 from eileenmcnaughton/renewtest
Seamus Lee [Tue, 14 Jul 2020 23:04:51 +0000 (09:04 +1000)]
Merge pull request #17830 from eileenmcnaughton/renewtest

MembershipRenewalTest - Fix failure

4 years agoMove BAO and template files into event cart
eileen [Fri, 3 Jul 2020 08:00:04 +0000 (20:00 +1200)]
Move BAO and template files into event cart

Fix templates Path

4 years agoMerge pull request #17826 from eileenmcnaughton/less_utf
colemanw [Tue, 14 Jul 2020 22:10:16 +0000 (18:10 -0400)]
Merge pull request #17826 from eileenmcnaughton/less_utf

Remove hard coded charset.

4 years agoUpdate regen.sh with new & upcoming core extensions
eileen [Tue, 14 Jul 2020 21:56:12 +0000 (09:56 +1200)]
Update regen.sh with new & upcoming core extensions

Putting this out there in case some goes 'oh I could just write the bash to do that off the folder names
in the directory.....

4 years agoTest fix
eileen [Tue, 14 Jul 2020 09:25:45 +0000 (21:25 +1200)]
Test fix

4 years agodev/core#1874 Fix fatal error by passing through the string formatType rather than...
Seamus Lee [Tue, 14 Jul 2020 21:13:52 +0000 (07:13 +1000)]
dev/core#1874 Fix fatal error by passing through the string formatType rather than the date format when adding datepicker fields from metadata

4 years agoMerge pull request #17833 from totten/master-website-test
Tim Otten [Tue, 14 Jul 2020 19:51:08 +0000 (12:51 -0700)]
Merge pull request #17833 from totten/master-website-test

(REF) WebsiteTest - Mitigate flaky failures

4 years agoremove debugging
demeritcowboy [Tue, 14 Jul 2020 19:46:16 +0000 (15:46 -0400)]
remove debugging

4 years agotest for new Individual form
demeritcowboy [Tue, 14 Jul 2020 19:29:12 +0000 (15:29 -0400)]
test for new Individual form

4 years ago(REF) WebsiteTest - Mitigate flaky failures
Tim Otten [Tue, 14 Jul 2020 18:18:08 +0000 (11:18 -0700)]
(REF) WebsiteTest - Mitigate flaky failures

Overview
--------

In recent days, api_v3_WebsiteTest has emitted sporadic failures like this:

```
api_v3_WebsiteTest::testDeleteWebsite with data set #0 (3)
Failed asserting that 3 matches expected 0.

/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:75
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```

and

```
api_v3_WebsiteTest::testDeleteWebsiteInvalid with data set #0 (3)
Failed asserting that 4 matches expected 1.

/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:88
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```

These failures do not reproduce for me in isolation.

Before
------

Both the failing assertions make an implicit assumption that the baseline content of `civicrm_website` is empty.

After
-----

The failing assertions use an explicit baseline (`$beforeCount`).

Comments
--------

The test failures are sporadic and only seem to seem occur when run in the full suite.

My theory is that something else is leaking `civicrm_website` records;
however, it's hard to track that down amidst a full suite (when the full
suite takes so long to execute).  Therefore, I cannot be certain that this
is actually fixes the problem.  However, this really just tightens up the
assumptions of the test - as long as it passes the PR tests, it should be
safe to merge and then watch in the `CiviCRM-Core-Matrix`.

4 years agoMerge pull request #17815 from spalmstr/dev/core#1812
Mathieu Lu [Tue, 14 Jul 2020 13:55:04 +0000 (09:55 -0400)]
Merge pull request #17815 from spalmstr/dev/core#1812

dev/core#1812 Missing view when logging set in a non-US English instance

4 years agoMerge pull request #13958 from JMAConsulting/core-785
Mathieu Lu [Tue, 14 Jul 2020 13:43:50 +0000 (09:43 -0400)]
Merge pull request #13958 from JMAConsulting/core-785

dev/core#785 Differentiate smart group from regular group using icon in select2 field

4 years agoMerge pull request #17766 from colemanw/activityContacts
colemanw [Tue, 14 Jul 2020 13:29:20 +0000 (09:29 -0400)]
Merge pull request #17766 from colemanw/activityContacts

APIv4 - Add activity contacts to APIv4 field spec

4 years agoMerge pull request #17825 from eileenmcnaughton/utf8
Eileen McNaughton [Tue, 14 Jul 2020 05:54:16 +0000 (17:54 +1200)]
Merge pull request #17825 from eileenmcnaughton/utf8

Adjust mysql SET NAMES in remaining places as we agreed this was the go

4 years agoMerge pull request #17569 from JMAConsulting/core-1805
Eileen McNaughton [Tue, 14 Jul 2020 04:59:50 +0000 (16:59 +1200)]
Merge pull request #17569 from JMAConsulting/core-1805

core#1805: Autocomplete-select custom field is not searchable

4 years agoRemove hard coded charset.
eileen [Tue, 14 Jul 2020 04:51:45 +0000 (16:51 +1200)]
Remove hard coded charset.

In thinking about the proposal here
https://github.com/civicrm/civicrm-core/pull/13633/files#diff-c5e39924ad99ac88b48763a0d8fa246eR30
to switch to utf8mb4 I found that none of the places on the web that suggest functions like ours
specifiy charset - eg. https://stackoverflow.com/questions/287105/mysql-strip-non-numeric-characters-to-compare

When I look at the code it is iterating through the characters to find integers - which should
be the same regardless of charset. So, I think we can simply remove it.
:

4 years agoAdjust mysql SET NAMES in remaining places as we agreed this was the go
eileen [Tue, 14 Jul 2020 04:33:14 +0000 (16:33 +1200)]
Adjust mysql SET NAMES in remaining places as we agreed this was the go

4 years agoMerge pull request #17695 from MegaphoneJon/event-template-fix
Eileen McNaughton [Tue, 14 Jul 2020 04:05:11 +0000 (16:05 +1200)]
Merge pull request #17695 from MegaphoneJon/event-template-fix

event#38 fix wording on event reg page

4 years agoMerge pull request #17513 from JMAConsulting/core-1795
Eileen McNaughton [Tue, 14 Jul 2020 03:16:22 +0000 (15:16 +1200)]
Merge pull request #17513 from JMAConsulting/core-1795

core#1795: Searchable Parent tags

4 years agoAPIv4 - Add activity contacts to APIv4 field spec
Coleman Watts [Mon, 6 Jul 2020 21:59:31 +0000 (17:59 -0400)]
APIv4 - Add activity contacts to APIv4 field spec

The BAO supports these pseudo-fields during save operations, this exposes them to the api explorer.

4 years agoMerge pull request #17709 from spalmstr/dev/core#1768
Seamus Lee [Tue, 14 Jul 2020 01:54:55 +0000 (11:54 +1000)]
Merge pull request #17709 from spalmstr/dev/core#1768

dev/core#1768 - Add CiviMail synchronisation frequency setting.

4 years agoMerge pull request #17813 from JKingsnorth/patch-15
Seamus Lee [Tue, 14 Jul 2020 00:57:01 +0000 (10:57 +1000)]
Merge pull request #17813 from JKingsnorth/patch-15

Make new email open and url routes 'public'

4 years agoMerge pull request #17809 from eileenmcnaughton/jong
Seamus Lee [Tue, 14 Jul 2020 00:54:48 +0000 (10:54 +1000)]
Merge pull request #17809 from eileenmcnaughton/jong

Test for https://github.com/civicrm/civicrm-core/pull/15435

4 years agoMerge pull request #17822 from demeritcowboy/packages-include-path
Seamus Lee [Tue, 14 Jul 2020 00:54:01 +0000 (10:54 +1000)]
Merge pull request #17822 from demeritcowboy/packages-include-path

dev/core#1871 - require_once's that include "packages/" in the path don't work on drupal 8

4 years agoRemove unnecessary try/catch per #17729
Coleman Watts [Tue, 14 Jul 2020 00:07:17 +0000 (20:07 -0400)]
Remove unnecessary try/catch per #17729

4 years agoMerge pull request #17729 from colemanw/upgradeSafeApi
Eileen McNaughton [Mon, 13 Jul 2020 23:56:43 +0000 (11:56 +1200)]
Merge pull request #17729 from colemanw/upgradeSafeApi

Make api get upgrade-safe

4 years agoMerge pull request #17799 from civicrm/5.28
Eileen McNaughton [Mon, 13 Jul 2020 23:36:14 +0000 (11:36 +1200)]
Merge pull request #17799 from civicrm/5.28

5.28

4 years agoMerge pull request #17820 from seamuslee001/1867_qill
Seamus Lee [Mon, 13 Jul 2020 23:24:12 +0000 (09:24 +1000)]
Merge pull request #17820 from seamuslee001/1867_qill

dev/core#1867 Ensure that the qill matches the filter when no time is…

4 years agopackages is already in include_path
demeritcowboy [Mon, 13 Jul 2020 23:09:23 +0000 (19:09 -0400)]
packages is already in include_path

4 years agoMerge pull request #17780 from totten/master-sync-into
Eileen McNaughton [Mon, 13 Jul 2020 22:56:39 +0000 (10:56 +1200)]
Merge pull request #17780 from totten/master-sync-into

CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers

4 years agoTest for https://github.com/civicrm/civicrm-core/pull/15435
eileen [Mon, 13 Jul 2020 03:51:29 +0000 (15:51 +1200)]
Test for https://github.com/civicrm/civicrm-core/pull/15435

4 years agodev/core#1867 Ensure that the qill matches the filter when no time is supplied
Seamus Lee [Mon, 13 Jul 2020 22:19:48 +0000 (08:19 +1000)]
dev/core#1867 Ensure that the qill matches the filter when no time is supplied

4 years agoMerge pull request #17811 from eileenmcnaughton/fromto
Seamus Lee [Mon, 13 Jul 2020 22:20:02 +0000 (08:20 +1000)]
Merge pull request #17811 from eileenmcnaughton/fromto

dev/core#1867 CiviReport filters: Fix incorrect defaulting to the beginning rather than end the to-range day

4 years agoMerge pull request #17814 from eileenmcnaughton/dedupe
Seamus Lee [Mon, 13 Jul 2020 22:05:09 +0000 (08:05 +1000)]
Merge pull request #17814 from eileenmcnaughton/dedupe

Fix dedupe on same-activity-connection

4 years agoMerge pull request #17800 from colemanw/cronCheck
Eileen McNaughton [Mon, 13 Jul 2020 20:58:23 +0000 (08:58 +1200)]
Merge pull request #17800 from colemanw/cronCheck

CheckEnv - Give new installs a grace period before 'Cron Not Running' msg

4 years agoMerge pull request #17816 from JKingsnorth/patch-16
Eileen McNaughton [Mon, 13 Jul 2020 20:14:57 +0000 (08:14 +1200)]
Merge pull request #17816 from JKingsnorth/patch-16

Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()'

4 years agoMerge pull request #17812 from eileenmcnaughton/uff
Eileen McNaughton [Mon, 13 Jul 2020 20:10:22 +0000 (08:10 +1200)]
Merge pull request #17812 from eileenmcnaughton/uff

dev/core#1861 fix failure to unset location_type_id when saving uffield

4 years agoMerge pull request #17807 from colemanw/nonProdCronCheck
Eileen McNaughton [Mon, 13 Jul 2020 19:53:39 +0000 (07:53 +1200)]
Merge pull request #17807 from colemanw/nonProdCronCheck

dev/core#1863 Downgrade checkEnvironment level and skip non-prod checks

4 years agoCheckEnv - Give new installs a grace period before 'Cron Not Running' error
Coleman Watts [Sun, 12 Jul 2020 22:59:37 +0000 (18:59 -0400)]
CheckEnv - Give new installs a grace period before 'Cron Not Running' error

4 years agodev/core#1812
Stephen Palmstrom [Mon, 13 Jul 2020 16:14:05 +0000 (17:14 +0100)]
dev/core#1812

4 years ago[NFC] Ensure jsSet returned variable exists
John Kingsnorth [Mon, 13 Jul 2020 12:18:59 +0000 (13:18 +0100)]
[NFC] Ensure jsSet returned variable exists

4 years agoFix dedupe on same-activity-connection
eileen [Mon, 13 Jul 2020 11:09:34 +0000 (23:09 +1200)]
Fix dedupe on same-activity-connection

4 years agoMake email open and url routes public
John Kingsnorth [Mon, 13 Jul 2020 10:55:24 +0000 (11:55 +0100)]
Make email open and url routes public

4 years agoMerge pull request #17803 from eileenmcnaughton/dedupe
Seamus Lee [Mon, 13 Jul 2020 09:55:19 +0000 (19:55 +1000)]
Merge pull request #17803 from eileenmcnaughton/dedupe

dev/core#1862 Skip cache tables during merge, rely on cache management processes

4 years agodev/core#1861 fix failure to unset location_type_id when saving uffield
eileen [Mon, 13 Jul 2020 07:06:27 +0000 (19:06 +1200)]
dev/core#1861 fix failure to unset location_type_id when saving uffield

https://lab.civicrm.org/dev/core/-/issues/1861

If this is a regression it probably from 2017
https://github.com/civicrm/civicrm-core/commit/2e74ff5574027b2ce84177b82884ebd7c9b87fd1#diff-1911d0c1a896701ba9aa044181f5972bR556

4 years agoFix incorrect defaulting to the beginning rather than end the to-range day
eileen [Mon, 13 Jul 2020 05:47:08 +0000 (17:47 +1200)]
Fix incorrect defaulting to the beginning rather than end the to-range day

4 years agodev/core#1862 Skip cache tables during merge, rely on cache management processes
eileen [Mon, 13 Jul 2020 01:15:28 +0000 (13:15 +1200)]
dev/core#1862 Skip cache tables during merge, rely on cache management processes

We later call Contact.create on both contacts so that should manage the caches for this update 'as well as for any other update'
and solve the bug + reduce locking queries