civicrm-core.git
4 years agoMerge pull request #16516 from colemanw/request
Eileen McNaughton [Fri, 14 Feb 2020 11:12:28 +0000 (00:12 +1300)]
Merge pull request #16516 from colemanw/request

APIv4 - merge ActionUtil with Request::create

4 years agoMerge pull request #16523 from yashodha/header
Eileen McNaughton [Fri, 14 Feb 2020 11:10:09 +0000 (00:10 +1300)]
Merge pull request #16523 from yashodha/header

add column for report

4 years agoMerge pull request #16537 from civicrm/5.23
Eileen McNaughton [Fri, 14 Feb 2020 08:20:14 +0000 (21:20 +1300)]
Merge pull request #16537 from civicrm/5.23

5.23

4 years agoMerge pull request #15824 from mfb/email-search-speed-boost
Eileen McNaughton [Fri, 14 Feb 2020 06:23:09 +0000 (19:23 +1300)]
Merge pull request #15824 from mfb/email-search-speed-boost

Speed boost for civicrm/ajax/checkemail

4 years agoMerge pull request #16467 from ixiam/dev-1110
Eileen McNaughton [Fri, 14 Feb 2020 05:58:36 +0000 (18:58 +1300)]
Merge pull request #16467 from ixiam/dev-1110

fix contribution summary report's statistics when grouping and having

4 years agoMerge pull request #16451 from mattwire/settingreadonly
Eileen McNaughton [Fri, 14 Feb 2020 05:51:46 +0000 (18:51 +1300)]
Merge pull request #16451 from mattwire/settingreadonly

Settings Fix setting readonly attribute

4 years agoMerge pull request #16535 from eileenmcnaughton/523rel
Seamus Lee [Fri, 14 Feb 2020 05:51:17 +0000 (16:51 +1100)]
Merge pull request #16535 from eileenmcnaughton/523rel

dev/core#1592 fix regression on relation active period

4 years agoMerge pull request #15330 from mattwire/paymentprocessor_testmodelivemode
Eileen McNaughton [Fri, 14 Feb 2020 05:46:25 +0000 (18:46 +1300)]
Merge pull request #15330 from mattwire/paymentprocessor_testmodelivemode

Fix issues with retrieving supportsTestMode/supportsLiveMode for payment processors

4 years agoMerge pull request #16534 from eileenmcnaughton/523m
Seamus Lee [Fri, 14 Feb 2020 05:26:48 +0000 (16:26 +1100)]
Merge pull request #16534 from eileenmcnaughton/523m

dev/core#1551 regression fix

4 years agoMerge pull request #16526 from eileenmcnaughton/valid_calls
Seamus Lee [Fri, 14 Feb 2020 05:19:46 +0000 (16:19 +1100)]
Merge pull request #16526 from eileenmcnaughton/valid_calls

Fix calls to Request::retrieve

4 years agodev/core#1592 fix regression on relation active period
eileen [Fri, 14 Feb 2020 04:42:17 +0000 (17:42 +1300)]
dev/core#1592 fix regression on relation active period

Per https://lab.civicrm.org/dev/core/issues/1592 the custom query  for this field is being
ignored now it's using datepicker with relevant format changes. This  causes the
custom function for the field to  be called

4 years agodev/core#1551 regression fix
eileen [Fri, 14 Feb 2020 03:55:08 +0000 (16:55 +1300)]
dev/core#1551 regression fix

Now that mailing_id is defined as field metadata the form main metadata fn is trying to handle it, However
the form is casting it to the wrong array format -https://github.com/civicrm/civicrm-core/blob/86f20cc17dde028977130f84feaf3b1d760ca57d/CRM/Contact/Form/Search.php#L649

We could fix  this & rip it out of Mailing_BAO_Query::where but there is still a gap  in  that
there is no pseudoconstant recorded for the field so the qill doesn't work & there is a gap in
pre-parsing for the form 'IN'

Hence this seems like a good approach to remove the regression in the immediate term

4 years agoMerge pull request #16530 from civicrm/5.23
Seamus Lee [Thu, 13 Feb 2020 22:59:31 +0000 (09:59 +1100)]
Merge pull request #16530 from civicrm/5.23

5.23

4 years agoMerge pull request #16521 from seamuslee001/dev_core_1489_2
Eileen McNaughton [Thu, 13 Feb 2020 21:49:32 +0000 (10:49 +1300)]
Merge pull request #16521 from seamuslee001/dev_core_1489_2

dev/core#1489 Include hook_civicrm_managed into the list of upgrade f…

4 years agoMerge pull request #16477 from demeritcowboy/unit-test-env
Eileen McNaughton [Thu, 13 Feb 2020 21:05:16 +0000 (10:05 +1300)]
Merge pull request #16477 from demeritcowboy/unit-test-env

[TEST] dev/core#1572 Unit test environment not working on windows after recent CodeGen updates

4 years agoFix calls to Request::retrieve
eileen [Thu, 13 Feb 2020 20:32:54 +0000 (09:32 +1300)]
Fix calls to Request::retrieve

Do not pass in values that are set by default. Use retrieveValue  rather than passing inn the NULL object

4 years agoAPIv3 - Handle input errors
Coleman Watts [Thu, 13 Feb 2020 00:20:53 +0000 (19:20 -0500)]
APIv3 - Handle input errors

4 years agoadd column for report
yashodha [Thu, 13 Feb 2020 08:36:17 +0000 (14:06 +0530)]
add column for report

4 years agoMerge pull request #16522 from totten/master-simplecache-patchurl
Eileen McNaughton [Thu, 13 Feb 2020 04:08:40 +0000 (17:08 +1300)]
Merge pull request #16522 from totten/master-simplecache-patchurl

dev/core#1562 - composer.json - Fix E2E tests run on D8 build (via "patches") #16427

4 years agoMerge pull request #16512 from yashodha/header
Eileen McNaughton [Thu, 13 Feb 2020 02:11:38 +0000 (15:11 +1300)]
Merge pull request #16512 from yashodha/header

Relationship report - add sort order for end date

4 years ago(dev/core#1562) composer.json - Fix E2E tests run on D8 build (w/"patches" and URLs)
Tim Otten [Thu, 13 Feb 2020 02:03:21 +0000 (18:03 -0800)]
(dev/core#1562) composer.json - Fix E2E tests run on D8 build (w/"patches" and URLs)

4 years agodev/core#1489 Include hook_civicrm_managed into the list of upgrade freindly hooks
Seamus Lee [Thu, 13 Feb 2020 01:42:47 +0000 (12:42 +1100)]
dev/core#1489 Include hook_civicrm_managed into the list of upgrade freindly hooks

4 years agoRemove patch files that are now loaded from URL
Tim Otten [Thu, 13 Feb 2020 01:14:17 +0000 (17:14 -0800)]
Remove patch files that are now loaded from URL

The `composer.json` was updated to get these patch files via URL instead of
via local/relative path.

Future maintainers who wish to revise these patches will need to post new
revisions somewhere with a durable URL *before* they can update
`civicrm-core`.

Keeping the files in here wrongly implies that you can revise the files
in-situ - their presence is misleading.

4 years agoMerge pull request #16519 from civicrm/5.23
Seamus Lee [Wed, 12 Feb 2020 21:40:30 +0000 (08:40 +1100)]
Merge pull request #16519 from civicrm/5.23

5.23

4 years agoMerge pull request #16520 from agh1/5.23.0-release-notes
Seamus Lee [Wed, 12 Feb 2020 21:40:14 +0000 (08:40 +1100)]
Merge pull request #16520 from agh1/5.23.0-release-notes

5.23.0 release notes

4 years agoMerge pull request #16517 from agh1/5.23.0-release-notes
Seamus Lee [Wed, 12 Feb 2020 21:34:55 +0000 (08:34 +1100)]
Merge pull request #16517 from agh1/5.23.0-release-notes

5.23.0 release notes: initial run

4 years agoMerge pull request #16518 from greenpeace-cee/fix-xoauth-imap
Seamus Lee [Wed, 12 Feb 2020 21:34:05 +0000 (08:34 +1100)]
Merge pull request #16518 from greenpeace-cee/fix-xoauth-imap

dev/mail#59 - Fix use of useXOAUTH2 constant instead of var

4 years agodev/mail#59 - Fix use of useXOAUTH2 constant instead of var
Patrick Figel [Wed, 12 Feb 2020 20:27:02 +0000 (21:27 +0100)]
dev/mail#59 - Fix use of useXOAUTH2 constant instead of var

This fixes an issue where a missing $ before the useXOAUTH2 variable
prevents IMAP authentication with XOAUTH2 from working.

4 years ago5.23.0 release notes: added boilerplate
Andrew Hunt [Wed, 12 Feb 2020 19:18:49 +0000 (14:18 -0500)]
5.23.0 release notes: added boilerplate

4 years agoMerge pull request #16513 from eileenmcnaughton/credit_note_setting
colemanw [Wed, 12 Feb 2020 17:43:18 +0000 (12:43 -0500)]
Merge pull request #16513 from eileenmcnaughton/credit_note_setting

Move  settings definition on contribution settings form to metadata.

4 years agoAPIv4 - merge ActionUtil with Request::create
Coleman Watts [Wed, 12 Feb 2020 16:24:13 +0000 (11:24 -0500)]
APIv4 - merge ActionUtil with Request::create

The Request::create function was broken for v4, and ActionUtil had been serving the same purpose but in a non-broken way.

4 years ago5.23.0 release notes: raw from script
Andrew Hunt [Wed, 12 Feb 2020 15:58:17 +0000 (10:58 -0500)]
5.23.0 release notes: raw from script

4 years agoMove credit_note_definition on contribution settings form to metadata.
eileen [Thu, 30 Jan 2020 23:32:21 +0000 (12:32 +1300)]
Move credit_note_definition on contribution settings form to metadata.

This moves the code that allows settings to be added to forms by metadata from the Generic setting form to the setting trait.

This means many more forms will support injecting settings by metadata. Specifically we switch across the Contribution preferences form,
making credit_note_prefix a metadata-added field. This is preliminary to moving that to an extension & allows us to inject it
in by simply defining the metadata in a hook

4 years agoadd sort order for end date
yashodha [Wed, 12 Feb 2020 12:21:24 +0000 (17:51 +0530)]
add sort order for end date

4 years agoMerge pull request #16511 from colemanw/kernel
Seamus Lee [Wed, 12 Feb 2020 06:46:57 +0000 (17:46 +1100)]
Merge pull request #16511 from colemanw/kernel

API Kernel - cleanup deprecated fn & unused param

4 years agoMerge pull request #15859 from jitendrapurohit/dev-mem-17
Yashodha Chaku [Wed, 12 Feb 2020 02:34:01 +0000 (08:04 +0530)]
Merge pull request #15859 from jitendrapurohit/dev-mem-17

dev/mem#17 - Deleting memberships does not delete its related line item

4 years agoAPI Kernel - cleanup deprecated fn & unused param
Coleman Watts [Tue, 11 Feb 2020 22:29:06 +0000 (17:29 -0500)]
API Kernel - cleanup deprecated fn & unused param

4 years agoMerge pull request #16510 from colemanw/ws
Seamus Lee [Wed, 12 Feb 2020 00:39:07 +0000 (11:39 +1100)]
Merge pull request #16510 from colemanw/ws

crmSelect2 - fix whitespace in tooltip

4 years agocrmSelect2 - fix whitespace in tooltip
Coleman Watts [Tue, 11 Feb 2020 22:06:21 +0000 (17:06 -0500)]
crmSelect2 - fix whitespace in tooltip

4 years agoMerge pull request #16508 from colemanw/escape
colemanw [Tue, 11 Feb 2020 21:50:02 +0000 (16:50 -0500)]
Merge pull request #16508 from colemanw/escape

Common.js - remove duplicate function

4 years agoMerge pull request #16507 from colemanw/title
Seamus Lee [Tue, 11 Feb 2020 20:44:47 +0000 (07:44 +1100)]
Merge pull request #16507 from colemanw/title

dev/core#1587 Select2 - Use description as title for each option

4 years agoCommon.js - remove duplicate function
Coleman Watts [Tue, 11 Feb 2020 20:43:54 +0000 (15:43 -0500)]
Common.js - remove duplicate function

This function did the same thing as the one in lo-dash

4 years agoSelect2 - Use description as title for each option
Coleman Watts [Tue, 11 Feb 2020 20:07:25 +0000 (15:07 -0500)]
Select2 - Use description as title for each option

4 years agoMerge pull request #16504 from acrollet/master
Eileen McNaughton [Tue, 11 Feb 2020 20:02:11 +0000 (09:02 +1300)]
Merge pull request #16504 from acrollet/master

dev/financial#117 - Add link metadata for payment edit link

4 years agoMerge pull request #16499 from pradpnayak/caseAuditReport
Yashodha Chaku [Tue, 11 Feb 2020 10:06:21 +0000 (15:36 +0530)]
Merge pull request #16499 from pradpnayak/caseAuditReport

Added conditional check so that it can be altered by hook

4 years agoMerge pull request #16505 from eileenmcnaughton/part_pay_dep
Monish Deb [Tue, 11 Feb 2020 09:37:00 +0000 (15:07 +0530)]
Merge pull request #16505 from eileenmcnaughton/part_pay_dep

Add deprecation notices on PartialAmount params

4 years agoMerge pull request #16497 from totten/master-pear-mail-delg
Seamus Lee [Tue, 11 Feb 2020 06:41:22 +0000 (17:41 +1100)]
Merge pull request #16497 from totten/master-pear-mail-delg

(REF) Move CIVICRM_MAIL_LOG logic from patch-files to wrapper-class

4 years agocomposer.json - Patch URLs should be more concrete, less symbolic
Tim Otten [Tue, 11 Feb 2020 06:02:53 +0000 (22:02 -0800)]
composer.json - Patch URLs should be more concrete, less symbolic

The previous commit made used patch URLs in the format:

`https://raw.githubusercontent.com/civicrm/civicrm-core/master/{FILEPATH}`

This is symbolic in that the `master` does not refer to a specific piece of content; it refers
subjectively to the current developmental code. This creates a few problems:

* When `civicrm-core` is tagged or branched, the `composer.json` still points
  to `master`.
* If you need to update the patch-file, you send in a PR with a different
  patch URL, right? But any builds based on this PR would still use the
  canonical `master` rather than the proposed revision.

Resolution: Don't point to patch-files symbolicly.  Instead, address them
specifically.  This revision uses past Github commits (because that's easy),
but it doesn't have to be in Github per se.  It should be somewhere that's
reliable and unlikely to change (preferrably with addressing by content
checksum).  In the Drupal community, you see a lot of examples pointing to
file-attachments in the issue-tracker.

4 years agoLAB-1576 - Use URLs for patches, to avoid local path issues with composer-patches
Chris Burgess [Wed, 5 Feb 2020 10:11:27 +0000 (23:11 +1300)]
LAB-1576 - Use URLs for patches, to avoid local path issues with composer-patches

Trying Github raw URLs this time ...

4 years agoCRM_Utils_Mail::send - Adjust hack to work with filtered mailer
Tim Otten [Tue, 11 Feb 2020 01:52:41 +0000 (17:52 -0800)]
CRM_Utils_Mail::send - Adjust hack to work with filtered mailer

4 years ago(REF) CRM_Utils_Mail - Split LoggingMailer into FilteredPearMailer and Logger
Tim Otten [Tue, 11 Feb 2020 01:48:50 +0000 (17:48 -0800)]
(REF) CRM_Utils_Mail - Split LoggingMailer into FilteredPearMailer and Logger

1. Captures more context (i.e. the original driver and params)
2. Changes various property names to avoid potential for conflict with delegated properties
3. Adds `addFilter($id, $func)` so that one can move more filters in here
4. Consolidates the various references ot CIVICRM_MAIL_LOG* into one file.

4 years agoMerge pull request #16360 from artfulrobot/case-activities-setting
Eileen McNaughton [Tue, 11 Feb 2020 02:21:40 +0000 (15:21 +1300)]
Merge pull request #16360 from artfulrobot/case-activities-setting

Add CiviCase option for showing case activities in normal views

4 years agoMerge pull request #15410 from herbdool/cloud-21
Mathieu Lu [Tue, 11 Feb 2020 01:41:29 +0000 (20:41 -0500)]
Merge pull request #15410 from herbdool/cloud-21

dev/cloud-native#21 Don't cache the full path of extensions so they don't break with dynamic paths

4 years agoAdd deprecation notices on PartialAmount params
eileen [Mon, 10 Feb 2020 23:19:00 +0000 (12:19 +1300)]
Add deprecation notices on PartialAmount params

We've removed all the places that pass these in so these 2 places handling them are the only remaining references.

All calling code now uses Payment.create to add the payments - yay. Removing these fully will clean up the code
notably

4 years agoCRM_Admin_Form_Setting_Smtp - Use the same mailer as CRM_Utils_Mail
Tim Otten [Mon, 10 Feb 2020 22:09:06 +0000 (14:09 -0800)]
CRM_Admin_Form_Setting_Smtp - Use the same mailer as CRM_Utils_Mail

When civicrm-core used patches to change the behavior of `Mail_mail` (etal),
this was fine.  The preceding commit removes the patches and uses a wrapper
instead - so it's more important to get the same mailer as the
regular CRM_Utils_Mail logic.

4 years agoAdd CiviCase option for showing case activities in normal views
Rich Lott / Artful Robot [Thu, 23 Jan 2020 11:08:30 +0000 (11:08 +0000)]
Add CiviCase option for showing case activities in normal views

Different aproach to tackling #16353

Fix array-to-string notice; Improve activity action links

remove upgrader - as per Pradeep's suggestion

update version added

tweak way description is gotten

update activity tests to check civicaseShowCaseActivities setting

Fix another array-to-string conversion error

Remove File On Case from activity View; add Manage Case

fix case activity links when using caseShowCaseActivities

remove ctx parameter for case activity links

various

US-Englishized Case settings texts.

fix permission name

4 years agoAdd link metadata for payment edit link
Adrian Rollett [Mon, 10 Feb 2020 18:44:23 +0000 (11:44 -0700)]
Add link metadata for payment edit link

4 years agoMerge pull request #16502 from yashodha/header
colemanw [Mon, 10 Feb 2020 14:02:47 +0000 (09:02 -0500)]
Merge pull request #16502 from yashodha/header

remove unnecessary file

4 years agoMerge pull request #16487 from mlutfy/core1019
Yashodha Chaku [Mon, 10 Feb 2020 11:47:11 +0000 (17:17 +0530)]
Merge pull request #16487 from mlutfy/core1019

dev/core#1019 Calculate.tpl: fix the Total Amount currency formatting.

4 years agoMerge pull request #16442 from eileenmcnaughton/pree
Monish Deb [Mon, 10 Feb 2020 09:27:14 +0000 (14:57 +0530)]
Merge pull request #16442 from eileenmcnaughton/pree

Fix backoffice participant partial payments to be stdised & not miscalculate net_amount

4 years agoremove unnecessary file
yashodha [Mon, 10 Feb 2020 07:46:49 +0000 (13:16 +0530)]
remove unnecessary file

4 years agoMerge pull request #16500 from eileenmcnaughton/fatal
Seamus Lee [Mon, 10 Feb 2020 07:19:02 +0000 (18:19 +1100)]
Merge pull request #16500 from eileenmcnaughton/fatal

Remove fatal  from  form

4 years agoRemove fatal from form
eileen [Mon, 10 Feb 2020 06:04:09 +0000 (19:04 +1300)]
Remove fatal  from  form

4 years agoMerge pull request #16475 from JMAConsulting/core_1577
Eileen McNaughton [Mon, 10 Feb 2020 04:11:35 +0000 (17:11 +1300)]
Merge pull request #16475 from JMAConsulting/core_1577

dev/core#1577 : Custom Group Types not filterable

4 years agoMerge pull request #16465 from albionbrown/#1565-API-Exception
Eileen McNaughton [Mon, 10 Feb 2020 02:50:11 +0000 (15:50 +1300)]
Merge pull request #16465 from albionbrown/#1565-API-Exception

Throwing API_Exception is file fails to copy when creating attachment…

4 years agoAdded conditional check so that it can be altered by hook
Pradeep Nayak [Mon, 10 Feb 2020 00:53:40 +0000 (00:53 +0000)]
Added conditional check so that it can be altered by hook

4 years ago(REF) Move CIVICRM_MAIL_LOG logic from patch-files to wrapper-class
Tim Otten [Fri, 7 Feb 2020 23:15:14 +0000 (15:15 -0800)]
(REF) Move CIVICRM_MAIL_LOG logic from patch-files to wrapper-class

Overview
--------

This aims to improve maintainablity and deployment workflows by reduing the
scope of the needed files.

It is an alternative approach for #16481.

Before
------

`civicrm-core` included patch files for `pear/mail`.  These files modified
the behavior of `Mail_sendmail`, `Mail_smtp`, and `Mail_mail` to ensure that
the `send()` function would abide by the `CIVICRM_MAIL_LOG` constant.

After
-----

`civicrm-core` includes a wrapper class `LoggingMailer`.  It takes an
instance of `Mail_sendmail`, `Mail_smtp`, or `Mail_mail` and mixes-in the
`CIVICRM_MAIL_LOG` logic.

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

There is a `hook_civicrm_alterMailer`, for which consumers could potentially
see a change in behavior (because the concrete-class of `$mailer` may
change and support different properties). Mitigating factors:

* There is only one public method in the `Mail` contract: `send()`.
* The only example of `alterMailer` in the documentation suggests
  that you wholly replace the object with your own implementation.
  This was the original purpose. If you use it this way, then it doesn't
  matter what's happening inside the old object.
  https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterMailer/
* In public `universe`, there is only one extension (Cividesk's Sparkpost)
  which uses this hook. And it does swap in that expected way.
* Just in case... the `LoggingMailer` passes-through all calls to read/write properties.
  You can see this in action in a specific configuration, e.g.
  ```
  ## Before patch
  $ cv ev '$m=Civi::service("pear_mail"); return [get_class($m), $m->host];'
  [
      "Mail_smtp",
      "127.0.0.1"
  ]

  ## After patch
  $ cv ev '$m=Civi::service("pear_mail"); return [get_class($m), $m->host];'
  [
      "CRM_Utils_Mail_LoggingMailer",
      "127.0.0.1"
  ]
  ```

4 years agoMerge pull request #16494 from mattwire/enablevalidate
Seamus Lee [Fri, 7 Feb 2020 21:43:42 +0000 (08:43 +1100)]
Merge pull request #16494 from mattwire/enablevalidate

Enable jQuery validate on register/contribution forms

4 years agoMerge pull request #16493 from mattwire/unusedcode
Seamus Lee [Fri, 7 Feb 2020 21:43:32 +0000 (08:43 +1100)]
Merge pull request #16493 from mattwire/unusedcode

Remove unused code

4 years agoMerge pull request #16492 from yashodha/header
Seamus Lee [Fri, 7 Feb 2020 20:10:17 +0000 (07:10 +1100)]
Merge pull request #16492 from yashodha/header

fix headers

4 years agoEnable jQuery validate on register/contribution forms
Matthew Wire [Fri, 7 Feb 2020 20:03:52 +0000 (20:03 +0000)]
Enable jQuery validate on register/contribution forms

4 years agoRemove unused code
Matthew Wire [Thu, 6 Feb 2020 22:40:03 +0000 (22:40 +0000)]
Remove unused code

4 years agofix contribution summary report's statistics when grouping and having
Luciano Spiegel [Mon, 3 Feb 2020 18:26:19 +0000 (19:26 +0100)]
fix contribution summary report's statistics when grouping and having

4 years agoMerge pull request #16490 from seamuslee001/dompdf_update_script
colemanw [Fri, 7 Feb 2020 15:13:25 +0000 (10:13 -0500)]
Merge pull request #16490 from seamuslee001/dompdf_update_script

[REF] Remove patch from dompdf cleanup script that is no longer needed

4 years agofix headers
yashodha [Fri, 7 Feb 2020 11:12:08 +0000 (16:42 +0530)]
fix headers

4 years ago[REF] Remove patch from dompdf cleanup script that is no longer needed
Seamus Lee [Fri, 7 Feb 2020 03:46:48 +0000 (14:46 +1100)]
[REF] Remove patch from dompdf cleanup script that is no longer needed

4 years agoMerge pull request #16489 from civicrm/5.23
Seamus Lee [Fri, 7 Feb 2020 03:41:13 +0000 (14:41 +1100)]
Merge pull request #16489 from civicrm/5.23

5.23

4 years agoMerge pull request #16483 from seamuslee001/utf8mb4_min
Seamus Lee [Fri, 7 Feb 2020 01:06:49 +0000 (12:06 +1100)]
Merge pull request #16483 from seamuslee001/utf8mb4_min

[NFC] Skip utf8mb4 test on MySQL versions lower than 5.7

4 years agoMerge pull request #13078 from agh1/contactdetail-no-or2
Mathieu Lu [Thu, 6 Feb 2020 22:20:04 +0000 (17:20 -0500)]
Merge pull request #13078 from agh1/contactdetail-no-or2

Improve activity query performance in Constituent Detail Report

4 years agoMerge pull request #16459 from eileenmcnaughton/rec_ver
Mathieu Lu [Thu, 6 Feb 2020 22:05:41 +0000 (17:05 -0500)]
Merge pull request #16459 from eileenmcnaughton/rec_ver

Make php 7.3 the recommended php version

4 years agoMerge pull request #16486 from mfb/year-typo
Mathieu Lu [Thu, 6 Feb 2020 22:01:38 +0000 (17:01 -0500)]
Merge pull request #16486 from mfb/year-typo

Fix year typo.

4 years agodev/core#1019 Calculate.tpl: fix the Total Amount currency formatting (code reformatt...
Mathieu Lutfy [Thu, 6 Feb 2020 20:05:04 +0000 (15:05 -0500)]
dev/core#1019 Calculate.tpl: fix the Total Amount currency formatting (code reformatting).

4 years agodev/core#1019 Calculate.tpl: fix the Total Amount currency formatting.
Mathieu Lutfy [Thu, 6 Feb 2020 19:56:41 +0000 (14:56 -0500)]
dev/core#1019 Calculate.tpl: fix the Total Amount currency formatting.

4 years agoFix year typo.
mark burdett [Thu, 6 Feb 2020 19:15:57 +0000 (11:15 -0800)]
Fix year typo.

4 years agodev/core#1577 : Custom Group Types not filterable
Monish Deb [Wed, 5 Feb 2020 12:34:05 +0000 (18:04 +0530)]
dev/core#1577 : Custom Group Types not filterable

4 years agodev/mem#17 - Deleting memberships does not delete its related line item
Jitendra Purohit [Fri, 15 Nov 2019 09:25:48 +0000 (14:55 +0530)]
dev/mem#17 - Deleting memberships does not delete its related line item

4 years agoSet version to 5.24.alpha1
CiviCRM [Thu, 6 Feb 2020 07:14:40 +0000 (07:14 +0000)]
Set version to 5.24.alpha1

4 years agoSet version to 5.23.beta1
CiviCRM [Thu, 6 Feb 2020 07:07:34 +0000 (07:07 +0000)]
Set version to 5.23.beta1

4 years ago[NFC] Skip utf8mb4 test on MySQL versions lower than 5.7
Seamus Lee [Thu, 6 Feb 2020 04:21:59 +0000 (15:21 +1100)]
[NFC] Skip utf8mb4 test on MySQL versions lower than 5.7

4 years agoMerge pull request #16485 from seamuslee001/master
Seamus Lee [Thu, 6 Feb 2020 06:46:15 +0000 (17:46 +1100)]
Merge pull request #16485 from seamuslee001/master

release-notes: Late changes for 5.22 release notes

4 years agorelease-notes: Late changes for 5.22 release notes
Alice Frumin [Wed, 5 Feb 2020 15:36:22 +0000 (10:36 -0500)]
release-notes: Late changes for 5.22 release notes

4 years agoMerge pull request #16457 from colemanw/api4doc
Seamus Lee [Wed, 5 Feb 2020 19:07:28 +0000 (06:07 +1100)]
Merge pull request #16457 from colemanw/api4doc

APIv4 documentation & code cleanup

4 years agoavoid backslash problems
demeritcowboy [Wed, 5 Feb 2020 16:02:50 +0000 (11:02 -0500)]
avoid backslash problems

4 years agoUpdate api/v3/Attachment.php to remove concatenation
Josh Brown [Wed, 5 Feb 2020 08:25:55 +0000 (08:25 +0000)]
Update api/v3/Attachment.php to remove concatenation

Co-Authored-By: colemanw <coleman@civicrm.org>
4 years agoMerge pull request #16472 from eileenmcnaughton/cn_for_now
Seamus Lee [Wed, 5 Feb 2020 07:05:11 +0000 (18:05 +1100)]
Merge pull request #16472 from eileenmcnaughton/cn_for_now

Revert "Remove unreachable code lines."

4 years agoMerge pull request #16466 from mattwire/recurringentity_copy
Seamus Lee [Wed, 5 Feb 2020 06:57:54 +0000 (17:57 +1100)]
Merge pull request #16466 from mattwire/recurringentity_copy

Call hook_civicrm_copy for RecurringEntity

4 years agoMerge pull request #16471 from totten/master-psr-log
Seamus Lee [Wed, 5 Feb 2020 06:44:55 +0000 (17:44 +1100)]
Merge pull request #16471 from totten/master-psr-log

composer.json - Relax psr/log constraint. Improve D8 compatibility.

4 years agoRevert "Remove unreachable code lines."
eileen [Wed, 5 Feb 2020 05:12:54 +0000 (18:12 +1300)]
Revert "Remove unreachable code lines."

In the course of https://github.com/civicrm/civicrm-core/pull/16462
I concluded that there might be (untested scenarios) where this would still be hit.

In #16462 I adopted a cleaner (tested) approach. However, I think it's unlikely that
will be merged before 5.23 is cut so I propose reverting this change & re-reverting it
once the rc is cut as a more conservative approach. We can focus on getting #16462
wrapped up for 5.24

This reverts commit d7943ca7f7107c1466e687e876bddaf0f1998d99.

4 years agoMerge pull request #16460 from colemanw/noInclude
Eileen McNaughton [Wed, 5 Feb 2020 04:44:29 +0000 (17:44 +1300)]
Merge pull request #16460 from colemanw/noInclude

APIv3 - Only scan files for deprecation checks in Entity.get

4 years agocomposer.json - Relax psr/log constraint. Improve D8 compatibility.
Tim Otten [Wed, 5 Feb 2020 03:53:58 +0000 (19:53 -0800)]
composer.json - Relax psr/log constraint. Improve D8 compatibility.

Overview
--------

This addresses a composer conflict that's reported when trying to install
on Drupal 8.7. For example, run these commands:

```
drush8 dl drupal-8.7.x
cd drupal-8*
composer require civicrm/civicrm-core:5.22.x-dev
```

This is a port of #16470 for `master`.

Before
------

The install fails because `civicrm-core` requires `psr/log:~1.1`, and something else
is prodding us to use `psr/log:1.0.2`.

```
./composer.json has been updated
Loading composer repositories with package information
Updating dependencies (including require-dev)
Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - Installation request for civicrm/civicrm-core 5.22.x-dev -> satisfiable by civicrm/civicrm-core[5.22.x-dev].
    - Conclusion: remove psr/log 1.0.2
    - Conclusion: don't install psr/log 1.0.2
    - civicrm/civicrm-core 5.22.x-dev requires psr/log ~1.1 -> satisfiable by psr/log[1.1.0, 1.1.1, 1.1.2, 1.1.x-dev].
    - Can only install one of: psr/log[1.1.0, 1.0.2].
    - Can only install one of: psr/log[1.1.1, 1.0.2].
    - Can only install one of: psr/log[1.1.2, 1.0.2].
    - Can only install one of: psr/log[1.1.x-dev, 1.0.2].
    - Installation request for psr/log (locked at 1.0.2) -> satisfiable by psr/log[1.0.2].

Installation failed, reverting ./composer.json to its original content.
```

After
-----

It should work.  However, this is hard to demonstrate via `r-run` without merging.

Comments
--------

The substantive differences between `psr/log` in v1.0 and v1.1 relate to `LoggerInterfaceTest` and `TestLogger`:

https://github.com/php-fig/log/compare/1.0.2...1.1.2

However, `civicrm-core` does not use `LoggerInterfaceTest` or `TestLogger`, so it shouldn't matter.

For the standard tarballs which use `composer.lock`, this does have the side-effect of bumping up from 1.1.0 to 1.1.2.