civicrm-core.git
4 years agoMerge pull request #16691 from mattwire/eventcart_cleanup
Mathieu Lu [Wed, 11 Mar 2020 22:34:27 +0000 (18:34 -0400)]
Merge pull request #16691 from mattwire/eventcart_cleanup

Event Cart cleanup

4 years agoMerge pull request #16749 from civicrm/5.24
Eileen McNaughton [Wed, 11 Mar 2020 22:03:00 +0000 (11:03 +1300)]
Merge pull request #16749 from civicrm/5.24

5.24

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 agoMerge pull request #16741 from mattwire/addrecurid2
Seamus Lee [Wed, 11 Mar 2020 19:42:09 +0000 (06:42 +1100)]
Merge pull request #16741 from mattwire/addrecurid2

Add recurring contribution ID to doCancelRecurring

4 years agoMerge pull request #16678 from seamuslee001/php_7_1_bump
Seamus Lee [Wed, 11 Mar 2020 19:27:06 +0000 (06:27 +1100)]
Merge pull request #16678 from seamuslee001/php_7_1_bump

Bump Minimum Install version to be 7.1 (Do not merge until 5.24 RC is cut)

4 years agoMerge pull request #16651 from kartik1000/core-1613
Matthew Wire [Wed, 11 Mar 2020 17:41:29 +0000 (17:41 +0000)]
Merge pull request #16651 from kartik1000/core-1613

dev/core#1613/Updated Misleading labels

4 years agoRebased
Kartik Kathuria [Wed, 11 Mar 2020 14:57:02 +0000 (20:27 +0530)]
Rebased

Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
4 years agoAdd recur ID to doCancelRecurring
Matthew Wire [Tue, 10 Mar 2020 21:27:35 +0000 (21:27 +0000)]
Add recur ID to doCancelRecurring

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 #16744 from civicrm/5.24
Seamus Lee [Wed, 11 Mar 2020 03:35:25 +0000 (14:35 +1100)]
Merge pull request #16744 from civicrm/5.24

5.24

4 years agoMerge pull request #16740 from mattwire/addrecurid
Eileen McNaughton [Wed, 11 Mar 2020 00:40:45 +0000 (13:40 +1300)]
Merge pull request #16740 from mattwire/addrecurid

REF Switch to getter on cancelSubscription form

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 agoMerge pull request #16734 from eileenmcnaughton/array2
Eileen McNaughton [Tue, 10 Mar 2020 22:15:49 +0000 (11:15 +1300)]
Merge pull request #16734 from eileenmcnaughton/array2

[REF] Minor code simplification

4 years agoSwitch to getter function for subscriptionDetails
Matthew Wire [Tue, 10 Mar 2020 21:19:20 +0000 (21:19 +0000)]
Switch to getter function for subscriptionDetails

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 agoMerge pull request #16501 from eileenmcnaughton/cancel_recur
Matthew Wire [Tue, 10 Mar 2020 21:08:35 +0000 (21:08 +0000)]
Merge pull request #16501 from eileenmcnaughton/cancel_recur

Update cancelSubscription  form to use updated methodology

4 years agoMerge pull request #16732 from demeritcowboy/conformance
colemanw [Tue, 10 Mar 2020 19:06:15 +0000 (15:06 -0400)]
Merge pull request #16732 from demeritcowboy/conformance

[REF] Hopefully fix regularly failing conformance test

4 years agoMerge pull request #16718 from colemanw/respond
Eileen McNaughton [Tue, 10 Mar 2020 18:56:41 +0000 (07:56 +1300)]
Merge pull request #16718 from colemanw/respond

Improve conditional in api3 ChainSubscriber

4 years ago[REF] Minor code simplification
eileen [Tue, 10 Mar 2020 09:29:36 +0000 (22:29 +1300)]
[REF] Minor code simplification

Move the return earlier, simplify the IF

4 years agoMerge pull request #16737 from artfulrobot/artfulrobot-array-values-followup
colemanw [Tue, 10 Mar 2020 14:49:47 +0000 (10:49 -0400)]
Merge pull request #16737 from artfulrobot/artfulrobot-array-values-followup

CRM_Utils_Array::values follow up from #16699

4 years agoFix array value accessing non existent properties on an ArrayAccess object
Rich Lott / Artful Robot [Tue, 10 Mar 2020 12:19:56 +0000 (12:19 +0000)]
Fix array value accessing non existent properties on an ArrayAccess object

4 years agoadd failing test
Rich Lott / Artful Robot [Tue, 10 Mar 2020 12:06:23 +0000 (12:06 +0000)]
add failing test

4 years agoMerge pull request #16699 from eileenmcnaughton/array
colemanw [Tue, 10 Mar 2020 11:21:17 +0000 (07:21 -0400)]
Merge pull request #16699 from eileenmcnaughton/array

Support PropertyBag in CRM_Utils_Array

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 agoSupport PropertyBag in CRM_Utils_Array
eileen [Fri, 6 Mar 2020 09:29:37 +0000 (22:29 +1300)]
Support PropertyBag in CRM_Utils_Array

We now use the PropertyBag in payment processors - but as @mattwire discovered the CRM_Utils_Array::value
function is commonly used to access values now potentially 'in the bag' and the 'is_array'
filtering here means it is not being returned

4 years agoMerge pull request #16729 from colemanw/arrayValue4
Eileen McNaughton [Tue, 10 Mar 2020 08:57:41 +0000 (21:57 +1300)]
Merge pull request #16729 from colemanw/arrayValue4

[REF] Use empty() instead of CRM_Utils_Array::value() in inline conditionals

4 years agoMerge pull request #16728 from civicrm/5.24
Eileen McNaughton [Tue, 10 Mar 2020 08:43:01 +0000 (21:43 +1300)]
Merge pull request #16728 from civicrm/5.24

5.24

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 agohopefully fix failing test
demeritcowboy [Tue, 10 Mar 2020 01:25:29 +0000 (21:25 -0400)]
hopefully fix failing test

4 years agoMerge pull request #16727 from pradpnayak/priceSetSchema
colemanw [Tue, 10 Mar 2020 00:22:04 +0000 (20:22 -0400)]
Merge pull request #16727 from pradpnayak/priceSetSchema

pseudoconstant for bounce type

4 years agoMerge pull request #16719 from colemanw/arrayValue3
colemanw [Tue, 10 Mar 2020 00:21:15 +0000 (20:21 -0400)]
Merge pull request #16719 from colemanw/arrayValue3

[REF] Use ?? operator instead of CRM_Utils_Array::value() in return statements

4 years agoUse empty() instead of CRM_Utils_Array::value() in inline conditionals
Coleman Watts [Mon, 9 Mar 2020 23:15:12 +0000 (19:15 -0400)]
Use empty() instead of CRM_Utils_Array::value() in inline conditionals

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 agopseudoconstant for bounce type
Pradeep Nayak [Mon, 9 Mar 2020 22:57:46 +0000 (22:57 +0000)]
pseudoconstant for bounce type

4 years agoMerge pull request #16711 from eileenmcnaughton/deprecated
colemanw [Mon, 9 Mar 2020 22:46:02 +0000 (18:46 -0400)]
Merge pull request #16711 from eileenmcnaughton/deprecated

Fix another instance of NULL being passed to CRM_Utils_Array::value

4 years agoMerge pull request #16725 from civicrm/5.24
Seamus Lee [Mon, 9 Mar 2020 21:39:44 +0000 (08:39 +1100)]
Merge pull request #16725 from civicrm/5.24

5.24

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 agoMerge pull request #16692 from MegaphoneJon/financial-119
Seamus Lee [Mon, 9 Mar 2020 20:13:48 +0000 (07:13 +1100)]
Merge pull request #16692 from MegaphoneJon/financial-119

Fix PayPal Express on events

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 agoUse ?? operator instead of CRM_Utils_Array::value() in return statements
Coleman Watts [Mon, 9 Mar 2020 15:50:45 +0000 (11:50 -0400)]
Use ?? operator instead of CRM_Utils_Array::value() in return statements

4 years agoImprove conditional in api3 ChainSubscriber
Coleman Watts [Mon, 9 Mar 2020 13:58:41 +0000 (09:58 -0400)]
Improve conditional in api3 ChainSubscriber

4 years agoMerge pull request #16713 from eileenmcnaughton/regress
colemanw [Mon, 9 Mar 2020 13:36:31 +0000 (09:36 -0400)]
Merge pull request #16713 from eileenmcnaughton/regress

dev/core#1637 regression fix on WP urls

4 years agoMerge pull request #16712 from eileenmcnaughton/dep2
Seamus Lee [Mon, 9 Mar 2020 06:25:40 +0000 (17:25 +1100)]
Merge pull request #16712 from eileenmcnaughton/dep2

Fix another instance of silly use of CRM_Utils_Array::value

4 years agoMerge pull request #16693 from eileenmcnaughton/prior
Seamus Lee [Mon, 9 Mar 2020 06:23:16 +0000 (17:23 +1100)]
Merge pull request #16693 from eileenmcnaughton/prior

[NFC] Fix comments, use single quotes

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 agoFix another instance of silly use of CRM_Utils_Array::value
eileen [Mon, 9 Mar 2020 01:25:42 +0000 (14:25 +1300)]
Fix another instance of silly use of CRM_Utils_Array::value

4 years agoMerge pull request #16703 from pradpnayak/priceSetSchema
Eileen McNaughton [Mon, 9 Mar 2020 01:53:40 +0000 (14:53 +1300)]
Merge pull request #16703 from pradpnayak/priceSetSchema

Added pseudoconstant for civicrm_tag.parent_id

4 years agoFix another instance of NULL being passed to CRM_Utils_Array::value
eileen [Mon, 9 Mar 2020 01:17:10 +0000 (14:17 +1300)]
Fix another instance of NULL being passed to CRM_Utils_Array::value

Note that the test has only cosmetic changes picked up while running the test to identify the bug

4 years agoMerge pull request #16709 from civicrm/5.24
Seamus Lee [Mon, 9 Mar 2020 01:01:08 +0000 (12:01 +1100)]
Merge pull request #16709 from civicrm/5.24

5.24

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 agoMerge pull request #16706 from eileenmcnaughton/array2
colemanw [Sun, 8 Mar 2020 22:00:37 +0000 (18:00 -0400)]
Merge pull request #16706 from eileenmcnaughton/array2

Remove an instance of passing non-arraay to CRM_Utils_Array::value(

4 years agoMerge pull request #16704 from colemanw/arrayValue1
colemanw [Sun, 8 Mar 2020 19:30:31 +0000 (15:30 -0400)]
Merge pull request #16704 from colemanw/arrayValue1

[REF] CRM_Utils_Array::value() -> empty()

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 agoRemove an instance of passing non-arraay to CRM_Utils_Array::value(
eileen [Sun, 8 Mar 2020 08:55:36 +0000 (21:55 +1300)]
Remove an instance of passing non-arraay to CRM_Utils_Array::value(

4 years agoMerge pull request #16696 from eileenmcnaughton/remove
colemanw [Sun, 8 Mar 2020 00:12:37 +0000 (19:12 -0500)]
Merge pull request #16696 from eileenmcnaughton/remove

Remove calls & deprecate CRM_Core_BAO_PrevNextCache::setItem

4 years agoMerge pull request #16705 from mlutfy/api4-ajax-perm
colemanw [Sun, 8 Mar 2020 00:05:56 +0000 (19:05 -0500)]
Merge pull request #16705 from mlutfy/api4-ajax-perm

Api4 AJAX endpoint: change required permission to access AJAX API.

4 years agoCRM_Utils_Array::value() -> empty()
Coleman Watts [Sat, 7 Mar 2020 17:48:11 +0000 (12:48 -0500)]
CRM_Utils_Array::value() -> empty()

Replaces CRM_Utils_Array::value() with empty() when the value is immediately cast to boolean.
The two statements have identical meaning but the latter is faster & easier to read.

4 years agoApi4 AJAX endpoint: change required permission to access AJAX API.
Mathieu Lutfy [Sat, 7 Mar 2020 21:39:11 +0000 (16:39 -0500)]
Api4 AJAX endpoint: change required permission to access AJAX API.

4 years agoFlush pseudoconstant cache when saving a tag
Coleman Watts [Sat, 7 Mar 2020 18:50:25 +0000 (13:50 -0500)]
Flush pseudoconstant cache when saving a tag

4 years agoMerge pull request #16701 from eileenmcnaughton/array2
colemanw [Sat, 7 Mar 2020 18:09:06 +0000 (13:09 -0500)]
Merge pull request #16701 from eileenmcnaughton/array2

Fix passing a non-array to CRM_Utils_Array::value

4 years agoBump Minimum Install version to be 7.1
Seamus Lee [Wed, 4 Mar 2020 00:18:21 +0000 (11:18 +1100)]
Bump Minimum Install version to be 7.1

4 years agoFix passing a non-array to CRM_Utils_Array::value
eileen [Fri, 6 Mar 2020 20:33:02 +0000 (09:33 +1300)]
Fix passing a non-array to CRM_Utils_Array::value

As surfaced in https://test.civicrm.org/job/CiviCRM-Core-PR/32543/console when we tested deprecating
passing in a non-array

4 years agoAdded pseudoconstant for civicrm_tag.parent_id
Pradeep Nayak [Fri, 6 Mar 2020 22:19:09 +0000 (22:19 +0000)]
Added pseudoconstant for civicrm_tag.parent_id

4 years agoMerge pull request #16690 from kartik1000/Shift_Update_Membership
Eileen McNaughton [Fri, 6 Mar 2020 08:13:21 +0000 (21:13 +1300)]
Merge pull request #16690 from kartik1000/Shift_Update_Membership

Shifted UpdateMemberhsip to BAO Layer

4 years agoMerge pull request #16689 from pradpnayak/priceSetSchema
Seamus Lee [Fri, 6 Mar 2020 07:00:19 +0000 (18:00 +1100)]
Merge pull request #16689 from pradpnayak/priceSetSchema

Use dbAlias to generate where clause for date field in activity report

4 years agoMerge pull request #16698 from eileenmcnaughton/note
Seamus Lee [Fri, 6 Mar 2020 06:54:37 +0000 (17:54 +1100)]
Merge pull request #16698 from eileenmcnaughton/note

[NFC] Mark unused function deprecated, fix some comments & formatting

4 years ago[NFC] Mark unused function deprecated, fix some comments
eileen [Fri, 6 Mar 2020 02:01:32 +0000 (15:01 +1300)]
[NFC] Mark unused function deprecated, fix some comments

4 years agoRemove calls & deprecate CRM_Core_BAO_PrevNextCache::setItem
eileen [Fri, 6 Mar 2020 00:36:23 +0000 (13:36 +1300)]
Remove calls & deprecate CRM_Core_BAO_PrevNextCache::setItem

We have this function which

1) is mildly misleading - it appears to be generic to the prevnext table but is actually
only relevant to deduping as searches no longer use it
2) is about 50% deprecated and
3) the remainder is a single insert
4) is called from 2 places which use it a little differently

I think it's not really adding much value - I was going to remove the deprecated code
but I think in fact the goal should be to remove the whole function.

In general I think code on CRM_Core_BAO_PrevNextCache that is really dedupe-only code
should be on the dedupe classes. The history is that prevnext was created for searches
and kindof twisted to support dedupe as well but now search doesn't use much of what
is in the BAO class (if any)

4 years agoFix PayPal Express on events
Jon Goldberg [Thu, 5 Mar 2020 22:24:16 +0000 (17:24 -0500)]
Fix PayPal Express on events

4 years agoCleanup ParticipantsAndPrices template for event cart
Matthew Wire [Thu, 5 Mar 2020 22:02:28 +0000 (22:02 +0000)]
Cleanup ParticipantsAndPrices template for event cart

4 years agoSplit event list page from ical/rss feeds
Matthew Wire [Thu, 5 Mar 2020 22:12:06 +0000 (22:12 +0000)]
Split event list page from ical/rss feeds

4 years agoCleanup 'View Cart' form markup
Matthew Wire [Thu, 5 Mar 2020 21:56:15 +0000 (21:56 +0000)]
Cleanup 'View Cart' form markup

4 years agoHandle non-default currency
Matthew Wire [Thu, 5 Mar 2020 21:55:03 +0000 (21:55 +0000)]
Handle non-default currency

4 years agoRemove non working code that makes event cart behave differently if you are an admini...
Matthew Wire [Thu, 5 Mar 2020 21:53:58 +0000 (21:53 +0000)]
Remove non working code that makes event cart behave differently if you are an administrator

4 years agoCode cleanup in event cart
Matthew Wire [Thu, 5 Mar 2020 22:11:55 +0000 (22:11 +0000)]
Code cleanup in event cart

4 years ago[NFC] Fix comments, use single quotes
eileen [Thu, 5 Mar 2020 21:21:05 +0000 (10:21 +1300)]
[NFC] Fix comments, use single quotes

4 years agoadded empty line
Kartik Kathuria [Thu, 5 Mar 2020 21:03:57 +0000 (02:33 +0530)]
added empty line

Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
4 years agoShifted UpdateMemberhsip to BAO Layer
Kartik Kathuria [Thu, 5 Mar 2020 20:48:31 +0000 (02:18 +0530)]
Shifted UpdateMemberhsip to BAO Layer

Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
4 years agoMerge pull request #16550 from eileenmcnaughton/display
Matthew Wire [Thu, 5 Mar 2020 18:12:56 +0000 (18:12 +0000)]
Merge pull request #16550 from eileenmcnaughton/display

Remove additional display of buttons for events

4 years agoMerge pull request #16625 from seamuslee001/jquery_validation_upgrade
Matthew Wire [Thu, 5 Mar 2020 18:11:32 +0000 (18:11 +0000)]
Merge pull request #16625 from seamuslee001/jquery_validation_upgrade

Upgrade jQuery validation version to v1.19.1

4 years agoMerge pull request #16688 from eileenmcnaughton/prior
Matthew Wire [Thu, 5 Mar 2020 18:09:09 +0000 (18:09 +0000)]
Merge pull request #16688 from eileenmcnaughton/prior

Mark unused function as deprecated

4 years agoMerge pull request #14667 from hoegrammer/master
Matthew Wire [Thu, 5 Mar 2020 13:21:22 +0000 (13:21 +0000)]
Merge pull request #14667 from hoegrammer/master

CRM-20553 Stop contact being overwritten with paypal account name

4 years agoUse dbAlias to generate where clause for date field in activity report
Pradeep Nayak [Thu, 5 Mar 2020 12:29:27 +0000 (12:29 +0000)]
Use dbAlias to generate where clause for date field in activity report

4 years agoMark unused function as deprecated
eileen [Thu, 5 Mar 2020 02:23:18 +0000 (15:23 +1300)]
Mark unused function as deprecated

4 years agoSet version to 5.25.alpha1
CiviCRM [Thu, 5 Mar 2020 01:50:34 +0000 (01:50 +0000)]
Set version to 5.25.alpha1

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