civicrm-core.git
4 years agodev/user-interface#14 Fix membership_status_id url handling (recent regression).
eileen [Tue, 31 Mar 2020 08:31:44 +0000 (21:31 +1300)]
dev/user-interface#14 Fix membership_status_id url handling (recent regression).

The right fix here is to fix the xml to the  field setting it to export & adding a uniquename.

However, with our search focus moving on to the new search functionality in the pipeline & us having had
a hiatus on dealing with  search  code I think this more conservative change + a rc focus makes sense
at the  moment

4 years agoMerge pull request #16842 from demeritcowboy/lang-install-crash
Seamus Lee [Wed, 25 Mar 2020 02:45:54 +0000 (13:45 +1100)]
Merge pull request #16842 from demeritcowboy/lang-install-crash

dev/translation#40 - Fix crash when change language on installer page

4 years agoMerge pull request #16891 from seamuslee001/5_23_4_release_notes
Seamus Lee [Tue, 24 Mar 2020 23:46:40 +0000 (10:46 +1100)]
Merge pull request #16891 from seamuslee001/5_23_4_release_notes

Add release-notes/5.23.4.md

4 years agoMerge pull request #16887 from totten/5.24-dbl-path
Seamus Lee [Tue, 24 Mar 2020 23:45:56 +0000 (10:45 +1100)]
Merge pull request #16887 from totten/5.24-dbl-path

dev/joomla#26 - Fix path derivation when CMS is rooted in a subdir

4 years agoAdd release-notes/5.23.4.md
Tim Otten [Tue, 24 Mar 2020 22:28:00 +0000 (15:28 -0700)]
Add release-notes/5.23.4.md

4 years ago(NFC) Update comments in PathsTest.php
Tim Otten [Tue, 24 Mar 2020 21:46:10 +0000 (14:46 -0700)]
(NFC) Update comments in PathsTest.php

4 years agodev/joomla#26 - Fix path derivation when CMS is rooted in a subdir
Tim Otten [Tue, 24 Mar 2020 05:56:36 +0000 (22:56 -0700)]
dev/joomla#26 - Fix path derivation when CMS is rooted in a subdir

Overview
--------

CiviCRM is deployed inside a CMS. The CMS is usually deployed at the HTTP root (`http://example.org`),
but it is sometimes deployed in a subdirectory (`http://example.org/my-cms`).

Some asset URLs are computed using the variables `[civicrm.bower]`, `[civicrm.packages]`, and `[civicrm.vendor]`, which
are derived from the value of `[civicrm.root]`.  However, if the site is deployed in a subdirectory, and if using v5.23,
then the computation of `[civicrm.bower]` (etc) can misbehave.

Before
------

When the URL for `[civicrm.bower]` (or similar) is derived, it goes through multiple filters - first, from absolute to
relative, and then later from relative back to absolute.  In the process, the base is inadvertently changed.

After
-----

When the URL is derived, it is computed in absolute format - and simply kept that way.

Comments
--------

Regarding test coverage, there are two relevant unit-tests. This PR only updates one.

* `E2E\Core\PathUrlTest`: This is a more concrete smoke test which demonstrates functional problems with variables like
  `[civicrm.bower]`.  It should already catch problems like dev/joomla#26...  but only if you run the E2E suite on a system
  where the CMS was deployed to a subdirectory.  `civibuild` doesn't currently include such a build-type.
* `Civi\Core\PathsTest`: This is a more abstract, headless test to examine edge-cases in `Civi\Core\Paths`. It does not
  specifically check for `[civicrm.bower]` or similar variables (b/c the URL routing is ill-defined in a headless context).
  However, I've updated it to compare/contrast the working and non-working ways to derive variables.

4 years agoMerge pull request #16876 from colemanw/ssFix
Eileen McNaughton [Tue, 24 Mar 2020 00:45:43 +0000 (13:45 +1300)]
Merge pull request #16876 from colemanw/ssFix

Fix undefined index warning in SavedSearch api

4 years agoMerge pull request #16702 from seamuslee001/5.24
Tim Otten [Mon, 23 Mar 2020 03:32:47 +0000 (20:32 -0700)]
Merge pull request #16702 from seamuslee001/5.24

bin/*, extern/* - Fix leak of "$config" in global namespace

4 years agoFix undefined index warning in SavedSearch api
Coleman Watts [Sat, 21 Mar 2020 19:32:06 +0000 (15:32 -0400)]
Fix undefined index warning in SavedSearch api

4 years agoMerge pull request #16834 from colemanw/apiGroup
Eileen McNaughton [Fri, 20 Mar 2020 21:40:54 +0000 (10:40 +1300)]
Merge pull request #16834 from colemanw/apiGroup

APIv4 - Improve saveSearch popup in Explorer

4 years agoAPIv4 - Improve saveSearch popup in Explorer
Coleman Watts [Tue, 17 Mar 2020 20:28:14 +0000 (16:28 -0400)]
APIv4 - Improve saveSearch popup in Explorer

4 years agoMerge pull request #16858 from eileenmcnaughton/5.24
Eileen McNaughton [Thu, 19 Mar 2020 22:16:12 +0000 (11:16 +1300)]
Merge pull request #16858 from eileenmcnaughton/5.24

dev/core#1662 - Saved mappings doesn't work for all use cases

4 years agodev/core#1662 - Saved mappings doesn't work for all use cases
Jitendra Purohit [Thu, 19 Mar 2020 10:29:41 +0000 (15:59 +0530)]
dev/core#1662 - Saved mappings doesn't work for all use cases

4 years agoMerge pull request #16841 from seamuslee001/ckeditor_4_14_upgrade
Seamus Lee [Wed, 18 Mar 2020 23:50:38 +0000 (10:50 +1100)]
Merge pull request #16841 from seamuslee001/ckeditor_4_14_upgrade

Update CKEditor 4.14

4 years agofix crash when change language on installer page
demeritcowboy [Wed, 18 Mar 2020 22:30:44 +0000 (18:30 -0400)]
fix crash when change language on installer page

4 years agoUpdate CKEditor 4.14
Seamus Lee [Wed, 18 Mar 2020 22:16:36 +0000 (09:16 +1100)]
Update CKEditor 4.14

4 years agoMerge pull request #16830 from alifrumin/rn-5.24
Seamus Lee [Tue, 17 Mar 2020 22:09:24 +0000 (09:09 +1100)]
Merge pull request #16830 from alifrumin/rn-5.24

[NFC] release-notes 5.24 first pass

4 years agorelease-notes 5.24 first pass
Alice Frumin [Mon, 9 Mar 2020 18:29:08 +0000 (14:29 -0400)]
release-notes 5.24 first pass

4 years agoMerge pull request #16752 from eileenmcnaughton/ext24
Seamus Lee [Mon, 16 Mar 2020 20:37:23 +0000 (07:37 +1100)]
Merge pull request #16752 from eileenmcnaughton/ext24

Fix fatal error on loading extension page when an extension has been deleted

4 years agoMerge pull request #16796 from seamuslee001/notes_5_23_3
Seamus Lee [Mon, 16 Mar 2020 06:15:16 +0000 (17:15 +1100)]
Merge pull request #16796 from seamuslee001/notes_5_23_3

release-notes/5.23.3.md

4 years agorelease-notes/5.23.3.md
Tim Otten [Mon, 16 Mar 2020 06:08:46 +0000 (23:08 -0700)]
release-notes/5.23.3.md

4 years agoMerge pull request #16791 from totten/5.24-dot
Seamus Lee [Mon, 16 Mar 2020 03:51:27 +0000 (14:51 +1100)]
Merge pull request #16791 from totten/5.24-dot

(REF) dev/core#1637, dev/core#1651 - Restore format of packagesBase

4 years ago(NFC) Document format of packagesBase, resourceBase.
Tim Otten [Mon, 16 Mar 2020 00:53:57 +0000 (17:53 -0700)]
(NFC) Document format of packagesBase, resourceBase.

Try to prevent future bounciness in changing these variables.

4 years agodev/core#1637 - Restore format of packagesBase
Tim Otten [Mon, 16 Mar 2020 00:52:26 +0000 (17:52 -0700)]
dev/core#1637 - Restore format of packagesBase

These use-cases had been tested during PR dev for 5.23.alpha, but they
regressed in 5.23.1.  In 5.23.1's #16735, note item (5) and the flip-flop on
`/.` Item (5) references some greps to find references `/.` For obscure
reasons, the  file `l10n.js.tpl` didn't match the greps.

4 years agoRevert "inline editing not working and other js packages issues"
Tim Otten [Mon, 16 Mar 2020 00:20:12 +0000 (17:20 -0700)]
Revert "inline editing not working and other js packages issues"

This reverts commit c68b3313741a367e2510ea6be54895405e4438ca.

4 years agoMerge pull request #16763 from eileenmcnaughton/mem_dash
Eileen McNaughton [Sun, 15 Mar 2020 22:29:21 +0000 (11:29 +1300)]
Merge pull request #16763 from eileenmcnaughton/mem_dash

dev/user-interface#14 Fix regression whereby links from membership dashboard don't work for export

4 years agoMerge pull request #16775 from demeritcowboy/fin-fatals
Eileen McNaughton [Sun, 15 Mar 2020 22:26:02 +0000 (11:26 +1300)]
Merge pull request #16775 from demeritcowboy/fin-fatals

dev/core#1645 - (Test for) Fatal error when assigning account to financial type

4 years agoMerge pull request #16776 from eileenmcnaughton/fform
Seamus Lee [Sun, 15 Mar 2020 20:08:03 +0000 (07:08 +1100)]
Merge pull request #16776 from eileenmcnaughton/fform

dev/core#1645 fix  regression  by removing form inheritance

4 years agoMerge pull request #16779 from demeritcowboy/inline-edit
Seamus Lee [Sun, 15 Mar 2020 19:34:26 +0000 (06:34 +1100)]
Merge pull request #16779 from demeritcowboy/inline-edit

dev/core#1651 and dev/core#1637 - Inline editing not working on many admin screens and other js packages issues

4 years agoinline editing not working and other js packages issues
demeritcowboy [Sun, 15 Mar 2020 15:26:41 +0000 (11:26 -0400)]
inline editing not working and other js packages issues

4 years agodev/core#1645 fix regression by removing form inheritence
eileen [Sat, 14 Mar 2020 21:38:28 +0000 (10:38 +1300)]
dev/core#1645 fix  regression  by removing form inheritence

The Assign  Account form is failing to load because it inherits indirectly from CRM_Admin_Form which
now has a different visibility on the _id property.

I  took a look and there really is no reason for this complex  inheritence - this is a standalone form
and the setDefaults of  the parent seems of no use, let alone the parent's parent.

Assign, edit & browse seem to still work fine

4 years agofatal error when assigning account to financial type
demeritcowboy [Sat, 14 Mar 2020 17:35:30 +0000 (13:35 -0400)]
fatal error when assigning account to financial type

4 years agoMerge pull request #16766 from seamuslee001/5_23_2_release_notes
Seamus Lee [Fri, 13 Mar 2020 10:03:53 +0000 (21:03 +1100)]
Merge pull request #16766 from seamuslee001/5_23_2_release_notes

release-notes/5.23.2.md

4 years agorelease-notes/5.23.2.md
Tim Otten [Fri, 13 Mar 2020 09:50:04 +0000 (02:50 -0700)]
release-notes/5.23.2.md

4 years agoMerge pull request #16761 from eileenmcnaughton/joomla
Tim Otten [Fri, 13 Mar 2020 09:38:46 +0000 (02:38 -0700)]
Merge pull request #16761 from eileenmcnaughton/joomla

dev/financial#120 - Fix CiviCRM base url on Joomla frontend

4 years agodev/user-interface#14 Fix regression whereby links from membership dashboard don...
eileen [Fri, 13 Mar 2020 03:00:19 +0000 (16:00 +1300)]
dev/user-interface#14 Fix regression whereby links from membership dashboard don't work for export

Note it  also applies to membership_status_id but the lack of a uniquename makes the fix trickier  so I'm reluctant to target the
rc

4 years agoAlternate Joomla! fix - move to CMS override
eileen [Fri, 13 Mar 2020 00:56:06 +0000 (13:56 +1300)]
Alternate Joomla! fix - move to CMS override

4 years agoFix fatal error on loading extension page when an extension has been deleted
eileen [Wed, 11 Mar 2020 23:38:10 +0000 (12:38 +1300)]
Fix fatal error on loading extension page when an extension has been deleted

Since we added the concept of 'hidden' tags we are loading them in a way where the exceptions are not caught. This means
that the whole page cannot load - which is needed to disable the missing extension

4 years agoMerge pull request #16750 from eileenmcnaughton/sgroups
Seamus Lee [Wed, 11 Mar 2020 21:55:33 +0000 (08:55 +1100)]
Merge pull request #16750 from eileenmcnaughton/sgroups

Fix smart group custom field  check to cope  with api error

4 years agoFix smart group custom field check to cope with api error
eileen [Wed, 11 Mar 2020 06:01:24 +0000 (19:01 +1300)]
Fix smart group custom field  check to cope  with api error

As we have added new fields to the saved_search table this will lead to a fatal if it runs before
the database update. This catches that error and handles it

4 years agoMerge pull request #16748 from seamuslee001/5_23_1_release_notes
Seamus Lee [Wed, 11 Mar 2020 05:40:06 +0000 (16:40 +1100)]
Merge pull request #16748 from seamuslee001/5_23_1_release_notes

5 23 1 release notes

4 years agoUpdate 5.23.1.md
Tim Otten [Wed, 11 Mar 2020 05:35:00 +0000 (22:35 -0700)]
Update 5.23.1.md

4 years agoAdd release-notes/5.23.1.md
Tim Otten [Wed, 11 Mar 2020 05:08:53 +0000 (22:08 -0700)]
Add release-notes/5.23.1.md

4 years agoMerge pull request #16743 from mlutfy/dev547c
Eileen McNaughton [Wed, 11 Mar 2020 00:22:52 +0000 (13:22 +1300)]
Merge pull request #16743 from mlutfy/dev547c

dev/core#547 Fix Event financial_type_id getOptions

4 years agoMerge pull request #16735 from totten/5.24-paths
Seamus Lee [Wed, 11 Mar 2020 00:07:06 +0000 (11:07 +1100)]
Merge pull request #16735 from totten/5.24-paths

dev/core#1637 - Multiple fixes for Civi/Core/Paths.php

4 years agodev/core#547 Fix Event financial_type_id getOptions
Mathieu Lutfy [Tue, 10 Mar 2020 21:08:04 +0000 (17:08 -0400)]
dev/core#547 Fix Event financial_type_id getOptions

4 years agoE2E_Extern_CliRunnerTest - Update to match change in `./`
Tim Otten [Tue, 10 Mar 2020 21:13:30 +0000 (14:13 -0700)]
E2E_Extern_CliRunnerTest - Update to match change in `./`

Per 16735, the interpretation of `getPath('[foo]/.`)` changed
slightly - from:

* 5.22: Inconsistent/undefined tail end (may or may not have trailing `/`)
* 5.23.0: Defined to always end with `/`
* #16735: Defined to never end with `/`

4 years agoCRM_Core_I18n - Fix usage of `getPath('[foo]/.')`
Tim Otten [Tue, 10 Mar 2020 10:44:32 +0000 (03:44 -0700)]
CRM_Core_I18n - Fix usage of `getPath('[foo]/.')`

The interpretation of `/.` is evolving per #16735:

* When this code was first written, it was unspecified/variable whether the value `[foo]/.` would end in `/`
* During most of the testing of 5.23.beta1, this was defined to always return `/`
* During a regression fix in 5.23.1, we're flipping it back the other way so that `[foo]/.` never ends in `/`.

4 years agodev/core#1637 - Multiple fixes for Civi/Core/Paths.php
Tim Otten [Tue, 10 Mar 2020 07:23:45 +0000 (00:23 -0700)]
dev/core#1637 - Multiple fixes for Civi/Core/Paths.php

For a full write-up, see PR

4 years agodev/core#1637 - PathsTest - Redefine "[foo]/", "[foo]/0", "[foo]/."
Tim Otten [Tue, 10 Mar 2020 07:23:45 +0000 (00:23 -0700)]
dev/core#1637 - PathsTest - Redefine "[foo]/", "[foo]/0", "[foo]/."

The rationale will be discussed more via PR description.

4 years ago(NFC) PathsTest - Make it easier to identify/debug test cases
Tim Otten [Tue, 10 Mar 2020 07:23:45 +0000 (00:23 -0700)]
(NFC) PathsTest - Make it easier to identify/debug test cases

When browsing the list of outputs from this test class, each of the test
cases was identified by its numerical position in the list of `$exs`.  This
makes it hard to keep track of the failures.

1. Add a symbolic name to each case (that's easier to search on)
2. Add more verbose output for failed assertions

4 years ago(NFC) dev/core#1637 - Add E2E test for generation of Civi-WP backend URLs without...
Tim Otten [Tue, 10 Mar 2020 07:23:45 +0000 (00:23 -0700)]
(NFC) dev/core#1637 - Add E2E test for generation of Civi-WP backend URLs without trailing /

4 years agoRevert "Revert "Make $civicrm_paths less sensitive to trailing slashes. Add tests.""
Tim Otten [Tue, 10 Mar 2020 07:23:45 +0000 (00:23 -0700)]
Revert "Revert "Make $civicrm_paths less sensitive to trailing slashes. Add tests.""

This reverts commit cbcbfd69d34c9895342e3d813a42f97d93dbb76d.

4 years agoMerge pull request #16720 from agh1/5.24.0-release-notes
Seamus Lee [Mon, 9 Mar 2020 23:04:06 +0000 (10:04 +1100)]
Merge pull request #16720 from agh1/5.24.0-release-notes

5.24.0 release notes: initial run

4 years agoMerge pull request #16721 from seamuslee001/524_1637
Seamus Lee [Mon, 9 Mar 2020 21:38:43 +0000 (08:38 +1100)]
Merge pull request #16721 from seamuslee001/524_1637

dev/core#1637 Revert "Make $civicrm_paths less sensitive to trailing slashes. Add t…

4 years agoRevert "Make $civicrm_paths less sensitive to trailing slashes. Add tests."
eileen [Mon, 9 Mar 2020 05:01:36 +0000 (18:01 +1300)]
Revert "Make $civicrm_paths less sensitive to trailing slashes. Add tests."

This is currently causing breakage on wordpress sites where clean urls are not enabled.

Compare the 2 urls below - the top one has an extra (breaking) slash added by this PR.

I propose a quick revert  & patch release followed by 'the right' fix at a slower pace
/wp-admin/admin.php/?page=CiviCRM&q=civicrm%2Fupgrade%2Fqueue%2Fajax%2FrunNext
/wp-admin/admin.php?page=CiviCRM&q=civicrm%2Fupgrade%2Fqueue%2Fajax%2FrunNext

This reverts commit 232fdd3dfac4ea09749d7f178818139514e48e38.

4 years ago5.24.0 release notes: added boilerplate
Andrew Hunt [Mon, 9 Mar 2020 17:56:21 +0000 (13:56 -0400)]
5.24.0 release notes: added boilerplate

4 years ago5.24.0 release notes: raw from script
Andrew Hunt [Mon, 9 Mar 2020 17:54:49 +0000 (13:54 -0400)]
5.24.0 release notes: raw from script

4 years agoMerge pull request #16707 from demeritcowboy/smartgroup-warning
Eileen McNaughton [Sun, 8 Mar 2020 22:13:42 +0000 (11:13 +1300)]
Merge pull request #16707 from demeritcowboy/smartgroup-warning

dev/core#1636 - In system status check avoid E_NOTICEs for smart groups that don't have form_values[0]

4 years agoskip smart groups that don't have a form_values[0]
demeritcowboy [Sun, 8 Mar 2020 15:39:19 +0000 (11:39 -0400)]
skip smart groups that don't have a form_values[0]

4 years ago[REF] Remove variable from preboot locations to fix compataiblity with backdrop
Seamus Lee [Fri, 6 Mar 2020 21:55:52 +0000 (08:55 +1100)]
[REF] Remove  variable from preboot locations to fix compataiblity with backdrop

4 years agoSet version to 5.24.beta1
CiviCRM [Thu, 5 Mar 2020 01:44:50 +0000 (01:44 +0000)]
Set version to 5.24.beta1

4 years agoMerge pull request #16677 from eileenmcnaughton/mem
Seamus Lee [Thu, 5 Mar 2020 01:42:39 +0000 (12:42 +1100)]
Merge pull request #16677 from eileenmcnaughton/mem

[REF] Change function signature to support moving this off the form layer

4 years agoMerge pull request #16666 from colemanw/smarter
Eileen McNaughton [Thu, 5 Mar 2020 01:41:20 +0000 (14:41 +1300)]
Merge pull request #16666 from colemanw/smarter

APIv4-based smart groups

4 years agoMerge pull request #16649 from alifrumin/copyState3
Eileen McNaughton [Thu, 5 Mar 2020 00:16:19 +0000 (13:16 +1300)]
Merge pull request #16649 from alifrumin/copyState3

dev/core#1605 State/province not copied on shared address

4 years ago[REF] Change function signature to support moving this off the form layer
eileen [Tue, 3 Mar 2020 19:54:04 +0000 (08:54 +1300)]
[REF] Change function signature to support moving this off the form layer

This is really a business logic function & belongs on the BAO. This change simply removes the
access to  such that it can be moved by making it an input parameter.

Next step would be o make it static & move  it to CRM_Member_BAO_Membership

Evenually this should not be called by the form as the CRM_Member_BAO_Membership
::create function will call it

4 years agoFix "no such field" failure in SmartGroup upgrade
Coleman Watts [Mon, 2 Mar 2020 19:25:23 +0000 (14:25 -0500)]
Fix "no such field" failure in SmartGroup upgrade

Calling api get with no return fields specified is always risky during upgrades because upgrades can add/drop columns.

4 years agoAPIv4 Explorer - add docs for save & execute buttons
Coleman Watts [Mon, 2 Mar 2020 02:36:26 +0000 (21:36 -0500)]
APIv4 Explorer - add docs for save & execute buttons

4 years agoAPIv4-based smart groups
Coleman Watts [Mon, 2 Mar 2020 01:57:25 +0000 (20:57 -0500)]
APIv4-based smart groups

4 years agoAPIv4 - Add SavedSearch entity
Coleman Watts [Thu, 13 Feb 2020 01:00:37 +0000 (20:00 -0500)]
APIv4 - Add SavedSearch entity

4 years agoAdd columns for api_entity & api_params to civicrm_saved_search
Coleman Watts [Tue, 11 Feb 2020 22:22:42 +0000 (17:22 -0500)]
Add columns for api_entity & api_params to civicrm_saved_search

4 years agoMerge pull request #16684 from civicrm/5.23
Eileen McNaughton [Wed, 4 Mar 2020 23:52:39 +0000 (12:52 +1300)]
Merge pull request #16684 from civicrm/5.23

5.23

4 years agoMerge pull request #16686 from demeritcowboy/install-seqcreditnotes
Eileen McNaughton [Wed, 4 Mar 2020 23:52:18 +0000 (12:52 +1300)]
Merge pull request #16686 from demeritcowboy/install-seqcreditnotes

Fix parameter format for upgrade call to install/enable sequentialcreditnotes

4 years agoMerge pull request #16687 from demeritcowboy/letter-h
Seamus Lee [Wed, 4 Mar 2020 22:40:18 +0000 (09:40 +1100)]
Merge pull request #16687 from demeritcowboy/letter-h

[NFC] Add missing letter "h" in upgrade script for task description

4 years agoMerge pull request #16685 from mlutfy/fixSettingsYesNo
Seamus Lee [Wed, 4 Mar 2020 22:39:57 +0000 (09:39 +1100)]
Merge pull request #16685 from mlutfy/fixSettingsYesNo

Fix SettingTrait YesNo translation

4 years agoMerge pull request #16680 from magnolia61/Contribution_Invoice_Enhancements
Eileen McNaughton [Wed, 4 Mar 2020 22:06:34 +0000 (11:06 +1300)]
Merge pull request #16680 from magnolia61/Contribution_Invoice_Enhancements

Style & layout clean up

4 years agoMerge pull request #16683 from demeritcowboy/disable-xoauth2
Seamus Lee [Wed, 4 Mar 2020 21:54:48 +0000 (08:54 +1100)]
Merge pull request #16683 from demeritcowboy/disable-xoauth2

dev/mail#59 - Don't release 5.23 with XOAUTH2 option enabled since it isn't ready yet

4 years agofix parameter format
demeritcowboy [Wed, 4 Mar 2020 21:19:50 +0000 (16:19 -0500)]
fix parameter format

4 years agoadd missing letter h
demeritcowboy [Wed, 4 Mar 2020 21:22:28 +0000 (16:22 -0500)]
add missing letter h

4 years agoMerge pull request #16020 from mattwire/setentityid
Eileen McNaughton [Wed, 4 Mar 2020 21:05:54 +0000 (10:05 +1300)]
Merge pull request #16020 from mattwire/setentityid

Add setEntityId() to entityForm

4 years agoFix SettingTrait YesNo translation
Mathieu Lutfy [Wed, 4 Mar 2020 21:01:54 +0000 (16:01 -0500)]
Fix SettingTrait YesNo translation

4 years agoStyle & layout clean up
magnolia61 [Wed, 4 Mar 2020 08:03:25 +0000 (09:03 +0100)]
Style & layout clean up

4 years agoMerge pull request #16682 from colemanw/remove
Eileen McNaughton [Wed, 4 Mar 2020 20:06:13 +0000 (09:06 +1300)]
Merge pull request #16682 from colemanw/remove

Remove deprecated function CRM_Contact_BAO_GroupContactCache::remove

4 years agoUpdate unit test now that the xoauth2 option is disabled for the time being
Seamus Lee [Wed, 4 Mar 2020 19:52:23 +0000 (06:52 +1100)]
Update unit test now that the xoauth2 option is disabled for the time being

4 years agoMerge pull request #16681 from alifrumin/rn5.23secondpass
Seamus Lee [Wed, 4 Mar 2020 19:50:39 +0000 (06:50 +1100)]
Merge pull request #16681 from alifrumin/rn5.23secondpass

rn-5.23: adding late changes to the 5.23 release notes [nfc]

4 years agoadd test
Alice Frumin [Tue, 3 Mar 2020 18:43:12 +0000 (13:43 -0500)]
add test

4 years agoxoauth2 isn't ready yet
demeritcowboy [Wed, 4 Mar 2020 17:47:45 +0000 (12:47 -0500)]
xoauth2 isn't ready yet

4 years agoRemove deprecated function CRM_Contact_BAO_GroupContactCache::remove
Coleman Watts [Wed, 4 Mar 2020 17:10:12 +0000 (12:10 -0500)]
Remove deprecated function CRM_Contact_BAO_GroupContactCache::remove

4 years agoadding late changes to the 5.23 release notes
Alice Frumin [Wed, 4 Mar 2020 16:26:37 +0000 (11:26 -0500)]
adding late changes to the 5.23 release notes

4 years agoMerge pull request #16675 from christianwach/lab-1628
Matthew Wire [Wed, 4 Mar 2020 14:52:43 +0000 (14:52 +0000)]
Merge pull request #16675 from christianwach/lab-1628

Fix display of administrator permissions in WordPress Multisite

4 years agoFix display of administrator permissions in WordPress Multisite
Christian Wach [Wed, 4 Mar 2020 10:23:01 +0000 (10:23 +0000)]
Fix display of administrator permissions in WordPress Multisite

4 years agoMerge pull request #16676 from christianwach/lab-1629
Eileen McNaughton [Wed, 4 Mar 2020 07:23:44 +0000 (20:23 +1300)]
Merge pull request #16676 from christianwach/lab-1629

Fix synchronisation of Users to Contacts in WordPress Multisite

4 years agoMerge pull request #16679 from pradpnayak/priceSetSchema
Seamus Lee [Wed, 4 Mar 2020 06:31:00 +0000 (17:31 +1100)]
Merge pull request #16679 from pradpnayak/priceSetSchema

added sudo constant for sms api type

4 years agoadded sudo constant for sms api type
Pradeep Nayak [Wed, 4 Mar 2020 01:35:48 +0000 (01:35 +0000)]
added sudo constant for sms api type

4 years agoFix synchronisation of Users to Contacts in WordPress Multisite
Christian Wach [Tue, 3 Mar 2020 12:04:25 +0000 (12:04 +0000)]
Fix synchronisation of Users to Contacts in WordPress Multisite

4 years agoMerge pull request #16672 from MegaphoneJon/core-1627
Seamus Lee [Tue, 3 Mar 2020 02:59:34 +0000 (13:59 +1100)]
Merge pull request #16672 from MegaphoneJon/core-1627

Activity Details report: fix filtering by is null/is not null

4 years agoActivity Details report: fix filtering by is null/is not null
Jon Goldberg [Mon, 2 Mar 2020 23:43:09 +0000 (18:43 -0500)]
Activity Details report: fix filtering by is null/is not null

4 years agoMerge pull request #16667 from eileenmcnaughton/acl
colemanw [Mon, 2 Mar 2020 17:30:34 +0000 (12:30 -0500)]
Merge pull request #16667 from eileenmcnaughton/acl

[REF] Only call getACLs when contact_id is present, remove handling

4 years agoMerge pull request #16566 from eileenmcnaughton/setting_fix
colemanw [Mon, 2 Mar 2020 16:18:26 +0000 (11:18 -0500)]
Merge pull request #16566 from eileenmcnaughton/setting_fix

Remove helper function now that contribution settings is not weirdly stored