civicrm-core.git
3 years agoMerge pull request #19348 from sunilpawar/dev_age_at_deceased_date
Eileen McNaughton [Sun, 21 Feb 2021 00:36:32 +0000 (13:36 +1300)]
Merge pull request #19348 from sunilpawar/dev_age_at_deceased_date

Show Contact age on deceased date

3 years agoMerge pull request #19637 from demeritcowboy/static-event
Eileen McNaughton [Sat, 20 Feb 2021 22:57:14 +0000 (11:57 +1300)]
Merge pull request #19637 from demeritcowboy/static-event

dev/event#50 - Non static function called statically for event ical downloads

3 years agonon static function called statically
demeritcowboy [Sat, 20 Feb 2021 14:15:36 +0000 (09:15 -0500)]
non static function called statically

3 years agoMerge pull request #19631 from colemanw/searchKitLinks
Eileen McNaughton [Fri, 19 Feb 2021 23:04:00 +0000 (12:04 +1300)]
Merge pull request #19631 from colemanw/searchKitLinks

SearchKit - Enable links for implicit joins

3 years agoMerge pull request #19636 from demeritcowboy/saventest
Eileen McNaughton [Fri, 19 Feb 2021 22:53:13 +0000 (11:53 +1300)]
Merge pull request #19636 from demeritcowboy/saventest

dev/core#2398 - Fix save'n'test button on mail account form

3 years agoMerge pull request #19620 from colemanw/searchKitSelectCurrentUser
Eileen McNaughton [Fri, 19 Feb 2021 21:35:00 +0000 (10:35 +1300)]
Merge pull request #19620 from colemanw/searchKitSelectCurrentUser

Search kit select current user

3 years agoMerge pull request #19597 from eileenmcnaughton/nfc
colemanw [Fri, 19 Feb 2021 20:53:50 +0000 (15:53 -0500)]
Merge pull request #19597 from eileenmcnaughton/nfc

[REF] simplify parameter, use preferred strict

3 years agoMerge pull request #19608 from totten/master-wp-status
Eileen McNaughton [Fri, 19 Feb 2021 20:47:28 +0000 (09:47 +1300)]
Merge pull request #19608 from totten/master-wp-status

WordPress - If we hit a "permission denied" error, return HTTP 403

3 years agoMerge pull request #19625 from colemanw/fixTs
Eileen McNaughton [Fri, 19 Feb 2021 20:20:12 +0000 (09:20 +1300)]
Merge pull request #19625 from colemanw/fixTs

Fix incorrect use of ts when setting custom data form title

3 years agofix save'n'test button
demeritcowboy [Fri, 19 Feb 2021 19:08:34 +0000 (14:08 -0500)]
fix save'n'test button

3 years agoMerge pull request #19634 from eileenmcnaughton/iif
Seamus Lee [Fri, 19 Feb 2021 08:19:54 +0000 (19:19 +1100)]
Merge pull request #19634 from eileenmcnaughton/iif

dev/financial#166 Clean up money formatting in iif

3 years agoMerge pull request #19627 from colemanw/readonly
Seamus Lee [Fri, 19 Feb 2021 07:56:27 +0000 (18:56 +1100)]
Merge pull request #19627 from colemanw/readonly

Metadata - Add 'readonly' to id fields, custom fields & contact fields

3 years agodev/financial#166 Clean up money formatting in iif
eileen [Fri, 19 Feb 2021 07:02:10 +0000 (20:02 +1300)]
dev/financial#166 Clean up money formatting in iif

This does not turn out to be necessary but I tested & it works & is more correct

3 years agoMerge pull request #19579 from totten/master-aff-test
Seamus Lee [Fri, 19 Feb 2021 01:17:22 +0000 (12:17 +1100)]
Merge pull request #19579 from totten/master-aff-test

Afform - Allow public submission (PUB-CONTACT). Expand E2E test coverage.

3 years agomockPublicForm.test.php - Relax assertion
Tim Otten [Thu, 18 Feb 2021 22:09:43 +0000 (14:09 -0800)]
mockPublicForm.test.php - Relax assertion

Note that the actual type reported varies slightly by CMS/configuration.
assertContentType() should factor-out those differences. We just need
loose claim here.

3 years agoSearchKit - Enable links for implicit joins
Coleman Watts [Thu, 18 Feb 2021 21:02:25 +0000 (16:02 -0500)]
SearchKit - Enable links for implicit joins

Automatically create links for any implicitly joined entity linked through an fk field

3 years agoFix APIv4 unit test for 'readonly' attribute
Coleman Watts [Thu, 18 Feb 2021 18:44:54 +0000 (13:44 -0500)]
Fix APIv4 unit test for 'readonly' attribute

3 years agoRegenerate DAOs with readonly attribute for id fields
Coleman Watts [Thu, 18 Feb 2021 15:43:47 +0000 (10:43 -0500)]
Regenerate DAOs with readonly attribute for id fields

3 years agoAdd 'readonly' attribute to schema fields
Coleman Watts [Thu, 18 Feb 2021 15:41:28 +0000 (10:41 -0500)]
Add 'readonly' attribute to schema fields

For core fields, applies to primaryKey fields and fields tagged <readonly>.
For custom fields, this comes through via the 'is_view' property.

This will help autogenerated forms to know whether a field is appropriate to show to the user.

3 years agoFix incorrect use of ts when setting custom data form title
Coleman Watts [Thu, 18 Feb 2021 13:57:52 +0000 (08:57 -0500)]
Fix incorrect use of ts when setting custom data form title

3 years agoMerge pull request #19598 from eileenmcnaughton/msg_tpl_less
Matthew Wire [Thu, 18 Feb 2021 10:25:54 +0000 (10:25 +0000)]
Merge pull request #19598 from eileenmcnaughton/msg_tpl_less

Convert Smarty & domain token processing to use token processor

3 years agoMerge pull request #19615 from totten/master-joomla-getufid
Seamus Lee [Thu, 18 Feb 2021 10:07:47 +0000 (21:07 +1100)]
Merge pull request #19615 from totten/master-joomla-getufid

Joomla - Implement getUfId(). Fix `@user:<name>`.

3 years agoMerge pull request #19617 from colemanw/searchKitEditAfformLink
Seamus Lee [Thu, 18 Feb 2021 09:29:26 +0000 (20:29 +1100)]
Merge pull request #19617 from colemanw/searchKitEditAfformLink

dev/core#2389 SearchKit - Show edit link to searchDisplay afforms

3 years agoMerge pull request #19621 from demeritcowboy/reldate
Eileen McNaughton [Wed, 17 Feb 2021 23:01:01 +0000 (12:01 +1300)]
Merge pull request #19621 from demeritcowboy/reldate

dev/core#2392 - Deprecated url parameters in contribution dashboard detail links

3 years agoMerge pull request #19614 from eileenmcnaughton/dispatch
Tim Otten [Wed, 17 Feb 2021 22:17:01 +0000 (14:17 -0800)]
Merge pull request #19614 from eileenmcnaughton/dispatch

Ensure dispatcher has loaded listeners

3 years agoMerge pull request #19622 from demeritcowboy/setting-description-ts
Eileen McNaughton [Wed, 17 Feb 2021 22:07:25 +0000 (11:07 +1300)]
Merge pull request #19622 from demeritcowboy/setting-description-ts

Remove empty {ts}

3 years agothere's no string to translate here
demeritcowboy [Wed, 17 Feb 2021 20:30:44 +0000 (15:30 -0500)]
there's no string to translate here

3 years agodeprecated url parameters
demeritcowboy [Wed, 17 Feb 2021 19:49:03 +0000 (14:49 -0500)]
deprecated url parameters

3 years agoMerge pull request #18299 from tunbola/email-separate-activity
Eileen McNaughton [Wed, 17 Feb 2021 19:35:58 +0000 (08:35 +1300)]
Merge pull request #18299 from tunbola/email-separate-activity

dev/core#1750: Replace Tokens In Activity Content for Sent Emails

3 years agoSearchKit - Use entityRef widget for ID fields
Coleman Watts [Wed, 17 Feb 2021 17:35:30 +0000 (12:35 -0500)]
SearchKit - Use entityRef widget for ID fields

3 years agodev/core#1750 Create separate email per contact and maintaining the file ids for...
Tunbola Ogunwande [Mon, 31 Aug 2020 12:34:37 +0000 (13:34 +0100)]
dev/core#1750 Create separate email per contact and maintaining the file ids for all email attachments

3 years agoSearchKit - permit selection of current user id for dynamic searches
Coleman Watts [Wed, 17 Feb 2021 16:56:56 +0000 (11:56 -0500)]
SearchKit - permit selection of current user id for dynamic searches

3 years agoMerge pull request #19566 from eileenmcnaughton/mem_recur
Yashodha Chaku [Wed, 17 Feb 2021 13:57:20 +0000 (19:27 +0530)]
Merge pull request #19566 from eileenmcnaughton/mem_recur

Remove always-true-if

3 years agoSearchKit - Show edit link to searchDisplay afforms
Coleman Watts [Wed, 17 Feb 2021 13:37:55 +0000 (08:37 -0500)]
SearchKit - Show edit link to searchDisplay afforms

3 years agoJoomla - Implement getUfId(). Fix '@user:<name>'.
Tim Otten [Wed, 17 Feb 2021 08:19:11 +0000 (00:19 -0800)]
Joomla - Implement getUfId(). Fix '@user:<name>'.

Overview
--------

APIv3 includes shorthand support for referencing a contact by their username, e.g.

```
cv api contact.get id=@user:admin return=display_name
```

Before
------

On Joomla, this emits an error because `getUfId($username):int` is
not implemented.

After
-----

On Joomla, this works.

Comments
--------

There is implicit E2E test-coverage in the pending work for authx.

3 years agoAfform Admin - If "security" and "actions" are missing, indicate the defaults
Tim Otten [Thu, 11 Feb 2021 07:35:41 +0000 (23:35 -0800)]
Afform Admin - If "security" and "actions" are missing, indicate the defaults

Note that this matches the defaults as interpreted by FormDataModel.

3 years agoAfform Admin - Expose options for "security" and "actions"
Tim Otten [Thu, 11 Feb 2021 07:35:02 +0000 (23:35 -0800)]
Afform Admin - Expose options for "security" and "actions"

3 years agoAfform - Allow `af-entity` to specify the `security` and `actions`
Tim Otten [Thu, 11 Feb 2021 02:47:52 +0000 (18:47 -0800)]
Afform - Allow `af-entity` to specify the `security` and `actions`

* `actions` indicates whether this entity can be used for creating or updating data
* `security` indicates whether it uses role-based access-control (like the standard Civi admin UI)
  or form-based access-control (dependent entirely on form configuration)

3 years agoAfform - Delegated API calls should use a security helper
Tim Otten [Thu, 11 Feb 2021 02:25:23 +0000 (18:25 -0800)]
Afform - Delegated API calls should use a security helper

Before
------

The `Prefill`, `Submit`, and `AbstractProcessor` have various calls to `civicrm_api4()`
which are meant to read/write data for a specific entity.

These calls may or may not have `checkPermissions` sprinkled in.

After
-----

Those calls to `civicrm_api4()` now go through a wrapper. For example:

```php
$formDataModel->getSecureApi4('spouse')('Contact', 'get', [...]);
```

In this call, we use the settings for the `spouse` entity to pick a security
policy.  Then, we execute the `Contact.get` API within that security policy.

3 years ago(REF) AfformSubmitEvent - Provide $afform, $formDataModel, and $apiRequest
Tim Otten [Thu, 11 Feb 2021 01:39:06 +0000 (17:39 -0800)]
(REF) AfformSubmitEvent - Provide $afform, $formDataModel, and $apiRequest

3 years agoExtract 2 tests from AfformRoutingTest to mockPublicForm. Make example work.
Tim Otten [Wed, 10 Feb 2021 22:33:30 +0000 (14:33 -0800)]
Extract 2 tests from AfformRoutingTest to mockPublicForm. Make example work.

These two cases rely on setting up the same fixture. It's easier to try out/debug if
the fixture is live/available as a matter of course.

Tangentially, if you try to use this form (whether as anonymous or as admin, it doesn't -- e.g.
because it doesn't have a "Submit" button. So this updates it.

3 years agoAfformRoutingTest - For public form, split test for creating vs editing
Tim Otten [Fri, 22 Jan 2021 09:16:59 +0000 (01:16 -0800)]
AfformRoutingTest - For public form, split test for creating vs editing

3 years agoAfformRoutingTest - Add test case for anonymous submission
Seamus Lee [Fri, 5 Feb 2021 03:45:24 +0000 (19:45 -0800)]
AfformRoutingTest - Add test case for anonymous submission

3 years agoREADME.md - Describe test organization
Tim Otten [Wed, 10 Feb 2021 22:45:25 +0000 (14:45 -0800)]
README.md - Describe test organization

3 years agoAdd basic support for `ang/*.test.php` test suite.
Tim Otten [Wed, 10 Feb 2021 22:22:36 +0000 (14:22 -0800)]
Add basic support for `ang/*.test.php` test suite.

The previous pattern was to put all tests in `tests/phpunit/`. They would use
fixtures in a few ways, eg

* Work with example forms from the `ang/` folder. This is useful for testing specific configurations/features
  (e.g. if a form is configured with `permission` of `X`, then the form should behave accordingly).
* Dynamically create/destroy forms. This is useful for testing the API mechanism (eg ensuring the `Afform.create`
  and `Afform.revert` actually do create and revert things).

The two styles are both necessary. However:

1. The first style is easer to work with -- if a form fails its test, then
   you can run that form interactively.  If you want to add a new test-case,
   you can simply copy in a working example -- you don't need to code-up
   some PHPUnit logic to build the example.

2. If you have something written in the first style, then it's easier keep
   the `*.aff.html` and the PHPUnit `*.php` next to each other.

3 years agoMerge pull request #19612 from colemanw/calcFields
Eileen McNaughton [Wed, 17 Feb 2021 06:53:58 +0000 (19:53 +1300)]
Merge pull request #19612 from colemanw/calcFields

Afform - SearchKit support for calculated fields

3 years ago(NFC) Tweak comment
Tim Otten [Wed, 17 Feb 2021 06:33:48 +0000 (22:33 -0800)]
(NFC) Tweak comment

3 years agoEnsure dispatcher has loaded listeners
eileen [Wed, 17 Feb 2021 06:26:46 +0000 (19:26 +1300)]
Ensure dispatcher has loaded listeners

3 years agoMerge pull request #19613 from eileenmcnaughton/catch
Seamus Lee [Wed, 17 Feb 2021 06:06:36 +0000 (17:06 +1100)]
Merge pull request #19613 from eileenmcnaughton/catch

Fix on recently merged asset builder catch patch

3 years agoFix on recently merged asset builder catch patch
eileen [Wed, 17 Feb 2021 04:17:09 +0000 (17:17 +1300)]
Fix on recently merged asset builder catch patch

This log line got added in review & I think not tested. Only in master

https://github.com/civicrm/civicrm-core/pull/18830

3 years agoMerge pull request #19611 from eileenmcnaughton/ignore
Seamus Lee [Wed, 17 Feb 2021 03:19:43 +0000 (14:19 +1100)]
Merge pull request #19611 from eileenmcnaughton/ignore

Add contactlayouteditor to gitignore

3 years agoAfform - SearchKit support for calculated fields
Coleman Watts [Tue, 16 Feb 2021 20:59:35 +0000 (15:59 -0500)]
Afform - SearchKit support for calculated fields

This allows the aggregated columns from a savedSearch to be used as filters on an afform with embedded search display

3 years agoMerge pull request #19585 from colemanw/searchKitApi
Eileen McNaughton [Wed, 17 Feb 2021 02:24:55 +0000 (15:24 +1300)]
Merge pull request #19585 from colemanw/searchKitApi

Search Kit - Use wrapper api to run searches

3 years agoAdd contactlayouteditor to gitignore
eileen [Wed, 17 Feb 2021 01:44:27 +0000 (14:44 +1300)]
Add contactlayouteditor to gitignore

This is put in the tools directory during a buildkit install but we don't want to
accidentally commit it

3 years agoMerge pull request #19599 from totten/master-jwt
Seamus Lee [Tue, 16 Feb 2021 20:51:41 +0000 (07:51 +1100)]
Merge pull request #19599 from totten/master-jwt

Crypto - Add support for signing and verifying JSON Web Tokens

3 years agoSearchKit - normalize search display column keys
Coleman Watts [Tue, 16 Feb 2021 13:56:01 +0000 (08:56 -0500)]
SearchKit - normalize search display column keys

3 years agoMerge pull request #19571 from eileenmcnaughton/ipn
Matthew Wire [Tue, 16 Feb 2021 09:42:07 +0000 (09:42 +0000)]
Merge pull request #19571 from eileenmcnaughton/ipn

[REF] Stop passing contribution into completeOrder, id is enough

3 years agoWordPress - If we hit a "permission denied" error, return HTTP 403
Tim Otten [Tue, 16 Feb 2021 06:45:36 +0000 (22:45 -0800)]
WordPress - If we hit a "permission denied" error, return HTTP 403

Overview
--------

On WordPress, any CiviCRM page that produces a "permission denied" sends an
HTTP status code of 200.  This is incorrectly indicates that the page-request was a success.

Before
------

```
$ curl -vv 'http://wpmaster.127.0.0.1.nip.io:8001/civicrm/dashboard' 2>&1 |grep HTTP
> GET /civicrm/dashboard HTTP/1.1
< HTTP/1.1 200 OK
```

After
-----

```
$ curl -vv 'http://wpmaster.127.0.0.1.nip.io:8001/civicrm/dashboard' 2>&1 |grep HTTP
> GET /civicrm/dashboard HTTP/1.1
< HTTP/1.1 403 Forbidden
```

3 years agoMerge pull request #19604 from JMAConsulting/issue-2309
Eileen McNaughton [Tue, 16 Feb 2021 05:02:21 +0000 (18:02 +1300)]
Merge pull request #19604 from JMAConsulting/issue-2309

core#2309: Validate weight and weight threshold

3 years agocore#2309: Validate weight and weight threshold
Monish Deb [Mon, 15 Feb 2021 16:06:11 +0000 (21:36 +0530)]
core#2309: Validate weight and weight threshold

3 years agoMerge pull request #19607 from demeritcowboy/unit-assert-cases
Eileen McNaughton [Tue, 16 Feb 2021 01:42:25 +0000 (14:42 +1300)]
Merge pull request #19607 from demeritcowboy/unit-assert-cases

[NFC/Unit Test] Fix passing test that should pass but also should fail

3 years agocompare nonexistent array keys to 0 better
demeritcowboy [Mon, 15 Feb 2021 22:45:21 +0000 (17:45 -0500)]
compare nonexistent array keys to 0 better

3 years agoMerge pull request #19606 from civicrm/5.35
Eileen McNaughton [Mon, 15 Feb 2021 21:52:39 +0000 (10:52 +1300)]
Merge pull request #19606 from civicrm/5.35

5.35

3 years agoMerge pull request #19588 from MegaphoneJon/core-2379
Eileen McNaughton [Mon, 15 Feb 2021 20:20:15 +0000 (09:20 +1300)]
Merge pull request #19588 from MegaphoneJon/core-2379

core#2379 - avoid validation error on saving geocodes

3 years agoMerge pull request #19593 from eileenmcnaughton/535
Seamus Lee [Mon, 15 Feb 2021 20:18:08 +0000 (07:18 +1100)]
Merge pull request #19593 from eileenmcnaughton/535

Fix Redis deprecated warning

3 years agoMerge pull request #19595 from eileenmcnaughton/tokens
Seamus Lee [Mon, 15 Feb 2021 20:06:14 +0000 (07:06 +1100)]
Merge pull request #19595 from eileenmcnaughton/tokens

[NFC] Code cleanup - use use statements, hints

3 years agoMerge pull request #19602 from JMAConsulting/money_defaults
Eileen McNaughton [Mon, 15 Feb 2021 20:02:44 +0000 (09:02 +1300)]
Merge pull request #19602 from JMAConsulting/money_defaults

Use specific function when formatting money for a default

3 years agoMerge pull request #19601 from civicrm/5.35
Eileen McNaughton [Mon, 15 Feb 2021 19:48:07 +0000 (08:48 +1300)]
Merge pull request #19601 from civicrm/5.35

5.35

3 years agocore#2379 - avoid validation error on saving geocodes
agbud8@zabuntu [Thu, 11 Feb 2021 16:52:39 +0000 (11:52 -0500)]
core#2379 - avoid validation error on saving geocodes

3 years agoUse specific function when formatting money for a default
Monish Deb [Mon, 15 Feb 2021 14:02:53 +0000 (19:32 +0530)]
Use specific function when formatting money for a default

3 years agoMerge pull request #19594 from eileenmcnaughton/535m
Seamus Lee [Mon, 15 Feb 2021 08:06:36 +0000 (19:06 +1100)]
Merge pull request #19594 from eileenmcnaughton/535m

dev/mail#89 Fix unreleased regression where civimember is not permitted/enabled

3 years agoMerge pull request #19600 from totten/master-http-test
Seamus Lee [Mon, 15 Feb 2021 07:47:36 +0000 (18:47 +1100)]
Merge pull request #19600 from totten/master-http-test

HttpTestTrait - Define helper methods for E2E tests of Civi's HTTP routes

3 years agoMerge pull request #19572 from MegaphoneJon/event-48
Eileen McNaughton [Mon, 15 Feb 2021 06:08:02 +0000 (19:08 +1300)]
Merge pull request #19572 from MegaphoneJon/event-48

event#48: Fix partially paid events in a modal dialog

3 years agoMerge pull request #19596 from colemanw/getFieldsOptions
Eileen McNaughton [Mon, 15 Feb 2021 05:44:48 +0000 (18:44 +1300)]
Merge pull request #19596 from colemanw/getFieldsOptions

APIv4 - Add option lists to getFields html_type and data_type

3 years ago(NFC) HttpTestTrait - Fix typo
Tim Otten [Mon, 15 Feb 2021 05:12:48 +0000 (21:12 -0800)]
(NFC) HttpTestTrait - Fix typo

3 years agoHttpTestTrait - assertContentType() should a little sensitive to CMS variations
Tim Otten [Sat, 13 Feb 2021 04:29:07 +0000 (20:29 -0800)]
HttpTestTrait - assertContentType() should a little sensitive to CMS variations

This is based on the observation the WP reported `text/plain` while D7
reported `text/plain;charset=UTF-8` -- even though the Civi output logic was
the same (specifying `text/plain`).

3 years agoCrypto - Define CIVICRM_SIGN_KEYS as way to register signing keys
Tim Otten [Mon, 15 Feb 2021 04:04:57 +0000 (20:04 -0800)]
Crypto - Define CIVICRM_SIGN_KEYS as way to register signing keys

3 years agoCrypto - Define a service for creating and verifying JSON Web tokens ('crypto.jwt')
Tim Otten [Mon, 15 Feb 2021 00:34:49 +0000 (16:34 -0800)]
Crypto - Define a service for creating and verifying JSON Web tokens ('crypto.jwt')

3 years agocomposer.lock - Require firebase/php-jwt
Tim Otten [Sun, 14 Feb 2021 22:03:44 +0000 (14:03 -0800)]
composer.lock - Require firebase/php-jwt

3 years agocomposer.json - Require firebase/php-jwt (v3 - v5)
Tim Otten [Sun, 14 Feb 2021 21:53:52 +0000 (13:53 -0800)]
composer.json - Require firebase/php-jwt (v3 - v5)

When this version range?

* It's a fairly popular package, so may be prone to conflicts. A wide range is desireable.
* The low end (v3) is 5+ years old. The high end (v5) is current latest.
* If you 'git diff' between v3=>v4=>v5, the changes are fairly incrementaly. They
  add more crypto algorithms, twiddle docblocks and PHP environment compatibility,
  and introduce a service we don't need (JWK). The main interfaces all look the same.
* The only notable bit was that some exceptions were recategorized, but the broad taxonomy
  of exceptions still seems similar.

3 years agoConvert Smarty & domain token processing to use token processor
eileen [Sat, 6 Feb 2021 03:36:45 +0000 (16:36 +1300)]
Convert Smarty & domain token processing to use token processor

This is a subset of the changes in
https://github.com/civicrm/civicrm-core/pull/19550 that we should be able to resolve
& merge while addressing that takes longer. It still gets us the
benefit of adopting a preferred pattern

Note that some test changes exist around handling of subject -
the code now converts a new line to a space consistently. In addition
tests that rely on leakage have been altered as smarty does not leak with
this approach

3 years agoSearchKit - Support filters in new Run action
Coleman Watts [Fri, 12 Feb 2021 17:33:56 +0000 (12:33 -0500)]
SearchKit - Support filters in new Run action

This uses the global 'includeWildCardInName' setting to determine whether to do a full wildcard search.

3 years agoSearchKit - Ensure aggregated fields are aliased
Coleman Watts [Fri, 12 Feb 2021 16:55:45 +0000 (11:55 -0500)]
SearchKit - Ensure aggregated fields are aliased

3 years agoAPIv4 - Allow field aliases in ORDER BY clause
Coleman Watts [Fri, 12 Feb 2021 16:06:28 +0000 (11:06 -0500)]
APIv4 - Allow field aliases in ORDER BY clause

3 years agoSearchKit - Refactor searchDisplay admin components: move common functions to parent
Coleman Watts [Fri, 12 Feb 2021 15:40:24 +0000 (10:40 -0500)]
SearchKit - Refactor searchDisplay admin components: move common functions to parent

3 years agoSearchKit - Add orderBy selector when configuring displays
Coleman Watts [Fri, 12 Feb 2021 14:27:55 +0000 (09:27 -0500)]
SearchKit - Add orderBy selector when configuring displays

3 years agoSearchKit - Refactor search displays to go through centralized api wrapper
Coleman Watts [Thu, 11 Feb 2021 20:11:10 +0000 (15:11 -0500)]
SearchKit - Refactor search displays to go through centralized api wrapper

3 years ago[REF] simplify parameter, use preferred strict
eileen [Mon, 15 Feb 2021 00:59:27 +0000 (13:59 +1300)]
[REF] simplify parameter, use preferred strict

3 years ago[NFC] Code cleanup - use use statements, hints
eileen [Mon, 15 Feb 2021 00:50:44 +0000 (13:50 +1300)]
[NFC] Code cleanup - use use statements, hints

Minor cleanup on token classes from https://github.com/civicrm/civicrm-core/pull/19584

3 years agoAPIv4 - Add option lists to getFields html_type and data_type
Coleman Watts [Mon, 15 Feb 2021 00:50:24 +0000 (19:50 -0500)]
APIv4 - Add option lists to getFields html_type and data_type

3 years agodev/mail#89 Fix unreleased regression where civimember is not permitted/enabled
eileen [Sun, 14 Feb 2021 23:23:58 +0000 (12:23 +1300)]
dev/mail#89 Fix unreleased regression where civimember is not permitted/enabled

Fixes a bug where a person with no access to CiviMember will get an exception thrown (and
not caught) rather than receive a result of 0 when checking the memberships
that a contact has access to

3 years agoFix Redis deprecated warning
eileen [Fri, 12 Feb 2021 22:05:44 +0000 (11:05 +1300)]
Fix Redis deprecated warning

It's not obvious why we would pass trapException here. I believe the issue is that
some custom searches result in 'acceptable' bad sql here but
https://github.com/civicrm/civicrm-core/commit/6dc40f3250ede0f38ce2aed7c3fabd3f1f667c1b
already fixed to catch any exception so we don't
need to convert. There is one other place that calls fillWithSql but there
is no evidence it is subject to the random issue on custom searches / needs
any attention at the moment

3 years agoMerge pull request #19570 from colemanw/deleteOldXml
Eileen McNaughton [Sun, 14 Feb 2021 23:08:37 +0000 (12:08 +1300)]
Merge pull request #19570 from colemanw/deleteOldXml

Cleanup - Remove old unused schema/xml files.

3 years agoMerge pull request #19544 from demeritcowboy/tardy-chart
Eileen McNaughton [Sun, 14 Feb 2021 22:49:29 +0000 (11:49 +1300)]
Merge pull request #19544 from demeritcowboy/tardy-chart

dev/core#2365 - Delayed drawing of contribution charts seems unnecessary

3 years agoMerge pull request #19578 from MegaphoneJon/buildoptions
Eileen McNaughton [Sat, 13 Feb 2021 22:40:37 +0000 (11:40 +1300)]
Merge pull request #19578 from MegaphoneJon/buildoptions

[REF] replace deprecated calls with buildOptions

3 years agoMerge pull request #19592 from civicrm/5.35
Eileen McNaughton [Sat, 13 Feb 2021 22:39:29 +0000 (11:39 +1300)]
Merge pull request #19592 from civicrm/5.35

5.35 to master

3 years agoMerge pull request #19586 from alifrumin/5.35-releasenotes
Eileen McNaughton [Sat, 13 Feb 2021 22:38:21 +0000 (11:38 +1300)]
Merge pull request #19586 from alifrumin/5.35-releasenotes

[NFC] First Pass at 5.35 release notes

3 years agoMerge pull request #19582 from mattwire/extensiondownloader
Eileen McNaughton [Sat, 13 Feb 2021 22:37:00 +0000 (11:37 +1300)]
Merge pull request #19582 from mattwire/extensiondownloader

Remove check for safe_mode/open_basedir on extension downloader because it triggers false positives

3 years agoGuzzleMiddleware, HttpTestTrait - Add 'DEBUG' option
Tim Otten [Thu, 11 Feb 2021 01:10:39 +0000 (17:10 -0800)]
GuzzleMiddleware, HttpTestTrait - Add 'DEBUG' option

If you run the test with DEBUG=1 or DEBUG=2, it will show a list of the HTTP requests.

3 years agoAdd HttpTestTrait. Distinguish it from GuzzleTestTrait.
Tim Otten [Wed, 10 Feb 2021 22:10:39 +0000 (14:10 -0800)]
Add HttpTestTrait. Distinguish it from GuzzleTestTrait.