civicrm-core.git
3 years agoMerge pull request #19758 from colemanw/searchKitFix
Eileen McNaughton [Mon, 8 Mar 2021 20:11:42 +0000 (09:11 +1300)]
Merge pull request #19758 from colemanw/searchKitFix

SearchKit - Fix broken update dialog and add input type float

3 years agoSearchKit - Fix broken update dialog and add input type float
Coleman Watts [Mon, 8 Mar 2021 13:03:22 +0000 (08:03 -0500)]
SearchKit - Fix broken update dialog and add input type float

3 years agoMerge pull request #19739 from colemanw/afformBreadcrumb
Eileen McNaughton [Sun, 7 Mar 2021 22:46:00 +0000 (11:46 +1300)]
Merge pull request #19739 from colemanw/afformBreadcrumb

Afform - Show breadcrumbs appropriate to whether a form can be edited

3 years agoMerge pull request #19747 from colemanw/searchKitRemoveSelectWhenRemovingJoin
Eileen McNaughton [Sun, 7 Mar 2021 21:11:19 +0000 (10:11 +1300)]
Merge pull request #19747 from colemanw/searchKitRemoveSelectWhenRemovingJoin

SearchKit - Fix removing all related fields from SELECT when removing a JOIN

3 years agoMerge pull request #19740 from agh1/notnotnull
Eileen McNaughton [Sun, 7 Mar 2021 21:06:20 +0000 (10:06 +1300)]
Merge pull request #19740 from agh1/notnotnull

dev/translation#58 further regression fix: don't make group title NOT NULL even for a moment

3 years agoSearchKit - Fix removing all related fields from SELECT when removing a JOIN
Coleman Watts [Sun, 7 Mar 2021 02:42:35 +0000 (21:42 -0500)]
SearchKit - Fix removing all related fields from SELECT when removing a JOIN

3 years agodev/translation#58 don\'t make group title NOT NULL even for a moment
Andrew Hunt [Fri, 5 Mar 2021 22:52:15 +0000 (17:52 -0500)]
dev/translation#58 don\'t make group title NOT NULL even for a moment

3 years agoSearchKit - Add breadcrumb to saved searches from search display view
Coleman Watts [Sat, 6 Mar 2021 16:36:38 +0000 (11:36 -0500)]
SearchKit - Add breadcrumb to saved searches from search display view

3 years agoAfform - simplify code to check if ext enabled
Coleman Watts [Thu, 4 Mar 2021 13:30:43 +0000 (08:30 -0500)]
Afform - simplify code to check if ext enabled

3 years agoAfform - Show breadcrumbs appropriate to whether a form can be edited
Coleman Watts [Fri, 5 Mar 2021 15:32:42 +0000 (10:32 -0500)]
Afform - Show breadcrumbs appropriate to whether a form can be edited

3 years agoMerge pull request #19713 from colemanw/searchDisplayParams
colemanw [Fri, 5 Mar 2021 02:45:54 +0000 (21:45 -0500)]
Merge pull request #19713 from colemanw/searchDisplayParams

SearchKit - Take search filters from the url when viewing a standalone display

3 years agoMerge pull request #19580 from MegaphoneJon/core-1132
colemanw [Thu, 4 Mar 2021 20:52:24 +0000 (15:52 -0500)]
Merge pull request #19580 from MegaphoneJon/core-1132

core#1132 - don't fire hook_civicrm_fieldOptions before hook_civicrm_…

3 years agoSearchKit - Allow variations of field suffix in display filters
Coleman Watts [Thu, 4 Mar 2021 17:58:15 +0000 (12:58 -0500)]
SearchKit - Allow variations of field suffix in display filters

3 years agoSearchKit - Take search filters from the url when viewing a standalone searchDisplay
Coleman Watts [Tue, 2 Mar 2021 20:37:16 +0000 (15:37 -0500)]
SearchKit - Take search filters from the url when viewing a standalone searchDisplay

This passes through all query params from the url fragment as search filters to the display.

3 years agoSet version to 5.36.beta1
CiviCRM [Thu, 4 Mar 2021 06:55:34 +0000 (06:55 +0000)]
Set version to 5.36.beta1

3 years agoMerge pull request #19691 from colemanw/afformEditLink
Eileen McNaughton [Thu, 4 Mar 2021 06:52:46 +0000 (19:52 +1300)]
Merge pull request #19691 from colemanw/afformEditLink

Afform - Add link to edit form in breadcrumbs

3 years agoMerge pull request #19726 from seamuslee001/5.35
Seamus Lee [Thu, 4 Mar 2021 04:54:49 +0000 (15:54 +1100)]
Merge pull request #19726 from seamuslee001/5.35

5.35

3 years agoMerge pull request #19725 from totten/5.35-avail-perm
Tim Otten [Thu, 4 Mar 2021 04:40:16 +0000 (20:40 -0800)]
Merge pull request #19725 from totten/5.35-avail-perm

dev/drupal#156 - system_get_info() is gone in Drupal 9

3 years ago(NFC) release-notes/5.35.0 - Last minute update
Tim Otten [Thu, 4 Mar 2021 04:28:34 +0000 (20:28 -0800)]
(NFC) release-notes/5.35.0 - Last minute update

3 years agosystem_get_info is deprecated
demeritcowboy [Thu, 11 Feb 2021 18:35:15 +0000 (13:35 -0500)]
system_get_info is deprecated

3 years agoMerge pull request #19720 from colemanw/afformSearchFilters
Eileen McNaughton [Thu, 4 Mar 2021 03:37:53 +0000 (16:37 +1300)]
Merge pull request #19720 from colemanw/afformSearchFilters

Improve search display filter validation

3 years agoSearchKit - Validate all filters as belonging to select clause or afform
Coleman Watts [Wed, 3 Mar 2021 20:04:38 +0000 (15:04 -0500)]
SearchKit - Validate all filters as belonging to select clause or afform

When viewing a SearchDisplay, this will verify all filters are permitted by first checking the SELECT clause,
and secondly checking for a containing Afform with exposed filters.

All other filter params will be silently ignored.

3 years agoAfform - use form-level permissions in APIv4 Afform::get
Coleman Watts [Wed, 3 Mar 2021 16:48:27 +0000 (11:48 -0500)]
Afform - use form-level permissions in APIv4 Afform::get

3 years agoMerge pull request #19723 from eileenmcnaughton/price
Seamus Lee [Thu, 4 Mar 2021 01:46:54 +0000 (12:46 +1100)]
Merge pull request #19723 from eileenmcnaughton/price

dev/core#2434 Fix price set id widget

3 years agoMerge pull request #19709 from eileenmcnaughton/ss
colemanw [Thu, 4 Mar 2021 01:28:29 +0000 (20:28 -0500)]
Merge pull request #19709 from eileenmcnaughton/ss

dev/core#2422 Add created_id, modified_id, expires_date to saved search table

3 years agodev/core#2434 Fix price set id widget
eileen [Wed, 3 Mar 2021 20:19:28 +0000 (09:19 +1300)]
dev/core#2434 Fix price set id widget

3 years agoMerge pull request #19722 from civicrm/5.35
Eileen McNaughton [Wed, 3 Mar 2021 23:41:58 +0000 (12:41 +1300)]
Merge pull request #19722 from civicrm/5.35

5.35

3 years agoMerge pull request #19721 from agh1/5.35.0-releasenotes-final
Seamus Lee [Wed, 3 Mar 2021 23:27:55 +0000 (10:27 +1100)]
Merge pull request #19721 from agh1/5.35.0-releasenotes-final

5.35.0 release notes: added late changes

3 years ago5.35.0 release notes: added late changes
Andrew Hunt [Wed, 3 Mar 2021 23:25:48 +0000 (18:25 -0500)]
5.35.0 release notes: added late changes

3 years agoMerge pull request #19476 from eileenmcnaughton/mem_tax
colemanw [Wed, 3 Mar 2021 22:11:11 +0000 (17:11 -0500)]
Merge pull request #19476 from eileenmcnaughton/mem_tax

Fix membership form to correctly calculate tax when a discount is applied

3 years agoMerge pull request #19715 from mattwire/tokenclean
Tim Otten [Wed, 3 Mar 2021 19:37:37 +0000 (11:37 -0800)]
Merge pull request #19715 from mattwire/tokenclean

NFC Update comments in token classes

3 years agoAdd description to saved search
eileen [Wed, 3 Mar 2021 06:23:29 +0000 (19:23 +1300)]
Add description to saved search

3 years agoUpdate comments in token classes
Matthew Wire [Wed, 3 Mar 2021 11:00:33 +0000 (11:00 +0000)]
Update comments in token classes

3 years agoMerge pull request #19590 from totten/master-authx
Seamus Lee [Wed, 3 Mar 2021 07:04:55 +0000 (18:04 +1100)]
Merge pull request #19590 from totten/master-authx

AuthX - Extended authentication support (portable and router-friendly)

3 years agoAlso add created_date & modified_date per discussion on pr
eileen [Tue, 2 Mar 2021 10:40:15 +0000 (23:40 +1300)]
Also add created_date & modified_date per discussion on pr

3 years agodev/core#2422 Add created_id, modified_id, expires_date to saved search table
eileen [Tue, 2 Mar 2021 04:52:18 +0000 (17:52 +1300)]
dev/core#2422 Add created_id, modified_id, expires_date to saved search table

Per

https://lab.civicrm.org/dev/core/-/issues/2422

These can be exposed in the search kit saved search listing as filters when
we get to that point but the earlier we start
saving them the better the data will be when we do expose

3 years agoMerge pull request #19714 from civicrm/5.35
Eileen McNaughton [Wed, 3 Mar 2021 03:48:15 +0000 (16:48 +1300)]
Merge pull request #19714 from civicrm/5.35

5.35

3 years agoMerge pull request #19703 from colemanw/afformStandalone
Tim Otten [Wed, 3 Mar 2021 03:19:08 +0000 (19:19 -0800)]
Merge pull request #19703 from colemanw/afformStandalone

Afform - Remove ngRoute from afformStandalone page

3 years agoMerge pull request #19711 from totten/5.35-upg-smtp
Seamus Lee [Wed, 3 Mar 2021 00:58:11 +0000 (11:58 +1100)]
Merge pull request #19711 from totten/5.35-upg-smtp

Upgrader (5.34) - Handle unsavable characters in decoded SMTP password

3 years agoMerge pull request #19684 from totten/master-authors
Eileen McNaughton [Tue, 2 Mar 2021 21:49:49 +0000 (10:49 +1300)]
Merge pull request #19684 from totten/master-authors

info.xml - Allow multiple `<author>`s

3 years agoMerge pull request #19712 from eileenmcnaughton/merge
Eileen McNaughton [Tue, 2 Mar 2021 20:31:36 +0000 (09:31 +1300)]
Merge pull request #19712 from eileenmcnaughton/merge

5.35 to master

3 years agoMerge branch '5.35' of https://github.com/civicrm/civicrm-core into merge
eileen [Tue, 2 Mar 2021 20:18:02 +0000 (09:18 +1300)]
Merge branch '5.35' of https://github.com/civicrm/civicrm-core into merge

3 years ago(REF) authx - Reorganize internal methods to use an auth-request object
Tim Otten [Fri, 26 Feb 2021 04:18:42 +0000 (20:18 -0800)]
(REF) authx - Reorganize internal methods to use an auth-request object

This significantly trims down the `auth()` method and rearranges as three
methods. A data object is passed between the three methods. The main method:

```
    if ($principal = $this->checkCredential($tgt)) {
      $tgt->setPrincipal($principal);
    }
    $this->checkPolicy($tgt);
    $this->login($tgt);
```

This arrangement lays the groundwork for implementing more varied policies.
For example, we could have a policy where the ability to login via
username/password/api_key is dictated by the user's role or permissions.

3 years ago(REF) Authenticator - Extract field $authxUf
Tim Otten [Fri, 26 Feb 2021 01:57:09 +0000 (17:57 -0800)]
(REF) Authenticator - Extract field $authxUf

3 years agoauthx - If using auto-login, then use a redirect to hide the `?_authx=...` gunk
Tim Otten [Tue, 23 Feb 2021 10:50:39 +0000 (02:50 -0800)]
authx - If using auto-login, then use a redirect to hide the `?_authx=...` gunk

3 years agoauthx - The "already logged in" check should be less sensitive to int-vs-string for...
Tim Otten [Tue, 23 Feb 2021 10:22:35 +0000 (02:22 -0800)]
authx - The "already logged in" check should be less sensitive to int-vs-string for user/contact ID

3 years agoauthx - Support Joomla users+sessions - Prevent leaks among stateless requests
Tim Otten [Sat, 20 Feb 2021 02:30:13 +0000 (18:30 -0800)]
authx - Support Joomla users+sessions - Prevent leaks among stateless requests

3 years agoAllFlowsTest - When executing on a new deployment, ensure demo user has a Civi contact
Tim Otten [Sat, 20 Feb 2021 01:22:05 +0000 (17:22 -0800)]
AllFlowsTest - When executing on a new deployment, ensure demo user has a Civi contact

3 years ago(REF) AllFlowsTest - Cleanup helper signature
Tim Otten [Sat, 20 Feb 2021 00:01:34 +0000 (16:01 -0800)]
(REF) AllFlowsTest - Cleanup helper signature

3 years agoAllFlowsTest - Add cases with multiple identities from the same browser
Tim Otten [Fri, 19 Feb 2021 23:58:03 +0000 (15:58 -0800)]
AllFlowsTest - Add cases with multiple identities from the same browser

3 years agoAllFlowsTest - Add test for checking contact+user vs contact-only
Tim Otten [Fri, 19 Feb 2021 23:19:55 +0000 (15:19 -0800)]
AllFlowsTest - Add test for checking contact+user vs contact-only

3 years agodistmaker - Add authx to tarball
Tim Otten [Wed, 17 Feb 2021 02:56:09 +0000 (18:56 -0800)]
distmaker - Add authx to tarball

3 years agoauthx - Make it safe to load the 'authx.settings.php' file multiple times
Tim Otten [Sat, 20 Feb 2021 00:08:02 +0000 (16:08 -0800)]
authx - Make it safe to load the 'authx.settings.php' file multiple times

3 years agoauthx - Support Joomla users+sessions
Tim Otten [Tue, 16 Feb 2021 21:38:07 +0000 (13:38 -0800)]
authx - Support Joomla users+sessions

3 years agoauthx - Support Drupal 8 users+sessions
Tim Otten [Tue, 16 Feb 2021 09:12:45 +0000 (01:12 -0800)]
authx - Support Drupal 8 users+sessions

3 years agoauthx - Support Backdrop users+sessions
Tim Otten [Tue, 16 Feb 2021 07:42:53 +0000 (23:42 -0800)]
authx - Support Backdrop users+sessions

3 years ago(REF) AllFlowsTest - Misc cleanup
Tim Otten [Wed, 17 Feb 2021 02:55:23 +0000 (18:55 -0800)]
(REF) AllFlowsTest - Misc cleanup

3 years agoauthx - Support login/logout flow
Tim Otten [Tue, 16 Feb 2021 06:12:06 +0000 (22:12 -0800)]
authx - Support login/logout flow

3 years agoauthx - Support JWT credentials
Tim Otten [Tue, 16 Feb 2021 02:28:18 +0000 (18:28 -0800)]
authx - Support JWT credentials

3 years agoauthx - Primary implementation, including Drupal 7 and WordPress
Tim Otten [Fri, 12 Feb 2021 20:51:52 +0000 (12:51 -0800)]
authx - Primary implementation, including Drupal 7 and WordPress

3 years agoauthx - Add the AllFlowsTest
Tim Otten [Fri, 12 Feb 2021 20:52:38 +0000 (12:52 -0800)]
authx - Add the AllFlowsTest

3 years agoauthx - Add page to check identity ('civicrm/authx/id')
Tim Otten [Fri, 12 Feb 2021 23:55:42 +0000 (15:55 -0800)]
authx - Add page to check identity ('civicrm/authx/id')

3 years agoauthx - Declare settings for allowed flows and credentials
Tim Otten [Fri, 12 Feb 2021 23:16:50 +0000 (15:16 -0800)]
authx - Declare settings for allowed flows and credentials

3 years agoauthx - Draft README and info.xml
Tim Otten [Fri, 12 Feb 2021 20:50:54 +0000 (12:50 -0800)]
authx - Draft README and info.xml

3 years agoauthx - Generate skeleton
Tim Otten [Fri, 12 Feb 2021 06:28:33 +0000 (22:28 -0800)]
authx - Generate skeleton

3 years agoCRM_Core_Session - Add option 'useFakeSession()' for stateless requests
Tim Otten [Sat, 13 Feb 2021 02:11:39 +0000 (18:11 -0800)]
CRM_Core_Session - Add option 'useFakeSession()' for stateless requests

3 years agoCRM_Core_Invoker - Emit authorization event
Tim Otten [Fri, 12 Feb 2021 20:26:36 +0000 (12:26 -0800)]
CRM_Core_Invoker - Emit authorization event

3 years agoAfform - use search params instead of route params
Coleman Watts [Tue, 2 Mar 2021 13:52:43 +0000 (08:52 -0500)]
Afform - use search params instead of route params

3 years agoAfform - Remove ngRoute from afformStandalone page
Coleman Watts [Mon, 1 Mar 2021 18:54:30 +0000 (13:54 -0500)]
Afform - Remove ngRoute from afformStandalone page

Afforms are meant to work as standalone directives so routing on the standalone page was meaningless

3 years agoMerge pull request #19694 from eileenmcnaughton/dash
colemanw [Tue, 2 Mar 2021 13:43:48 +0000 (08:43 -0500)]
Merge pull request #19694 from eileenmcnaughton/dash

dev/core#2426 Fix regression whereby the dashboard crashes (permission related)

3 years agoUpgrader (5.34) - Handle unsavable characters
Tim Otten [Tue, 2 Mar 2021 12:10:15 +0000 (04:10 -0800)]
Upgrader (5.34) - Handle unsavable characters

Overview
--------

In php-mysqli with utf8mb4, the escaping rules do not handle 8-bit
characters (`chr(128)`+). ([Demo](https://gist.github.com/totten/4083741b920113ffc569d40053ce849d))

Here's a situation reported by @agileware-justin which provokes this:

> 1. SMTP credentials (mailing_backend) were saved and had been encrypted using mcrypt, prior to PHP 7.1
> 2. SMTP outbound email was NOT enabled, but the SMTP credentials are in the database
> 3. Active PHP version was PHP 7.3, without mcrypt module
> 4. CiviCRM 5.34 upgrade triggers the database error

Before
------

The behavior can be viewed in two variables:

* Depending on whether `CIVICRM_CRED_KEYS` is set, the upgrader may be
  writing passwords as plain-text or as `^CTK?` tokens.
* Depending on what value is in `$setting['smtpPassword']`, what value is in
  `CIVICRM_SITE_KEY`, and whether `mcrypt` is active, we may or may not get
  8-bit characters when reading the password
  (`CRM_Utils_Crypt::decrypt($setting['smtpPassword'])`).

The fatal combination arises when using plain-text with 8-bit characters.
But other combinations (encrypted tokens and/or 7-bit plain-text) seem
fine.

After
-----

As before, combinations involving encrypted tokens and/or 7-bit plain-text
are fine.

We don't have a head-on soultion for escaping 8-bit plain-text for use with
php-mysqli-utf8mb4.  (Which is insane, right?) But now we manage the
symptoms better:

* If you aren't even using SMTP (like in Justin's example),
  then this is not legit.  We show a warning and simply discard the
  unneeded/corrupt value of `smtpPassword`.

* If you are using SMTP, then this might theoretically be legit.
  (We haven't confirmed, but it seems plausible in other locales.) We show a
  different warning and encourage the sysadmin to setup `CIVICRM_CRED_KEYS`
  (which will enable the more permissive `^CTK?` format.)

3 years agoMerge pull request #19683 from colemanw/searchDisplayFixes
Eileen McNaughton [Tue, 2 Mar 2021 11:00:21 +0000 (00:00 +1300)]
Merge pull request #19683 from colemanw/searchDisplayFixes

Search display fixes

3 years agodev/core#2426 Fix regression whereby the dashboard crashes for contacts unable to...
eileen [Sun, 28 Feb 2021 22:34:11 +0000 (11:34 +1300)]
dev/core#2426 Fix regression whereby the dashboard crashes for contacts unable to view their own contact record.

As noted in the code comments this was not my preferred technical fix but I do lean
towards using this in the rc & reconsidering the other approaches in master.

Also, in master I got a different error that I think related to new work

3 years agoMerge pull request #19708 from J0WI/patch-1
Seamus Lee [Tue, 2 Mar 2021 08:54:25 +0000 (19:54 +1100)]
Merge pull request #19708 from J0WI/patch-1

Fix migrateUtf8mb4 for special database names

3 years agoMerge pull request #19675 from demeritcowboy/casedashlets
Eileen McNaughton [Tue, 2 Mar 2021 07:27:16 +0000 (20:27 +1300)]
Merge pull request #19675 from demeritcowboy/casedashlets

dev/core#1400 - Put dashlets back to only showing open cases by default

3 years agoFix angular error when user is not logged in.
Coleman Watts [Wed, 10 Feb 2021 01:21:57 +0000 (20:21 -0500)]
Fix angular error when user is not logged in.

3 years agoFix migrateUtf8mb4 for special database names
J0WI [Tue, 2 Mar 2021 00:30:51 +0000 (00:30 +0000)]
Fix migrateUtf8mb4 for special database names

3 years agoMerge pull request #19702 from seamuslee001/domain_petition_emails
Eileen McNaughton [Tue, 2 Mar 2021 00:14:34 +0000 (13:14 +1300)]
Merge pull request #19702 from seamuslee001/domain_petition_emails

[NFC] Add in unit test to prove that domain tokens are able to be inc…

3 years agoMerge pull request #19706 from civicrm/5.35
Eileen McNaughton [Tue, 2 Mar 2021 00:12:47 +0000 (13:12 +1300)]
Merge pull request #19706 from civicrm/5.35

5.35

3 years agoMerge pull request #19705 from seamuslee001/update_schema_handler_test
Seamus Lee [Mon, 1 Mar 2021 21:57:34 +0000 (08:57 +1100)]
Merge pull request #19705 from seamuslee001/update_schema_handler_test

[NFC] Update Schema Handler to use the standard create table syntax o…

3 years agoMerge pull request #19704 from colemanw/removeDeprecatedAngularJs
colemanw [Mon, 1 Mar 2021 21:01:07 +0000 (16:01 -0500)]
Merge pull request #19704 from colemanw/removeDeprecatedAngularJs

Angular - Remove deprecated js file

3 years ago[NFC] Update Schema Handler to use the standard create table syntax of using ROW_FORM...
Seamus Lee [Mon, 1 Mar 2021 20:27:32 +0000 (07:27 +1100)]
[NFC] Update Schema Handler to use the standard create table syntax of using ROW_FORMAT=dynamic

3 years ago[NFC] Add in unit test to prove that domain tokens are able to be incldued in peition...
Seamus Lee [Mon, 1 Mar 2021 10:34:09 +0000 (21:34 +1100)]
[NFC] Add in unit test to prove that domain tokens are able to be incldued in peition emails

3 years agoMerge pull request #19698 from eileenmcnaughton/custom
colemanw [Mon, 1 Mar 2021 19:40:05 +0000 (14:40 -0500)]
Merge pull request #19698 from eileenmcnaughton/custom

dev/core#2423 Fix quasi-regression around serialized custom fields

3 years agoAngular - Remove deprecated js file
Coleman Watts [Mon, 1 Mar 2021 19:27:53 +0000 (14:27 -0500)]
Angular - Remove deprecated js file

3 years agoMerge pull request #19701 from civicrm/5.35
Eileen McNaughton [Mon, 1 Mar 2021 08:31:36 +0000 (21:31 +1300)]
Merge pull request #19701 from civicrm/5.35

5.35

3 years agoBring back some madness
eileen [Mon, 1 Mar 2021 06:21:34 +0000 (19:21 +1300)]
Bring back some madness

3 years agodev/core#2423 Fix quasi-regression around serialized custom fields
eileen [Mon, 1 Mar 2021 03:18:48 +0000 (16:18 +1300)]
dev/core#2423 Fix quasi-regression around serialized custom fields

https://lab.civicrm.org/dev/core/-/issues/2423

3 years agoMerge pull request #19692 from demeritcowboy/case-custom-money-5.35
Seamus Lee [Mon, 1 Mar 2021 06:10:35 +0000 (17:10 +1100)]
Merge pull request #19692 from demeritcowboy/case-custom-money-5.35

dev/core#2394 - Don't crash when saving custom case fields of type money

3 years agoMerge pull request #19699 from colemanw/controlField
Eileen McNaughton [Mon, 1 Mar 2021 05:22:26 +0000 (18:22 +1300)]
Merge pull request #19699 from colemanw/controlField

APIv4 - Rename 'controlField' property to 'control_field'

3 years agoMerge pull request #19695 from civicrm/5.35
Seamus Lee [Mon, 1 Mar 2021 04:36:31 +0000 (15:36 +1100)]
Merge pull request #19695 from civicrm/5.35

5.35

3 years agoAPIv4 - Rename 'controlField' property to 'control_field' for consistency
Coleman Watts [Mon, 1 Mar 2021 03:53:11 +0000 (22:53 -0500)]
APIv4 - Rename 'controlField' property to 'control_field' for consistency

By convention, all keys returned from the api should be lowercase.

3 years agoMerge pull request #19690 from colemanw/api3Operators
colemanw [Mon, 1 Mar 2021 02:27:02 +0000 (21:27 -0500)]
Merge pull request #19690 from colemanw/api3Operators

APIv3 - Improve array-based apis to support sorting and operators

3 years agoMerge pull request #19680 from eileenmcnaughton/money
Seamus Lee [Mon, 1 Mar 2021 02:24:10 +0000 (13:24 +1100)]
Merge pull request #19680 from eileenmcnaughton/money

dev/financial#166 Fix for inconsistency around currency symbol

3 years agoMerge pull request #19696 from eileenmcnaughton/user
Eileen McNaughton [Mon, 1 Mar 2021 02:15:44 +0000 (15:15 +1300)]
Merge pull request #19696 from eileenmcnaughton/user

dev/core#2427 Fix user creation regression

3 years agoMerge pull request #19629 from MegaphoneJon/core-2386
Eileen McNaughton [Mon, 1 Mar 2021 01:56:53 +0000 (14:56 +1300)]
Merge pull request #19629 from MegaphoneJon/core-2386

core#2386 - metadata-driven chain-select fields

3 years agoAPIv3 - Improve array-based apis to support sorting and multiple operators
Coleman Watts [Sun, 28 Feb 2021 04:18:41 +0000 (23:18 -0500)]
APIv3 - Improve array-based apis to support sorting and multiple operators

This backports some APIv4 code to v3, for the purpose of supporting
entityRef widgets for Afform.

3 years agoMerge pull request #19668 from eileenmcnaughton/empty_rows
colemanw [Mon, 1 Mar 2021 01:06:27 +0000 (20:06 -0500)]
Merge pull request #19668 from eileenmcnaughton/empty_rows

dev/core#2420 Add text to report template saying no results found if that is the case

3 years agodev/core#2427 Fix user creation regression
eileen [Mon, 1 Mar 2021 00:42:51 +0000 (13:42 +1300)]
dev/core#2427 Fix user creation regression

3 years agoMerge pull request #19693 from eileenmcnaughton/if
colemanw [Mon, 1 Mar 2021 00:42:15 +0000 (19:42 -0500)]
Merge pull request #19693 from eileenmcnaughton/if

[REF] clean up if