Jon Goldberg [Fri, 8 May 2020 17:21:02 +0000 (13:21 -0400)]
fix regression on new MIME type library
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
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.
CiviCRM [Fri, 8 May 2020 02:35:13 +0000 (02:35 +0000)]
Set version to 5.26.beta1
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
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
demeritcowboy [Thu, 7 May 2020 21:14:21 +0000 (17:14 -0400)]
fix typo in workaround
Tim Otten [Thu, 7 May 2020 09:21:07 +0000 (02:21 -0700)]
MessageTemplate API - Keep the workflow_id and workflow_name sync'd
Seamus Lee [Thu, 7 May 2020 09:28:42 +0000 (19:28 +1000)]
Merge pull request #17252 from civicrm/5.25
5.25
Tim Otten [Thu, 7 May 2020 07:34:15 +0000 (00:34 -0700)]
sql/civicrm_generated.mysql - Update with current message template schema
eileen [Mon, 4 May 2020 00:49:48 +0000 (12:49 +1200)]
Add workflow_name column to civicrm_msg_template, deprecate workflow_id
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
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
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.
Tim Otten [Thu, 7 May 2020 04:25:53 +0000 (21:25 -0700)]
Update release-notes/5.25.0.md
Tim Otten [Thu, 7 May 2020 04:13:22 +0000 (21:13 -0700)]
install/index.php - Fix leak which breaks compatibility with current Backdrop
Seamus Lee [Thu, 7 May 2020 03:57:07 +0000 (13:57 +1000)]
Merge pull request #17248 from seamuslee001/master
5.25
Seamus Lee [Thu, 7 May 2020 03:55:55 +0000 (13:55 +1000)]
Merge in 5.25
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
Tim Otten [Thu, 7 May 2020 03:29:09 +0000 (20:29 -0700)]
Set version to 5.25.0
Tim Otten [Thu, 7 May 2020 03:21:40 +0000 (20:21 -0700)]
release-notes/5.25.0.md - Small copy edits
Seamus Lee [Wed, 6 May 2020 23:04:14 +0000 (09:04 +1000)]
Merge pull request #17243 from civicrm/5.25
5.25
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)
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
Andrew Hunt [Wed, 6 May 2020 17:57:29 +0000 (13:57 -0400)]
5.25.0 release notes: final edits
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
Andrew Hunt [Wed, 6 May 2020 16:01:52 +0000 (12:01 -0400)]
Api4 AJAX endpoint: allow either access CiviCRM or access AJAX API
Andrew Hunt [Wed, 6 May 2020 16:00:02 +0000 (12:00 -0400)]
5.25.0 release notes: halfway through final edits
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
Andrew Hunt [Wed, 6 May 2020 14:56:38 +0000 (10:56 -0400)]
5.25.0 release notes: added late changes
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
Tim Otten [Wed, 6 May 2020 02:37:40 +0000 (19:37 -0700)]
dev/core#1744 - Civi/API - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:21:59 +0000 (19:21 -0700)]
dev/core#1744 - SystemInstallEvent - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:17:03 +0000 (19:17 -0700)]
dev/core#1744 - ActionSchedule - Simplify event naming
Tim Otten [Wed, 6 May 2020 02:12:53 +0000 (19:12 -0700)]
dev/core#1744 - Civi/Token - Simplify event naming
Eileen McNaughton [Wed, 6 May 2020 00:51:42 +0000 (12:51 +1200)]
Merge pull request #17236 from civicrm/5.25
5.25
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.
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)
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…
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
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
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
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
yashodha [Mon, 4 May 2020 14:40:13 +0000 (20:10 +0530)]
(dev/core#1740) Cumulative contributions not being calculated with the correct criteria
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
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
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
Coleman Watts [Tue, 5 May 2020 19:52:08 +0000 (15:52 -0400)]
APIv4 - Deprecate option_value joins in favor of pseudoconstant suffix
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.
Jon Goldberg [Tue, 5 May 2020 15:37:39 +0000 (11:37 -0400)]
Reporting #20 - correct stats when force=1 on Contribution Detail Report
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
Alice Frumin [Thu, 23 Apr 2020 19:43:41 +0000 (15:43 -0400)]
First Pass at 5.25 releasenotes
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
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
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
Tim Otten [Tue, 5 May 2020 09:01:15 +0000 (02:01 -0700)]
(NFC) TokenProcessor - Improve docblocks
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.
Tim Otten [Tue, 5 May 2020 04:35:18 +0000 (21:35 -0700)]
(NFC) TokenRow - Improve docblocks
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
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,…)`
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
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
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 …
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
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
colemanw [Mon, 4 May 2020 01:13:11 +0000 (21:13 -0400)]
Merge pull request #17225 from eileenmcnaughton/cont
[REF] Minor code cleanup
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
eileen [Sun, 3 May 2020 22:26:50 +0000 (10:26 +1200)]
[REF] Minor code cleanup
Do not pass params as reference as unchanged
Seamus Lee [Sun, 3 May 2020 22:02:11 +0000 (08:02 +1000)]
Merge pull request #17222 from eileenmcnaughton/obh
[REF] Minor code cleanup.
Coleman Watts [Sat, 2 May 2020 00:30:08 +0000 (20:30 -0400)]
APIv4 - Deprecate old way of retrieving activityType/optionValue ids
colemanw [Sun, 3 May 2020 13:35:35 +0000 (09:35 -0400)]
Merge pull request #17224 from eileenmcnaughton/testc
[NFC] Test cleanup
Eileen McNaughton [Sun, 3 May 2020 09:02:50 +0000 (21:02 +1200)]
Merge pull request #17223 from demeritcowboy/conference-slots
Fix admin page url for "conference slots" option values
eileen [Sun, 3 May 2020 05:07:37 +0000 (17:07 +1200)]
[NFC] Test cleanup
demeritcowboy [Sun, 3 May 2020 04:14:47 +0000 (00:14 -0400)]
fix admin page url
Coleman Watts [Thu, 16 Apr 2020 19:33:43 +0000 (15:33 -0400)]
REF - Switch CRM_Utils_Array::value to empty in conditionals
Seamus Lee [Sat, 2 May 2020 21:05:32 +0000 (07:05 +1000)]
Merge pull request #17221 from civicrm/5.25
5.25
eileen [Sat, 2 May 2020 07:49:07 +0000 (19:49 +1200)]
[REF] Minor code cleanup.
Once we compress the 2 ifs we find the value in the 'else' is never used
Eileen McNaughton [Sat, 2 May 2020 03:43:22 +0000 (15:43 +1200)]
Merge pull request #17218 from seamuslee001/5.25
[REF] Fix retrieving invoice related settings when doing complete tra…
colemanw [Sat, 2 May 2020 00:19:19 +0000 (20:19 -0400)]
Merge pull request #17216 from totten/master-disp-cleanup
dev/core#1460 - Small cleanups in CiviEventDispatcher{,Test}
Seamus Lee [Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)]
Merge pull request #17217 from civicrm/5.25
5.25
Seamus Lee [Fri, 1 May 2020 21:40:12 +0000 (07:40 +1000)]
[REF] Fix retreiving invoice related settings when doing complete transaction
colemanw [Fri, 1 May 2020 13:54:29 +0000 (09:54 -0400)]
Merge pull request #17215 from eileenmcnaughton/act
dev/core#1714 Fix mis-filtering on activity type
Seamus Lee [Fri, 1 May 2020 07:39:00 +0000 (17:39 +1000)]
Merge pull request #17172 from colemanw/writeRecord
[REF] Reduce boilerplate code in BAO add/create functions
Seamus Lee [Fri, 1 May 2020 07:38:38 +0000 (17:38 +1000)]
Merge pull request #17151 from eileenmcnaughton/actsched
[REF] Minor cleanup around action schedule code.
Seamus Lee [Fri, 1 May 2020 07:37:59 +0000 (17:37 +1000)]
Merge pull request #17213 from eileenmcnaughton/test
[NFC][Test] Preliminary cleanup
Tim Otten [Fri, 1 May 2020 03:38:49 +0000 (20:38 -0700)]
(NFC) CiviEventDispatcher - Improve docblocks
eileen [Fri, 1 May 2020 00:22:56 +0000 (12:22 +1200)]
Convert fatals to statusBounces in case forms
eileen [Thu, 30 Apr 2020 03:11:44 +0000 (15:11 +1200)]
[REF] [Test] IDE cleanup on ReportTemplateTest
Tim Otten [Fri, 1 May 2020 03:30:06 +0000 (20:30 -0700)]
CiviEventDispatcherTest - Fix warning on newer versions of PHP
Eileen McNaughton [Fri, 1 May 2020 03:28:48 +0000 (15:28 +1200)]
Merge pull request #17184 from mattwire/opencasenofatal
Cleanup and throw exceptions in OpenCase form
eileen [Fri, 1 May 2020 03:00:56 +0000 (15:00 +1200)]
dev/core#1714 Fix mis-filtering on activity type
This fixes a bug where the activity_type_id was being compared against the label of the option value
colemanw [Fri, 1 May 2020 02:51:35 +0000 (22:51 -0400)]
Merge pull request #17211 from eileenmcnaughton/id
(NFC) Remove $Id$ artifacts from old SCM
Eileen McNaughton [Fri, 1 May 2020 02:29:53 +0000 (14:29 +1200)]
Merge pull request #17122 from colemanw/buildOptions
Cleanup core pseudoconstant buildOptions
Coleman Watts [Mon, 27 Apr 2020 01:11:27 +0000 (21:11 -0400)]
REF - Reduce boilerplate code in BAO add/create functions
The new CRM_Core_DAO::writeRecord function can be used instead of boilerplate
eileen [Fri, 1 May 2020 01:14:16 +0000 (13:14 +1200)]
[NFC][Test] Preliminary cleanup
Margin cleanup - declare exceptions, use right quotes, remove unused params
Eileen McNaughton [Fri, 1 May 2020 00:44:28 +0000 (12:44 +1200)]
Merge pull request #17167 from colemanw/moreOptions
APIv4 - Allow field options to be returned in multiple formats
Seamus Lee [Fri, 1 May 2020 00:37:02 +0000 (10:37 +1000)]
Merge pull request #17196 from eileenmcnaughton/session
[REF] Cleanup a few instances where we use old call to get loggedInUserID
eileen [Fri, 1 May 2020 00:16:54 +0000 (12:16 +1200)]
A bit less svn
Coleman Watts [Thu, 30 Apr 2020 19:14:07 +0000 (15:14 -0400)]
APIv4 - Improve pseudoconstants in HAVING and Explorer
Coleman Watts [Fri, 24 Apr 2020 17:50:26 +0000 (13:50 -0400)]
APIv4 - Allow field options to be returned in multiple formats