demeritcowboy [Sun, 15 Mar 2020 22:57:24 +0000 (18:57 -0400)]
make case type required for change case type activity instead of a preprocess check that doesn't work
Seamus Lee [Mon, 16 Mar 2020 00:09:41 +0000 (11:09 +1100)]
Merge pull request #16746 from eileenmcnaughton/fatal
[REF] Remove calls to fatal()
Eileen McNaughton [Mon, 16 Mar 2020 00:05:04 +0000 (13:05 +1300)]
Merge pull request #16778 from colemanw/arrayValue6
[REF] Cleanup uses of CRM_Utils_Array::value related to numbers
Eileen McNaughton [Sun, 15 Mar 2020 23:23:45 +0000 (12:23 +1300)]
Merge pull request #16786 from civicrm/5.24
5.24
Eileen McNaughton [Sun, 15 Mar 2020 22:42:22 +0000 (11:42 +1300)]
Merge pull request #16724 from kartik1000/core-1599
dev/core#1599/Deceased Contact's Membership Marked to Deceased via Inline
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
Eileen McNaughton [Sun, 15 Mar 2020 22:26:30 +0000 (11:26 +1300)]
Merge pull request #16783 from civicrm/5.24
5.24 to master
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
Eileen McNaughton [Sun, 15 Mar 2020 22:25:46 +0000 (11:25 +1300)]
Merge pull request #16782 from civicrm/5.24
5.24
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
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
demeritcowboy [Sun, 15 Mar 2020 15:26:41 +0000 (11:26 -0400)]
inline editing not working and other js packages issues
colemanw [Sun, 15 Mar 2020 01:02:03 +0000 (21:02 -0400)]
Merge pull request #16777 from eileenmcnaughton/ftype_form
[REF] cleanup financial type form - remove complex inheritence
Coleman Watts [Sun, 15 Mar 2020 00:20:06 +0000 (20:20 -0400)]
Cleanup uses of CRM_Utils_Array::value related to numbers
Some manual cleanup around the areas of code where CRM_Utils_Array::value is used for a number defaulting to 0
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
demeritcowboy [Sat, 14 Mar 2020 17:35:30 +0000 (13:35 -0400)]
fatal error when assigning account to financial type
eileen [Sat, 14 Mar 2020 22:05:25 +0000 (11:05 +1300)]
[REF] cleanup financial type form - remove complex inheritence
Inheriting from 2 intermediary forms adds complexity with little benefit. Since we have the entityFormTrait
this increases use of that
Rich Lott [Sat, 14 Mar 2020 14:29:55 +0000 (14:29 +0000)]
Scheduled jobs belonging to extensions cannot be disabled (#16430)
Authored-by: Rich Lott / Artful Robot <forums@artfulrobot.uk>
Kartik Kathuria [Mon, 9 Mar 2020 20:31:32 +0000 (02:01 +0530)]
Deceased's Contact Membership's Status updated to Deceased via Inline
Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
Yashodha Chaku [Fri, 13 Mar 2020 12:04:23 +0000 (17:34 +0530)]
Merge pull request #16695 from mattwire/pcpshortcodes
Add shortcodes for Personal Campaign Pages
Seamus Lee [Fri, 13 Mar 2020 11:14:52 +0000 (22:14 +1100)]
Merge pull request #16767 from civicrm/5.24
5.24
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
Tim Otten [Fri, 13 Mar 2020 09:50:04 +0000 (02:50 -0700)]
release-notes/5.23.2.md
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
Seamus Lee [Fri, 13 Mar 2020 07:37:44 +0000 (18:37 +1100)]
Merge pull request #16759 from eileenmcnaughton/fatal2
Remove instances of fatal
Seamus Lee [Fri, 13 Mar 2020 07:36:39 +0000 (18:36 +1100)]
Merge pull request #16764 from eileenmcnaughton/mem_tax
[NFC] cleanup in test class
eileen [Fri, 13 Mar 2020 04:35:50 +0000 (17:35 +1300)]
[NFC] cleanup in test class
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
Eileen McNaughton [Fri, 13 Mar 2020 01:57:37 +0000 (14:57 +1300)]
Merge pull request #16710 from colemanw/arrayValue2
[REF] Use ?? operator instead of CRM_Utils_Array::value()
eileen [Fri, 13 Mar 2020 00:56:06 +0000 (13:56 +1300)]
Alternate Joomla! fix - move to CMS override
Eileen McNaughton [Thu, 12 Mar 2020 20:50:29 +0000 (09:50 +1300)]
Merge pull request #16758 from pradpnayak/priceSetSchema
add pseudoconstant for location type
eileen [Thu, 12 Mar 2020 20:42:56 +0000 (09:42 +1300)]
Remove instances of fatal
Pradeep Nayak [Thu, 12 Mar 2020 17:33:09 +0000 (17:33 +0000)]
add pseudoconstant for location type
Eileen McNaughton [Thu, 12 Mar 2020 04:22:40 +0000 (17:22 +1300)]
Merge pull request #16730 from demeritcowboy/unused-activitytypename
[REF] dev/core#1116 - Remove unused misnamed activityTypeName variable
Eileen McNaughton [Thu, 12 Mar 2020 04:10:36 +0000 (17:10 +1300)]
Merge pull request #16754 from pradpnayak/priceSetSchema
Added pseudoconstant for priceset
Pradeep Nayak [Thu, 12 Mar 2020 01:57:30 +0000 (01:57 +0000)]
iAdded pseudoconstant for priceset
Pradeep Nayak [Thu, 12 Mar 2020 01:56:12 +0000 (01:56 +0000)]
Added pseudoconstant for priceset
Seamus Lee [Thu, 12 Mar 2020 00:59:16 +0000 (11:59 +1100)]
Merge pull request #16694 from eileenmcnaughton/dedupebug
Fix bug where a % in a serialized array can lead to the data being broken
eileen [Wed, 11 Mar 2020 00:09:42 +0000 (13:09 +1300)]
Fix bug where a % in a serialized array can lead to the data being broken
It turns out that is a field in a serialized array has a %2 (for example) this gets swapped in executeQuery for the
%2 value (in this case srcID - rendering the serialized array invalid. This proposes that we
explicitly handle arrays as a data type in compose query.
Some thoughts
1) we could make serialized arrays valid types in validate (not done here)
2) we could iterate through the array keys & values escaping them -
at this stage it's left in the calling function
3) there are whole bikeshed factories to keep in business on discussion of whether
'Array-1', 'Array-2' etc are the right format
Coleman Watts [Sun, 8 Mar 2020 21:53:37 +0000 (17:53 -0400)]
Use ?? operator instead of CRM_Utils_Array::value() in array assignments with null-ish defaults
Coleman Watts [Sun, 8 Mar 2020 19:35:34 +0000 (15:35 -0400)]
Use ?? operator instead of CRM_Utils_Array::value() in array assignments
Coleman Watts [Sat, 7 Mar 2020 18:28:11 +0000 (13:28 -0500)]
Use ?? operator instead of CRM_Utils_Array::value() when fetching ids
Mathieu Lu [Wed, 11 Mar 2020 22:34:27 +0000 (18:34 -0400)]
Merge pull request #16691 from mattwire/eventcart_cleanup
Event Cart cleanup
Eileen McNaughton [Wed, 11 Mar 2020 22:03:00 +0000 (11:03 +1300)]
Merge pull request #16749 from civicrm/5.24
5.24
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
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
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)
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
Kartik Kathuria [Wed, 11 Mar 2020 14:57:02 +0000 (20:27 +0530)]
Rebased
Signed-off-by: Kartik Kathuria <kathuriakartik0@gmail.com>
Matthew Wire [Tue, 10 Mar 2020 21:27:35 +0000 (21:27 +0000)]
Add recur ID to doCancelRecurring
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
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
Tim Otten [Wed, 11 Mar 2020 05:35:00 +0000 (22:35 -0700)]
Update 5.23.1.md
Tim Otten [Wed, 11 Mar 2020 05:08:53 +0000 (22:08 -0700)]
Add release-notes/5.23.1.md
eileen [Wed, 11 Mar 2020 03:42:21 +0000 (16:42 +1300)]
[REF] Remove calls to fatal()
Also other minor cleanup on
- comment blocks
- using strict comparison
- don't use elseif where the prior if threw an exceptionn
Seamus Lee [Wed, 11 Mar 2020 03:35:25 +0000 (14:35 +1100)]
Merge pull request #16744 from civicrm/5.24
5.24
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
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
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
Mathieu Lutfy [Tue, 10 Mar 2020 21:08:04 +0000 (17:08 -0400)]
dev/core#547 Fix Event financial_type_id getOptions
Eileen McNaughton [Tue, 10 Mar 2020 22:15:49 +0000 (11:15 +1300)]
Merge pull request #16734 from eileenmcnaughton/array2
[REF] Minor code simplification
Matthew Wire [Tue, 10 Mar 2020 21:19:20 +0000 (21:19 +0000)]
Switch to getter function for subscriptionDetails
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 `/`
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
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
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
eileen [Tue, 10 Mar 2020 09:29:36 +0000 (22:29 +1300)]
[REF] Minor code simplification
Move the return earlier, simplify the IF
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
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
Rich Lott / Artful Robot [Tue, 10 Mar 2020 12:06:23 +0000 (12:06 +0000)]
add failing test
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
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 `/`.
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
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
Eileen McNaughton [Tue, 10 Mar 2020 08:43:01 +0000 (21:43 +1300)]
Merge pull request #16728 from civicrm/5.24
5.24
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
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.
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
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 /
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.
demeritcowboy [Tue, 10 Mar 2020 01:25:29 +0000 (21:25 -0400)]
hopefully fix failing test
colemanw [Tue, 10 Mar 2020 00:22:04 +0000 (20:22 -0400)]
Merge pull request #16727 from pradpnayak/priceSetSchema
pseudoconstant for bounce type
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
demeritcowboy [Mon, 9 Mar 2020 23:52:17 +0000 (19:52 -0400)]
remove unused misnamed variable
Coleman Watts [Mon, 9 Mar 2020 23:15:12 +0000 (19:15 -0400)]
Use empty() instead of CRM_Utils_Array::value() in inline conditionals
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
Pradeep Nayak [Mon, 9 Mar 2020 22:57:46 +0000 (22:57 +0000)]
pseudoconstant for bounce type
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
Seamus Lee [Mon, 9 Mar 2020 21:39:44 +0000 (08:39 +1100)]
Merge pull request #16725 from civicrm/5.24
5.24
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…
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
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.
Andrew Hunt [Mon, 9 Mar 2020 17:56:21 +0000 (13:56 -0400)]
5.24.0 release notes: added boilerplate
Andrew Hunt [Mon, 9 Mar 2020 17:54:49 +0000 (13:54 -0400)]
5.24.0 release notes: raw from script
Coleman Watts [Mon, 9 Mar 2020 15:50:45 +0000 (11:50 -0400)]
Use ?? operator instead of CRM_Utils_Array::value() in return statements
Coleman Watts [Mon, 9 Mar 2020 13:58:41 +0000 (09:58 -0400)]
Improve conditional in api3 ChainSubscriber
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
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
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
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.