Eileen McNaughton [Fri, 4 Oct 2019 04:05:22 +0000 (06:05 +0200)]
Merge pull request #15387 from eileenmcnaughton/merge
Merge 5.18 to master
eileen [Fri, 4 Oct 2019 04:03:43 +0000 (06:03 +0200)]
Merge branch '5.18' of https://github.com/civicrm/civicrm-core into merge
CiviCRM [Thu, 3 Oct 2019 14:11:42 +0000 (14:11 +0000)]
Set version to 5.18.0
Tim Otten [Thu, 3 Oct 2019 14:09:40 +0000 (15:09 +0100)]
Merge pull request #15382 from totten/5.18-note-event
(NFC) release-notes/5.18.0.md - Add dev/event#15
Tim Otten [Thu, 3 Oct 2019 14:09:04 +0000 (15:09 +0100)]
Merge pull request #15380 from eileenmcnaughton/cust_uf
(dev/event#15) Fix regression in handling of post profiles in email
Tim Otten [Thu, 3 Oct 2019 10:28:43 +0000 (11:28 +0100)]
Event::sendMail() - Don't assume $postProfileID has content
The unit-test suite includes cases in which the value is actually NULL.
Tim Otten [Thu, 3 Oct 2019 08:30:52 +0000 (09:30 +0100)]
Event::sendEmail() - Fix displaying of heading. Use same key.
The message templates use this loop:
```
{foreach from=$customPost item=customPos key=j}
<tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>
```
Note that the keys in `$customPost` and `$customPost_grouptitle` need to
match.
Tim Otten [Thu, 3 Oct 2019 07:44:31 +0000 (08:44 +0100)]
release-notes/5.18.0.md - Add dev/event#15
Tim Otten [Thu, 3 Oct 2019 07:19:21 +0000 (08:19 +0100)]
Event::sendEmail() - Fix profile ID for realz this time
eileen [Thu, 3 Oct 2019 06:55:33 +0000 (08:55 +0200)]
Fix regression in handling of post profiles in email
Eileen McNaughton [Thu, 3 Oct 2019 05:31:54 +0000 (07:31 +0200)]
Merge pull request #15377 from demeritcowboy/relTypes-not-relTypes
[NFC] Rename local variable
DemeritCowboy [Wed, 2 Oct 2019 19:42:34 +0000 (15:42 -0400)]
rename local variable
Matthew Wire [Wed, 2 Oct 2019 17:52:33 +0000 (18:52 +0100)]
Merge pull request #15365 from samuelsov/userdashboard
Removing 'Array' from user dashboard contributions
Eileen McNaughton [Wed, 2 Oct 2019 08:53:15 +0000 (10:53 +0200)]
Merge pull request #15361 from seamuslee001/index_geo_code_fields
Add in an index on geo_code_1 and geo_code_2 to assist with distance …
Eileen McNaughton [Wed, 2 Oct 2019 08:49:01 +0000 (10:49 +0200)]
Merge pull request #15368 from seamuslee001/deprecated_getvalue_mailing_prefernces
[REF] Remove call to depreacated getValue call in Mailing Preferences…
Eileen McNaughton [Wed, 2 Oct 2019 05:46:41 +0000 (13:46 +0800)]
Merge pull request #15372 from civicrm/5.18
5.18
Seamus Lee [Tue, 1 Oct 2019 18:16:41 +0000 (04:16 +1000)]
Merge pull request #15371 from agh1/5.18.0-releasenotes-final
5.18.0 release notes final edits
Andrew Hunt [Tue, 1 Oct 2019 17:27:26 +0000 (13:27 -0400)]
5.18.0 release notes: some final edits
Andrew Hunt [Tue, 1 Oct 2019 14:56:32 +0000 (10:56 -0400)]
5.18.0 release notes: added late changes
Seamus Lee [Tue, 1 Oct 2019 07:40:35 +0000 (17:40 +1000)]
[REF] Remove call to depreacated getValue call in Mailing Preferences settings form
Seamus Lee [Tue, 1 Oct 2019 01:38:12 +0000 (11:38 +1000)]
Merge pull request #15366 from demeritcowboy/radio-date-gmt
dev/core#1279 - crmMailingRadioDateSpec.js always has a failure if west of GMT
DemeritCowboy [Tue, 1 Oct 2019 00:03:10 +0000 (20:03 -0400)]
GMT fix
Samuel Vanhove [Mon, 30 Sep 2019 20:31:48 +0000 (16:31 -0400)]
NFC - removing 'Array' from user dashboard contributions
colemanw [Mon, 30 Sep 2019 12:17:01 +0000 (08:17 -0400)]
Merge pull request #15360 from seamuslee001/ids_path_fix
[REF] Fix path to htmlpurifier in IDS file
Eileen McNaughton [Mon, 30 Sep 2019 07:33:17 +0000 (15:33 +0800)]
Merge pull request #15305 from yashodha/CRM_21777
CRM-21777 - Set readonly for the smtp fields initialised in civicrm_s…
Seamus Lee [Mon, 30 Sep 2019 06:18:18 +0000 (16:18 +1000)]
Add in an index on geo_code_1 and geo_code_2 to assist with distance and other queries
Seamus Lee [Mon, 30 Sep 2019 00:15:07 +0000 (10:15 +1000)]
[REF] Fix path to htmlpurifier in IDS file
colemanw [Fri, 27 Sep 2019 23:52:59 +0000 (19:52 -0400)]
Merge pull request #15335 from jitendrapurohit/13365-test
Add getdisplayvalue api with unit test.
Seamus Lee [Fri, 27 Sep 2019 22:42:45 +0000 (08:42 +1000)]
Merge pull request #15357 from civicrm/5.18
5.18
Tim Otten [Fri, 27 Sep 2019 04:37:05 +0000 (21:37 -0700)]
Merge pull request #15356 from seamuslee001/5.18
release-notes - Add 5.17.5
Tim Otten [Fri, 27 Sep 2019 04:11:08 +0000 (21:11 -0700)]
release-notes - Add 5.17.5
Tim Otten [Fri, 27 Sep 2019 04:22:17 +0000 (21:22 -0700)]
Merge pull request #15351 from civicrm/5.18
5.18
Seamus Lee [Thu, 26 Sep 2019 23:11:14 +0000 (09:11 +1000)]
Merge pull request #15353 from totten/master-api4-header
(NFC) api4 - Apply standard headers
Tim Otten [Mon, 23 Sep 2019 18:57:02 +0000 (11:57 -0700)]
api4 - Apply standard headers
colemanw [Thu, 26 Sep 2019 20:21:04 +0000 (16:21 -0400)]
Merge pull request #15350 from seamuslee001/lab_core_1276
Ensure that price_field_value rows aren't duplicated when editing pri…
Seamus Lee [Thu, 26 Sep 2019 09:04:57 +0000 (19:04 +1000)]
Ensure that price_field_value rows aren't duplicated when editing price field of type text
Seamus Lee [Wed, 25 Sep 2019 02:41:57 +0000 (12:41 +1000)]
Merge pull request #15346 from jitendrapurohit/dev-1272
dev/core#1272 - PHP 7.3 warning message on import contribution
Seamus Lee [Tue, 24 Sep 2019 00:14:10 +0000 (10:14 +1000)]
Merge pull request #15348 from civicrm/5.18
5.18
Seamus Lee [Mon, 23 Sep 2019 20:36:21 +0000 (06:36 +1000)]
Merge pull request #15334 from mattwire/membership16_fixdupelineitems
dev/membership/#16 Fix duplicate lineitems when creating a recurring membership via backend
Seamus Lee [Mon, 23 Sep 2019 20:35:16 +0000 (06:35 +1000)]
Merge pull request #15337 from alifrumin/rn5.18
Sorting and Annotating Release notes for 5.18
Alice Frumin [Fri, 20 Sep 2019 14:59:40 +0000 (10:59 -0400)]
Annotating Release Notes for 5.18
Jitendra Purohit [Mon, 23 Sep 2019 04:55:46 +0000 (10:25 +0530)]
fix warning message on import contribution
Eileen McNaughton [Mon, 23 Sep 2019 04:31:14 +0000 (12:31 +0800)]
Merge pull request #15313 from yashodha/report_cleanup
CRM-21677 - report clean up for employer report
Yashodha Chaku [Mon, 23 Sep 2019 04:29:12 +0000 (09:59 +0530)]
assign empty array to settings if settings not over-written by civicrm.settings.php
colemanw [Sun, 22 Sep 2019 22:33:21 +0000 (18:33 -0400)]
Merge pull request #15309 from totten/master-api4
Migrate APIv4 into civicrm-core
Seamus Lee [Sun, 22 Sep 2019 22:19:29 +0000 (08:19 +1000)]
Merge pull request #15342 from seamuslee001/master
Update spelling of htmlpurifier to be correct spelling
Seamus Lee [Sun, 22 Sep 2019 21:13:20 +0000 (07:13 +1000)]
Merge pull request #15343 from colemanw/upgrader
Upgrader: handle missing obsolete extensions
Coleman Watts [Sun, 22 Sep 2019 20:50:32 +0000 (16:50 -0400)]
Remove extension-specific ts()
Coleman Watts [Sun, 22 Sep 2019 18:31:07 +0000 (14:31 -0400)]
Fix number fields in api explorer
Only use html5 number input when dealing with single valued input
Coleman Watts [Sun, 22 Sep 2019 17:49:00 +0000 (13:49 -0400)]
Upgrader: handle missing obsolete extensions
Seamus Lee [Sun, 22 Sep 2019 05:35:56 +0000 (15:35 +1000)]
Update spelling of htmlpurifier to be correct spelling
Seamus Lee [Sun, 22 Sep 2019 05:38:06 +0000 (15:38 +1000)]
Revert "Update spelling of htmlpurifier to be correct spelling"
This reverts commit
ebbfece35c3744450a591f5a59f44c469ee6d5cf.
Seamus Lee [Sun, 22 Sep 2019 05:35:56 +0000 (15:35 +1000)]
Update spelling of htmlpurifier to be correct spelling
Tim Otten [Fri, 20 Sep 2019 21:44:43 +0000 (14:44 -0700)]
api4 - Update civicrm_generated.mysql for new nav item
Matthew Wire (MJW Consulting) [Thu, 19 Sep 2019 23:36:06 +0000 (00:36 +0100)]
Fix membership/issues#16 Duplicate lineitems when creating a recurring membership via backend
Jitendra Purohit [Fri, 20 Sep 2019 06:09:55 +0000 (11:39 +0530)]
Add unit test for getdisplayvalue api
Seamus Lee [Fri, 20 Sep 2019 00:44:05 +0000 (10:44 +1000)]
Merge pull request #15333 from civicrm/5.18
5.18
Seamus Lee [Thu, 19 Sep 2019 23:20:38 +0000 (09:20 +1000)]
Merge pull request #15332 from agh1/5.18.0-releasenotes
5.18.0 release notes initial run
Seamus Lee [Thu, 19 Sep 2019 21:14:26 +0000 (07:14 +1000)]
Merge pull request #15331 from totten/master-api4-hush
Api3TestTrait - Only run api4 tests if api4 is present
Andrew Hunt [Thu, 19 Sep 2019 21:05:00 +0000 (17:05 -0400)]
5.18.0 release notes: added boilerplate
Andrew Hunt [Thu, 19 Sep 2019 21:01:52 +0000 (17:01 -0400)]
5.18.0 release notes: raw from script
Tim Otten [Thu, 19 Sep 2019 19:16:23 +0000 (15:16 -0400)]
Api3TestTrait - Only run api4 tests if api4 is present
Tim Otten [Wed, 18 Sep 2019 23:59:47 +0000 (19:59 -0400)]
distmaker - Remove steps to download api4 as extension
This is no longer necessary since it's part of core!
Tim Otten [Wed, 18 Sep 2019 23:54:07 +0000 (19:54 -0400)]
composer.json - Add "ignore" list for js-yaml
Seamus Lee [Wed, 18 Sep 2019 21:33:15 +0000 (07:33 +1000)]
Merge pull request #15325 from totten/master-mailing-options
Mailing API - Expose option list for `header_id` and `footer_id`
Tim Otten [Wed, 18 Sep 2019 17:15:36 +0000 (13:15 -0400)]
Mailing API - Expose option list for `header_id` and `footer_id`
colemanw [Wed, 18 Sep 2019 13:33:24 +0000 (09:33 -0400)]
Merge pull request #15320 from jitendrapurohit/dev-1264
dev/core#1264 - Fix notice error on contribution page
colemanw [Wed, 18 Sep 2019 13:22:43 +0000 (09:22 -0400)]
Merge pull request #15319 from vinuvarshith/dev-core-1262-case-status-order
dev/core#1262 - Fix case status order in case type settings page
Jitendra Purohit [Wed, 18 Sep 2019 09:26:58 +0000 (14:56 +0530)]
dev/core#1264 - Fix notice error on contribution page
varshith89 [Wed, 18 Sep 2019 07:42:24 +0000 (07:42 +0000)]
dev/core#1262 - Fix case status order in case type settings page
Coleman Watts [Tue, 17 Sep 2019 12:48:14 +0000 (08:48 -0400)]
Add api4 menu item
Seamus Lee [Tue, 17 Sep 2019 22:01:21 +0000 (08:01 +1000)]
Merge pull request #15317 from elisseck/dev/core/1259
dev/core/1259 update config checklist contribution section
Seamus Lee [Tue, 17 Sep 2019 21:30:13 +0000 (07:30 +1000)]
Merge pull request #15168 from MegaphoneJon/class-fixes
core#1225 fix Event Info and Contribution Page Settings templates
Eli Lisseck [Tue, 17 Sep 2019 17:35:59 +0000 (10:35 -0700)]
dev/core/1259 update config checklist contribution section
Coleman Watts [Mon, 16 Sep 2019 20:31:24 +0000 (16:31 -0400)]
Fix api explorer module loading
Coleman Watts [Mon, 16 Sep 2019 15:41:05 +0000 (11:41 -0400)]
Api4 generated code improvements
Ports https://github.com/civicrm/org.civicrm.api4/pull/201 to core.
Coleman Watts [Mon, 16 Sep 2019 15:00:08 +0000 (11:00 -0400)]
Update namespace for phpunit6 compat
Coleman Watts [Mon, 16 Sep 2019 12:09:05 +0000 (08:09 -0400)]
Test fixes
Tim Otten [Sun, 15 Sep 2019 19:24:57 +0000 (15:24 -0400)]
api4 - Search for entities in core (for realz)
Tim Otten [Sun, 15 Sep 2019 18:19:06 +0000 (14:19 -0400)]
api4 - Fix container cache/reload behavior
In the extension's `tests/phpunit/bootstrap.php`, it forced the container to
*never* use caching. I suspect this was because of two problems:
1. APIv4 does a directory scan for services, but it didn't inform
the container that this directory was important.
2. APIv4 registers additional services for a test environment, but the
caching system didn't allow different caches for live-vs-test env's.
Tim Otten [Sun, 15 Sep 2019 18:12:52 +0000 (14:12 -0400)]
api4 - Fix computation of core path
The `$locations` array mostly contains the paths of *extension PHP files*,
and the subsequent code filters with`dirname()` to strip them out.
Before: The path `/var/www/sites/all/modules/civicrm` was digested to
`/var/www/sites/all/modules/Civi/Api4/Subscribers`.
After: The path `/var/www/sites/all/modules/civicrm/Civi.php` is digested
`/var/www/sites/all/modules/civicrm/Civi/Api4/Subscribers`.
Tim Otten [Sun, 15 Sep 2019 17:17:38 +0000 (13:17 -0400)]
(NFC) Pass both civilint and ReflectionUtilsTest
Coleman Watts [Sun, 15 Sep 2019 14:51:54 +0000 (10:51 -0400)]
Scan core as well as extensions for api4 entities & services
colemanw [Sun, 15 Sep 2019 14:23:27 +0000 (10:23 -0400)]
Search for entity-specific actions in core
CiviCRM [Sun, 15 Sep 2019 03:48:45 +0000 (23:48 -0400)]
api4 - Update test init
CiviCRM [Sun, 15 Sep 2019 03:48:45 +0000 (23:48 -0400)]
api4 - Adjust to new name
CiviCRM [Sun, 15 Sep 2019 03:48:45 +0000 (23:48 -0400)]
api4 - Import CRM/, Civi/, templates/, ang/, css/, js/, xml/menu
yashodha [Mon, 16 Sep 2019 05:38:29 +0000 (11:08 +0530)]
CRM-21677 - report clean up for employer report
colemanw [Sun, 15 Sep 2019 21:55:39 +0000 (17:55 -0400)]
Merge pull request #15310 from totten/master-api-examples
(DX) api/v3/examples - Rename *.php to *.ex.php
Tim Otten [Sun, 15 Sep 2019 18:58:48 +0000 (14:58 -0400)]
APIExplorer - Load examples from *.ex.php
Tim Otten [Sun, 15 Sep 2019 18:54:37 +0000 (14:54 -0400)]
tests/phpunit - Change hardcoded references to api/v3/examples/**.php
Tim Otten [Sun, 15 Sep 2019 18:47:06 +0000 (14:47 -0400)]
Api3DocTrait - Generate future examples as `*.ex.php`
Tim Otten [Sun, 15 Sep 2019 18:45:50 +0000 (14:45 -0400)]
api/v3/examples - Rename *.php to *.ex.php
Eileen McNaughton [Sun, 15 Sep 2019 08:53:29 +0000 (20:53 +1200)]
Merge pull request #15302 from seamuslee001/export_hook_alter_sig
Stop passing exportMode, componentTable and ids by reference in export hook
CiviCRM [Sun, 15 Sep 2019 03:48:43 +0000 (23:48 -0400)]
api4 - Enable services
CiviCRM [Sun, 15 Sep 2019 03:48:43 +0000 (23:48 -0400)]
api4 - Add civicrm_api4() and CRM.api4() entry-points
CiviCRM [Sun, 15 Sep 2019 03:48:43 +0000 (23:48 -0400)]
api4 - Port PHPUnit autoloading hacks
Seamus Lee [Sun, 15 Sep 2019 01:41:23 +0000 (11:41 +1000)]
Merge pull request #15262 from yashodha/report_cleanup
CRM-21677 - report clean up for contribution reports
Coleman Watts [Sat, 14 Sep 2019 22:45:22 +0000 (18:45 -0400)]
Handle new flattened custom field return format
Coleman Watts [Sat, 14 Sep 2019 22:39:32 +0000 (18:39 -0400)]
Obsolete api4 extension