civicrm-core.git
4 years agoTrigger fatalErrorHandler for PEAR errors and for logs with severity ERROR or higher
Matthew Wire [Sun, 10 May 2020 11:03:25 +0000 (12:03 +0100)]
Trigger fatalErrorHandler for PEAR errors and for logs with severity ERROR or higher

4 years agoMerge pull request #16484 from yashodha/dev_1580
Matthew Wire [Sun, 10 May 2020 10:33:38 +0000 (11:33 +0100)]
Merge pull request #16484 from yashodha/dev_1580

(dev/core#1580) Allow to search on contribution id

4 years agoMerge pull request #17067 from colemanw/importSubmit
Matthew Wire [Sun, 10 May 2020 10:28:00 +0000 (11:28 +0100)]
Merge pull request #17067 from colemanw/importSubmit

dev/user-interface#17 Fix popup confirmation on import forms

4 years agoMerge pull request #17072 from eileenmcnaughton/dupe
Matthew Wire [Sun, 10 May 2020 10:26:33 +0000 (11:26 +0100)]
Merge pull request #17072 from eileenmcnaughton/dupe

Merge code - remove UPDATE IGNORE+Delete & just use reliable update

4 years agoMerge pull request #17079 from yashodha/dev-1704
Matthew Wire [Sun, 10 May 2020 10:25:09 +0000 (11:25 +0100)]
Merge pull request #17079 from yashodha/dev-1704

respect file fields that have been configured as view only in profiles

4 years agoMerge pull request #17260 from demeritcowboy/csv-apostrophe
Matthew Wire [Sun, 10 May 2020 10:22:43 +0000 (11:22 +0100)]
Merge pull request #17260 from demeritcowboy/csv-apostrophe

dev/core#1743 - Fix decoding of apostrophes in csv export from CiviReports

4 years agoMerge pull request #17245 from agh1/chevrons
Matthew Wire [Sun, 10 May 2020 10:17:01 +0000 (11:17 +0100)]
Merge pull request #17245 from agh1/chevrons

Decorative chevrons should be icons not angle quotes

4 years agoMerge pull request #17257 from colemanw/tagParam
Matthew Wire [Sun, 10 May 2020 10:12:42 +0000 (11:12 +0100)]
Merge pull request #17257 from colemanw/tagParam

Tag create: respect created_date and created_id params

4 years agoMerge pull request #17268 from colemanw/getBAOClassName
Matthew Wire [Sun, 10 May 2020 10:11:02 +0000 (11:11 +0100)]
Merge pull request #17268 from colemanw/getBAOClassName

Add getBAOClassName utiltiy function

4 years agoMerge pull request #17269 from greenpeace-cee/simplify-length-test
Matthew Wire [Sun, 10 May 2020 10:10:03 +0000 (11:10 +0100)]
Merge pull request #17269 from greenpeace-cee/simplify-length-test

CRM/Logging - Remove obsolete cache static clear in test

4 years agoMerge pull request #17267 from eileenmcnaughton/bag
Matthew Wire [Sun, 10 May 2020 10:09:36 +0000 (11:09 +0100)]
Merge pull request #17267 from eileenmcnaughton/bag

Add propertyBag handling for getEmail when incoming uses email-5

4 years agoMerge pull request #17270 from totten/master-regtest
colemanw [Sat, 9 May 2020 13:06:04 +0000 (09:06 -0400)]
Merge pull request #17270 from totten/master-regtest

(NFC) RegionTest - Small cleanups

4 years ago(NFC) RegionTest - Small cleanups
Tim Otten [Sat, 9 May 2020 02:40:08 +0000 (19:40 -0700)]
(NFC) RegionTest - Small cleanups

4 years agoCRM/Logging - Remove obsolete cache static clear in test
Patrick Figel [Sat, 9 May 2020 02:20:22 +0000 (04:20 +0200)]
CRM/Logging - Remove obsolete cache static clear in test

This simplifies CRM_Logging_SchemaTest::testLengthChange() and
CRM_Logging_SchemaTest::testEnumChange() by removing a manual reset on
a cache static and a second call to
CRM_Logging_Schema::fixSchemaDifferences(). This was made obsolete by
a40a5a4875bf5caa03eaa8732c958f5c714c7b61, which has added a cache flush
to fixSchemaDifferences() via fixSchemaDifferencesForAll().

4 years agoAdd getBAOClassName utiltiy function
Coleman Watts [Sat, 9 May 2020 01:30:46 +0000 (21:30 -0400)]
Add getBAOClassName utiltiy function

4 years agoAdd propertyBag handling for getEmail when incoming uses email-5
eileen [Sat, 9 May 2020 00:11:15 +0000 (12:11 +1200)]
Add propertyBag handling for getEmail when incoming uses email-5

Calling code is often setting email-5. The property bag should iron out this inconsistency, and getEmail (and similar)
should handle the appended billing id. We can't do this in the static property map as it is a calculated variable

4 years agoMerge pull request #17263 from civicrm/5.26
Seamus Lee [Fri, 8 May 2020 22:47:02 +0000 (08:47 +1000)]
Merge pull request #17263 from civicrm/5.26

5.26

4 years agoMerge pull request #17264 from colemanw/grantCleanup
Seamus Lee [Fri, 8 May 2020 22:33:03 +0000 (08:33 +1000)]
Merge pull request #17264 from colemanw/grantCleanup

[REF] Grant BAO cleanup

4 years agoMerge pull request #17255 from agh1/sr-only
Tim Otten [Fri, 8 May 2020 21:37:56 +0000 (14:37 -0700)]
Merge pull request #17255 from agh1/sr-only

[NFC] Add sr-only class for content only for screen readers

4 years agoGrant BAO cleanup
Coleman Watts [Fri, 8 May 2020 14:11:14 +0000 (10:11 -0400)]
Grant BAO cleanup

4 years agoTag create cleanup: respect created_date and created_id params
Coleman Watts [Thu, 7 May 2020 21:11:19 +0000 (17:11 -0400)]
Tag create cleanup: respect created_date and created_id params

4 years agoMerge pull request #17262 from totten/5.26-test-sql-op
Seamus Lee [Fri, 8 May 2020 11:05:52 +0000 (21:05 +1000)]
Merge pull request #17262 from totten/5.26-test-sql-op

SyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8

4 years agoMerge pull request #17183 from eileenmcnaughton/tax_t
Seamus Lee [Fri, 8 May 2020 08:46:51 +0000 (18:46 +1000)]
Merge pull request #17183 from eileenmcnaughton/tax_t

Remove incorrect retrievals of tax-term setting

4 years agoSyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8
Tim Otten [Fri, 8 May 2020 03:53:21 +0000 (20:53 -0700)]
SyntaxConformanceTest::testSqlOperators - Fix failure on MySQL 8

Before
------

`SyntaxConformanceTest::testSqlOperators` frequently fails on the `Dedupe` entity when running on MySQL 8 (`bknix-edge`).

After
------

`SyntaxConformanceTest::testSqlOperators` repeatedly passes for all entities on my copy of MySQL 8 (`bknix-edge`).

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

The `testSqlOperators` creates a small pool of example records
(`$entities`), then it slices/dices that pool with a few SQL operators and
asserts the number of matches.

In particular:

```php
$this->callAPISuccessGetCount($entityName, ['id' => ['>' => $entities[0]]], $totalEntities - 1);
```

The problem is that `$entities[0]` does not necessarily have the lowest ID
-- because `$entities` was not fetched in any particular order.  The default
ordering is *often* the same as the `id`, but not always.

I suspect that this problem manifests most frequently with the `Dedupe`
entity because the underlying table (`civicrm_prevnext_cache`) is highly
volatile (many writes+deletes) -- thus it's more likely to reuse old storage
slots for new rows.

4 years agoSet version to 5.27.alpha1
CiviCRM [Fri, 8 May 2020 02:45:28 +0000 (02:45 +0000)]
Set version to 5.27.alpha1

4 years agoSet version to 5.26.beta1
CiviCRM [Fri, 8 May 2020 02:35:13 +0000 (02:35 +0000)]
Set version to 5.26.beta1

4 years agoMerge pull request #17227 from eileenmcnaughton/workflow_name
Tim Otten [Fri, 8 May 2020 01:39:21 +0000 (18:39 -0700)]
Merge pull request #17227 from eileenmcnaughton/workflow_name

Add workflow_name column to civicrm_msg_template, deprecate workflow_id

4 years agoMerge pull request #17258 from demeritcowboy/fix-getfromto-workaround
Seamus Lee [Thu, 7 May 2020 23:39:14 +0000 (09:39 +1000)]
Merge pull request #17258 from demeritcowboy/fix-getfromto-workaround

[NFC/Test] - Fix typo in `if` statement that seems intended as a workaround

4 years agofix decoding of apostrophes
demeritcowboy [Thu, 7 May 2020 21:12:59 +0000 (17:12 -0400)]
fix decoding of apostrophes

4 years agoChevrons in civimail steps replaced
Andrew Hunt [Thu, 7 May 2020 22:25:52 +0000 (18:25 -0400)]
Chevrons in civimail steps replaced

4 years agofix typo in workaround
demeritcowboy [Thu, 7 May 2020 21:14:21 +0000 (17:14 -0400)]
fix typo in workaround

4 years agoMessageTemplate API - Keep the workflow_id and workflow_name sync'd
Tim Otten [Thu, 7 May 2020 09:21:07 +0000 (02:21 -0700)]
MessageTemplate API - Keep the workflow_id and workflow_name sync'd

4 years ago[NFC] Add sr-only class for content only for screen readers
Andrew Hunt [Thu, 7 May 2020 14:59:00 +0000 (10:59 -0400)]
[NFC] Add sr-only class for content only for screen readers

4 years agoMerge pull request #17252 from civicrm/5.25
Seamus Lee [Thu, 7 May 2020 09:28:42 +0000 (19:28 +1000)]
Merge pull request #17252 from civicrm/5.25

5.25

4 years agosql/civicrm_generated.mysql - Update with current message template schema
Tim Otten [Thu, 7 May 2020 07:34:15 +0000 (00:34 -0700)]
sql/civicrm_generated.mysql - Update with current message template schema

4 years agoAdd workflow_name column to civicrm_msg_template, deprecate workflow_id
eileen [Mon, 4 May 2020 00:49:48 +0000 (12:49 +1200)]
Add workflow_name column to civicrm_msg_template, deprecate workflow_id

4 years agoMerge pull request #17251 from totten/master-hooktest
Tim Otten [Thu, 7 May 2020 06:08:55 +0000 (23:08 -0700)]
Merge pull request #17251 from totten/master-hooktest

E2E_Core_HookTest - Fix test failure due to leak

4 years agoMerge pull request #17249 from totten/5.25-backdrop-install
Seamus Lee [Thu, 7 May 2020 05:43:30 +0000 (15:43 +1000)]
Merge pull request #17249 from totten/5.25-backdrop-install

install/index.php - Fix leak which breaks compatibility with current Backdrop

4 years agoE2E_Core_HookTest - Fix test failure due to leak
Tim Otten [Thu, 7 May 2020 04:51:10 +0000 (21:51 -0700)]
E2E_Core_HookTest - Fix test failure due to leak

Before
------

The `HookTest` class fails when running on WordPress.

The event-listener from `testSymfonyListener_names` leaks and remains active during `testSymfonyListener_int`.

After
-----

The `HookTest` class passes when running on WordPress.

The event-listeners from `testSymfonyListener_names` and `testSymfonyListener_int` are cleaned up.

4 years agoUpdate release-notes/5.25.0.md
Tim Otten [Thu, 7 May 2020 04:25:53 +0000 (21:25 -0700)]
Update release-notes/5.25.0.md

4 years agoinstall/index.php - Fix leak which breaks compatibility with current Backdrop
Tim Otten [Thu, 7 May 2020 04:13:22 +0000 (21:13 -0700)]
install/index.php - Fix leak which breaks compatibility with current Backdrop

4 years agoMerge pull request #17248 from seamuslee001/master
Seamus Lee [Thu, 7 May 2020 03:57:07 +0000 (13:57 +1000)]
Merge pull request #17248 from seamuslee001/master

5.25

4 years agoMerge in 5.25
Seamus Lee [Thu, 7 May 2020 03:55:55 +0000 (13:55 +1000)]
Merge in 5.25

4 years agoMerge pull request #17247 from totten/5.25-finalize
Tim Otten [Thu, 7 May 2020 03:39:38 +0000 (20:39 -0700)]
Merge pull request #17247 from totten/5.25-finalize

5.25.0 - Small finalizations

4 years agoSet version to 5.25.0
Tim Otten [Thu, 7 May 2020 03:29:09 +0000 (20:29 -0700)]
Set version to 5.25.0

4 years agorelease-notes/5.25.0.md - Small copy edits
Tim Otten [Thu, 7 May 2020 03:21:40 +0000 (20:21 -0700)]
release-notes/5.25.0.md - Small copy edits

4 years agoFinal chunk of chevrons replaced
Andrew Hunt [Wed, 6 May 2020 23:45:19 +0000 (19:45 -0400)]
Final chunk of chevrons replaced

4 years agoFinished replacing the bulk of right angle quotes for links and buttons
Andrew Hunt [Wed, 6 May 2020 23:30:09 +0000 (19:30 -0400)]
Finished replacing the bulk of right angle quotes for links and buttons

4 years agoMerge pull request #17243 from civicrm/5.25
Seamus Lee [Wed, 6 May 2020 23:04:14 +0000 (09:04 +1000)]
Merge pull request #17243 from civicrm/5.25

5.25

4 years agoFirst round of replacing `»` with chevron icon
Andrew Hunt [Wed, 6 May 2020 22:16:39 +0000 (18:16 -0400)]
First round of replacing `»` with chevron icon

4 years agoMerge pull request #17238 from seamuslee001/dev_core_1739
Seamus Lee [Wed, 6 May 2020 22:05:52 +0000 (08:05 +1000)]
Merge pull request #17238 from seamuslee001/dev_core_1739

dev/core#1739 Enable Longitude on Address editing by default (option 12)

4 years agoMerge pull request #17242 from agh1/5.25.0-releasenotes-final
Seamus Lee [Wed, 6 May 2020 21:25:02 +0000 (07:25 +1000)]
Merge pull request #17242 from agh1/5.25.0-releasenotes-final

5.25.0 release notes final edits

4 years ago5.25.0 release notes: final edits
Andrew Hunt [Wed, 6 May 2020 17:57:29 +0000 (13:57 -0400)]
5.25.0 release notes: final edits

4 years agoMerge pull request #17241 from agh1/apiv4-access-civicrm-or-ajax-api
colemanw [Wed, 6 May 2020 17:10:43 +0000 (13:10 -0400)]
Merge pull request #17241 from agh1/apiv4-access-civicrm-or-ajax-api

Api4 AJAX endpoint: allow either access CiviCRM or access AJAX API

4 years agoApi4 AJAX endpoint: allow either access CiviCRM or access AJAX API
Andrew Hunt [Wed, 6 May 2020 16:01:52 +0000 (12:01 -0400)]
Api4 AJAX endpoint: allow either access CiviCRM or access AJAX API

4 years ago5.25.0 release notes: halfway through final edits
Andrew Hunt [Wed, 6 May 2020 16:00:02 +0000 (12:00 -0400)]
5.25.0 release notes: halfway through final edits

4 years agoMerge pull request #17239 from colemanw/fixSchemaMap
colemanw [Wed, 6 May 2020 15:27:14 +0000 (11:27 -0400)]
Merge pull request #17239 from colemanw/fixSchemaMap

APIv4 - Fix schema map to use canonical field names

4 years ago5.25.0 release notes: added late changes
Andrew Hunt [Wed, 6 May 2020 14:56:38 +0000 (10:56 -0400)]
5.25.0 release notes: added late changes

4 years agoMerge pull request #17240 from totten/master-event-names
Matthew Wire [Wed, 6 May 2020 08:09:44 +0000 (09:09 +0100)]
Merge pull request #17240 from totten/master-event-names

(REF) dev/core#1744 - Cleanup event naming

4 years agodev/core#1744 - Civi/API - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:37:40 +0000 (19:37 -0700)]
dev/core#1744 - Civi/API - Simplify event naming

4 years agodev/core#1744 - SystemInstallEvent - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:21:59 +0000 (19:21 -0700)]
dev/core#1744 - SystemInstallEvent - Simplify event naming

4 years agodev/core#1744 - ActionSchedule - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:17:03 +0000 (19:17 -0700)]
dev/core#1744 - ActionSchedule - Simplify event naming

4 years agodev/core#1744 - Civi/Token - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:12:53 +0000 (19:12 -0700)]
dev/core#1744 - Civi/Token - Simplify event naming

4 years agoMerge pull request #17236 from civicrm/5.25
Eileen McNaughton [Wed, 6 May 2020 00:51:42 +0000 (12:51 +1200)]
Merge pull request #17236 from civicrm/5.25

5.25

4 years agodev/core#1563 - Fix schema map to use canonical field names
Coleman Watts [Wed, 6 May 2020 00:32:17 +0000 (20:32 -0400)]
dev/core#1563 - Fix schema map to use canonical field names

This fixes a bug in SchemaMapBuilder where it was accidentally using "unique names"
which do not map to the real names of db columns.

4 years agodev/core#1739 Enable Longitude on Address editing by default (option 12)
Seamus Lee [Tue, 5 May 2020 23:37:14 +0000 (09:37 +1000)]
dev/core#1739 Enable Longitude on Address editing by default (option 12)

4 years agoMerge pull request #17232 from seamuslee001/dev_core_1742
Eileen McNaughton [Tue, 5 May 2020 23:27:29 +0000 (11:27 +1200)]
Merge pull request #17232 from seamuslee001/dev_core_1742

dev/core#1742 Expose CiviCRM Database details for views configuration…

4 years agoMerge pull request #17197 from eileenmcnaughton/act_r_test
Seamus Lee [Tue, 5 May 2020 23:26:07 +0000 (09:26 +1000)]
Merge pull request #17197 from eileenmcnaughton/act_r_test

[REF] [Test] IDE cleanup on ReportTemplateTest

4 years agoMerge pull request #17234 from MegaphoneJon/reporting-20-alt
Seamus Lee [Tue, 5 May 2020 23:23:55 +0000 (09:23 +1000)]
Merge pull request #17234 from MegaphoneJon/reporting-20-alt

Reporting #20 - correct stats when force=1 on Contribution Detail Report

4 years agoMerge pull request #16584 from eileenmcnaughton/role
Seamus Lee [Tue, 5 May 2020 23:19:39 +0000 (09:19 +1000)]
Merge pull request #16584 from eileenmcnaughton/role

[REF] Simplify non-creditcard participant.create

4 years agoMerge pull request #17237 from eileenmcnaughton/525
Seamus Lee [Tue, 5 May 2020 23:17:20 +0000 (09:17 +1000)]
Merge pull request #17237 from eileenmcnaughton/525

(dev/core#1740) Cumulative contributions not being calculated with the correct criteria

4 years ago(dev/core#1740) Cumulative contributions not being calculated with the correct criteria
yashodha [Mon, 4 May 2020 14:40:13 +0000 (20:10 +0530)]
(dev/core#1740) Cumulative contributions not being calculated with the correct criteria

4 years agoMerge pull request #17026 from jitendrapurohit/dev-57
Eileen McNaughton [Tue, 5 May 2020 21:59:27 +0000 (09:59 +1200)]
Merge pull request #17026 from jitendrapurohit/dev-57

dev/core#57 On Behalf Of fails to populate in Email Receipt

4 years agoMerge pull request #17235 from colemanw/apiLog
Eileen McNaughton [Tue, 5 May 2020 21:40:02 +0000 (09:40 +1200)]
Merge pull request #17235 from colemanw/apiLog

APIv4 - Deprecate option_value joins and display notices in Explorer

4 years agoMerge pull request #17233 from alifrumin/rn5.25
Seamus Lee [Tue, 5 May 2020 21:08:03 +0000 (07:08 +1000)]
Merge pull request #17233 from alifrumin/rn5.25

[NFC] First Pass at 5.25 release notes

4 years agoAPIv4 - Deprecate option_value joins in favor of pseudoconstant suffix
Coleman Watts [Tue, 5 May 2020 19:52:08 +0000 (15:52 -0400)]
APIv4 - Deprecate option_value joins in favor of pseudoconstant suffix

4 years agoAPI - Display all logged warnings, errors, etc. in debug output and APIv4 explorer.
Coleman Watts [Tue, 5 May 2020 19:19:08 +0000 (15:19 -0400)]
API - Display all logged warnings, errors, etc. in debug output and APIv4 explorer.

4 years agoReporting #20 - correct stats when force=1 on Contribution Detail Report
Jon Goldberg [Tue, 5 May 2020 15:37:39 +0000 (11:37 -0400)]
Reporting #20 - correct stats when force=1 on Contribution Detail Report

4 years agoMerge pull request #17231 from totten/master-token-tweak
colemanw [Tue, 5 May 2020 14:56:03 +0000 (10:56 -0400)]
Merge pull request #17231 from totten/master-token-tweak

(REF,NFC) TokenProcessor - Minor DX improvements

4 years agoFirst Pass at 5.25 releasenotes
Alice Frumin [Thu, 23 Apr 2020 19:43:41 +0000 (15:43 -0400)]
First Pass at 5.25 releasenotes

4 years agoMerge pull request #17230 from seamuslee001/domain_token_thank_you_letter
Monish Deb [Tue, 5 May 2020 13:49:16 +0000 (19:19 +0530)]
Merge pull request #17230 from seamuslee001/domain_token_thank_you_letter

[REF] Permit domain tokens being used within Thank You letters

4 years ago[REF] Permit domain tokens being used within Thank You letters
Seamus Lee [Tue, 5 May 2020 06:58:07 +0000 (16:58 +1000)]
[REF] Permit domain tokens being used within Thank You letters

Re-arrange code as per Matt's comment

4 years agodev/core#1742 Expose CiviCRM Database details for views configuration in Drupal 8...
Seamus Lee [Tue, 5 May 2020 10:07:57 +0000 (20:07 +1000)]
dev/core#1742 Expose CiviCRM Database details for views configuration in Drupal 8 as well as in Drupal 7 and Backdrop

4 years ago(NFC) TokenProcessor - Improve docblocks
Tim Otten [Tue, 5 May 2020 09:01:15 +0000 (02:01 -0700)]
(NFC) TokenProcessor - Improve docblocks

4 years ago(REF) TokenProcessor - Allowing adding rows by array
Tim Otten [Tue, 5 May 2020 05:54:38 +0000 (22:54 -0700)]
(REF) TokenProcessor - Allowing adding rows by array

Before
-------------------

When composing a message, you need to add a row and then use the fluent
`TokenRow` stub, eg:

```php
$p->addRow()->context(['contact_id' => 123]);
$p->addRow()->context(['contact_id' => 456]);
```

After
-------------------

When composing a message, you don't have to use the fluent `TokenRow` stub.
Just give an array:

```php
$p->addRow(['contact_id' => 123]);
$p->addRow(['contact_id' => 456]);
```

Or:

```php
$p->addRows([
  ['contact_id' => 123],
  ['contact_id' => 456],
]);
```

You still have the option of using the fluent interface.

4 years ago(NFC) TokenRow - Improve docblocks
Tim Otten [Tue, 5 May 2020 04:35:18 +0000 (21:35 -0700)]
(NFC) TokenRow - Improve docblocks

4 years agoMerge pull request #17212 from eileenmcnaughton/fatal
Eileen McNaughton [Tue, 5 May 2020 04:23:01 +0000 (16:23 +1200)]
Merge pull request #17212 from eileenmcnaughton/fatal

Convert fatals to statusBounces in case forms

4 years agoAttempt to remove UPDATE IGNORE+Delete & just use reliable update
eileen [Tue, 14 Apr 2020 01:04:12 +0000 (13:04 +1200)]
Attempt to remove UPDATE IGNORE+Delete & just use reliable update

Now we are no longer doing weird stuff with custom fields this should suffice

4 years agoMerge pull request #17124 from totten/master-hook-cleanup
Eileen McNaughton [Tue, 5 May 2020 01:02:03 +0000 (13:02 +1200)]
Merge pull request #17124 from totten/master-hook-cleanup

(REF) CRM_Utils_Hook - Remove deprecated formulations of `invoke(int,…)`

4 years agoMerge pull request #17126 from totten/master-upgr-dispatch
Eileen McNaughton [Tue, 5 May 2020 00:57:58 +0000 (12:57 +1200)]
Merge pull request #17126 from totten/master-upgr-dispatch

dev/core#1460, dev/core#1713 - Categorical fix for upgrade<=>hook issues

4 years agoMerge pull request #17006 from mattwire/l10nallowoverrideinherit
Matthew Wire [Mon, 4 May 2020 11:45:19 +0000 (12:45 +0100)]
Merge pull request #17006 from mattwire/l10nallowoverrideinherit

Allow override of inherited CMS language when in CiviCRM

4 years agoMerge pull request #17130 from jitendrapurohit/mail-62
Seamus Lee [Mon, 4 May 2020 09:31:14 +0000 (19:31 +1000)]
Merge pull request #17130 from jitendrapurohit/mail-62

dev/mail#62 - Mailing Error when civicrm_mailing_group has duplicate …

4 years agoMerge pull request #17091 from colemanw/noArrayValue
Seamus Lee [Mon, 4 May 2020 09:21:39 +0000 (19:21 +1000)]
Merge pull request #17091 from colemanw/noArrayValue

[REF] Switch CRM_Utils_Array::value to empty in conditionals

4 years agoMerge pull request #17175 from eileenmcnaughton/batch
Seamus Lee [Mon, 4 May 2020 09:09:21 +0000 (19:09 +1000)]
Merge pull request #17175 from eileenmcnaughton/batch

Further removal of long-deprecated skipCleanMoney

4 years agoMerge pull request #17225 from eileenmcnaughton/cont
colemanw [Mon, 4 May 2020 01:13:11 +0000 (21:13 -0400)]
Merge pull request #17225 from eileenmcnaughton/cont

[REF] Minor code cleanup

4 years agoMerge pull request #17219 from colemanw/api4deprecateOptions
Eileen McNaughton [Sun, 3 May 2020 23:55:22 +0000 (11:55 +1200)]
Merge pull request #17219 from colemanw/api4deprecateOptions

APIv4 - Deprecate old way of retrieving activityType/optionValue ids

4 years ago[REF] Minor code cleanup
eileen [Sun, 3 May 2020 22:26:50 +0000 (10:26 +1200)]
[REF] Minor code cleanup

Do not pass params as reference as unchanged

4 years agoMerge pull request #17222 from eileenmcnaughton/obh
Seamus Lee [Sun, 3 May 2020 22:02:11 +0000 (08:02 +1000)]
Merge pull request #17222 from eileenmcnaughton/obh

[REF] Minor code cleanup.

4 years agoAPIv4 - Deprecate old way of retrieving activityType/optionValue ids
Coleman Watts [Sat, 2 May 2020 00:30:08 +0000 (20:30 -0400)]
APIv4 - Deprecate old way of retrieving activityType/optionValue ids

4 years agoMerge pull request #17224 from eileenmcnaughton/testc
colemanw [Sun, 3 May 2020 13:35:35 +0000 (09:35 -0400)]
Merge pull request #17224 from eileenmcnaughton/testc

[NFC] Test cleanup