Mathieu Lu [Tue, 17 Mar 2020 17:34:33 +0000 (13:34 -0400)]
Merge pull request #16768 from colemanw/arrayValue5
[REF] Replace CRM_Utils_Array::value with ?? in variable assignments
Coleman Watts [Mon, 16 Mar 2020 13:21:02 +0000 (09:21 -0400)]
Replace CRM_Utils_Array::value with ?? in variable assignments
Mathieu Lu [Tue, 17 Mar 2020 17:25:09 +0000 (13:25 -0400)]
Merge pull request #16802 from colemanw/coalesce
[REF] Replace coalesce pattern with coalesce operator
Mathieu Lu [Tue, 17 Mar 2020 15:40:55 +0000 (11:40 -0400)]
Merge pull request #16436 from seamuslee001/phpmimetype_library_upgrade
[REF] Switch to using a non abandoned library for getting a mapping of mimetypes to extensions
colemanw [Tue, 17 Mar 2020 15:13:01 +0000 (11:13 -0400)]
Merge pull request #16800 from pradpnayak/notifyEmail
Respect 'Donot notify activity type' setting
colemanw [Tue, 17 Mar 2020 13:25:29 +0000 (09:25 -0400)]
Merge pull request #16825 from eileenmcnaughton/del_test
[NFC] Use helper / api to delete contacts in tests
Coleman Watts [Mon, 16 Mar 2020 20:47:48 +0000 (16:47 -0400)]
Replace coalesce pattern with coalesce operator
colemanw [Tue, 17 Mar 2020 13:12:48 +0000 (09:12 -0400)]
Merge pull request #16824 from eileenmcnaughton/cont_restore
Deprecate calling contactTrashRestore function
colemanw [Tue, 17 Mar 2020 13:08:13 +0000 (09:08 -0400)]
Merge pull request #16810 from eileenmcnaughton/xml
(NFC) Minor typo: receipients > recipients
colemanw [Tue, 17 Mar 2020 13:06:45 +0000 (09:06 -0400)]
Merge pull request #16813 from eileenmcnaughton/deprecated
Remove deprecated parameter
colemanw [Tue, 17 Mar 2020 13:04:10 +0000 (09:04 -0400)]
Merge pull request #16823 from eileenmcnaughton/cont_api
[NFC] Minor code cleanup
Pradeep Nayak [Mon, 16 Mar 2020 19:59:34 +0000 (19:59 +0000)]
Fixed warnings
Pradeep Nayak [Mon, 16 Mar 2020 19:46:13 +0000 (19:46 +0000)]
use activity type id from form object
Pradeep Nayak [Mon, 16 Mar 2020 17:30:05 +0000 (17:30 +0000)]
Respect 'Donot notify activity type' setting
eileen [Tue, 17 Mar 2020 10:20:50 +0000 (23:20 +1300)]
Complete deprecation of trashRestore
eileen [Tue, 17 Mar 2020 07:42:56 +0000 (20:42 +1300)]
Deprecate calling deleteContact in order to undelete
This pattern really is very silly. We have one function doing both delete & an update that is
no different to the update done by a normal create call
eileen [Tue, 17 Mar 2020 10:04:29 +0000 (23:04 +1300)]
[NFC] Use helper / api to delete contacts in tests
CRM_Contact_BAO_Contact::deleteContact has a silly signature - let's use it less & improve it so
it doesn't have the silly idea of supporting restore in the same function as delete, with little shared
code
Seamus Lee [Tue, 17 Mar 2020 07:52:46 +0000 (18:52 +1100)]
Merge pull request #16822 from eileenmcnaughton/arraa4
[REF] Simplify obtuse boolean expressions
eileen [Tue, 17 Mar 2020 07:24:23 +0000 (20:24 +1300)]
[NFC] Minor code cleanup
Fix some exception declaration, comparisons, handling for non-present param
Seamus Lee [Tue, 17 Mar 2020 07:02:19 +0000 (18:02 +1100)]
Merge pull request #16818 from eileenmcnaughton/del
[NFC] Deprecate passing in silly data
Seamus Lee [Tue, 17 Mar 2020 06:56:53 +0000 (17:56 +1100)]
Merge pull request #16817 from eileenmcnaughton/deltest
[NFC] Test cleanup
eileen [Tue, 17 Mar 2020 06:05:40 +0000 (19:05 +1300)]
[REF] Simplify obtuse boolean expressions
Partial reviewer commit of https://github.com/civicrm/civicrm-core/pull/16814
Eileen McNaughton [Tue, 17 Mar 2020 05:57:52 +0000 (18:57 +1300)]
Merge pull request #16790 from eileenmcnaughton/pcp
[REF] Fix PCP getPcpDashboardInfo to be tested & use sensible functions
Eileen McNaughton [Tue, 17 Mar 2020 05:57:35 +0000 (18:57 +1300)]
Merge pull request #16820 from eileenmcnaughton/array2
[REF] Replace CRM_Utils_Array::value with ?? in variable assignments
Eileen McNaughton [Tue, 17 Mar 2020 05:57:00 +0000 (18:57 +1300)]
Merge pull request #16821 from eileenmcnaughton/array3
[REF] cleanups on array operator
Eileen McNaughton [Tue, 17 Mar 2020 05:56:44 +0000 (18:56 +1300)]
Merge pull request #16819 from eileenmcnaughton/array
[REF] Simplify obtuse boolean expressions
eileen [Tue, 17 Mar 2020 03:26:24 +0000 (16:26 +1300)]
[REF] Replace coalesce pattern with coalesce operator
This replaces the innstances in the test folder.
eileen [Tue, 17 Mar 2020 03:24:50 +0000 (16:24 +1300)]
[REF] Replace CRM_Utils_Array::value with ?? in variable assignments
Partial of #16768 - only contains test lines which I don't think need individual review
eileen [Tue, 17 Mar 2020 03:19:59 +0000 (16:19 +1300)]
[REF] Replace CRM_Utils_Array::value with ?? in variable assignments
This is a partial of https://github.com/civicrm/civicrm-core/pull/16768 & consists of the lines I have reviewed from it
eileen [Tue, 17 Mar 2020 03:05:29 +0000 (16:05 +1300)]
[REF] Simplify obtuse boolean expressions
Partial of https://github.com/civicrm/civicrm-core/pull/16814
I've reviewed this handful & will merge on pass
eileen [Tue, 17 Mar 2020 02:44:01 +0000 (15:44 +1300)]
Deprecate passing in silly data
Later we can move to requiring an integer
Eileen McNaughton [Tue, 17 Mar 2020 02:13:35 +0000 (15:13 +1300)]
Merge pull request #16816 from eileenmcnaughton/ex1
[REF] Remove titleHeader var
eileen [Tue, 17 Mar 2020 01:44:09 +0000 (14:44 +1300)]
[NFC] Test cleanup
Fix some comment blocks, remove some unused variables
eileen [Mon, 16 Mar 2020 01:41:01 +0000 (14:41 +1300)]
Fix PCP getPcpDashboardInfo to be tested & use sensible functions
Eileen McNaughton [Tue, 17 Mar 2020 01:19:34 +0000 (14:19 +1300)]
Merge pull request #16812 from eileenmcnaughton/deprec_gone
Remove unused deprecated function
eileen [Mon, 25 Nov 2019 04:50:53 +0000 (17:50 +1300)]
Remove titleHeader var
This is never passed in, and, logically, it would break the csv if it was
Matthew Wire [Tue, 17 Mar 2020 00:31:06 +0000 (00:31 +0000)]
Merge pull request #16731 from eileenmcnaughton/regress
Skip expensive smarty Processing when nothing to see here
eileen [Tue, 17 Mar 2020 00:07:47 +0000 (13:07 +1300)]
Remove deprecated parameter
This parameter was deprecated a while back - we obviously used caution at the time
but we can remove it now
colemanw [Tue, 17 Mar 2020 00:05:34 +0000 (20:05 -0400)]
Merge pull request #16774 from mattwire/settingssmtpfreezeoutboundoption
Fix setting outBound_option readonly in UI
eileen [Sat, 15 Feb 2020 04:25:28 +0000 (17:25 +1300)]
Remove unused deprecated function
copyLocBlock was marked as deprecated & unused around 9 months ago - not much has changed - remove
Seamus Lee [Mon, 16 Mar 2020 23:50:45 +0000 (10:50 +1100)]
Merge pull request #16671 from eileenmcnaughton/acl
[REF] simplify references to civicrm_acl
eileen [Mon, 16 Mar 2020 23:32:12 +0000 (12:32 +1300)]
(NFC) Minor typo: receipients > recipients
colemanw [Mon, 16 Mar 2020 23:16:04 +0000 (19:16 -0400)]
Merge pull request #16804 from UshaMakoa/patch-9
(NFC) Minor typo: contacts(s) -> contact(s)
colemanw [Mon, 16 Mar 2020 23:15:43 +0000 (19:15 -0400)]
Merge pull request #16803 from UshaMakoa/patch-8
(NFC) Query.php / Minor typo: Genrated -> Generated
Mathieu Lu [Mon, 16 Mar 2020 22:57:10 +0000 (18:57 -0400)]
Merge pull request #16474 from sushantpaste/test-for-pr-13809
Test for PR 13809
Seamus Lee [Mon, 16 Mar 2020 22:29:24 +0000 (09:29 +1100)]
Merge pull request #15338 from totten/master-poc-postcommit
(POC) Add `hook_civicrm_postCommit`, a less foot-gunny variant of `hook_civicrm_post`
Usha Matisson [Mon, 16 Mar 2020 21:25:24 +0000 (22:25 +0100)]
(NFC) Minor typo: contacts(s) -> contact(s)
Usha Matisson [Mon, 16 Mar 2020 21:21:16 +0000 (22:21 +0100)]
Update Query.php
Eileen McNaughton [Mon, 16 Mar 2020 20:54:03 +0000 (09:54 +1300)]
Merge pull request #16798 from systopia/CORE-1646
dev/core#1646 Merge Case Modal not showing relevant cases
Eileen McNaughton [Mon, 16 Mar 2020 20:50:20 +0000 (09:50 +1300)]
Merge pull request #16799 from pradpnayak/priceSetSchema
Added pseudoconstant for state province
Eileen McNaughton [Mon, 16 Mar 2020 20:39:14 +0000 (09:39 +1300)]
Merge pull request #16801 from civicrm/5.24
5.24
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
Mathieu Lu [Mon, 16 Mar 2020 20:20:08 +0000 (16:20 -0400)]
Merge pull request #16496 from mattwire/billingsamecheckboxchange
Make the 'billing address is the same' checkbox respond to the change event
Mathieu Lu [Mon, 16 Mar 2020 20:12:05 +0000 (16:12 -0400)]
Merge pull request #16773 from UshaMakoa/patch-7
(NFC) Minor string error : for for > for
Mathieu Lu [Mon, 16 Mar 2020 20:08:59 +0000 (16:08 -0400)]
Merge pull request #13809 from sushantpaste/auto-complete-search
dev/core#787 Auto-complete search results fixes
Eileen McNaughton [Mon, 16 Mar 2020 19:41:35 +0000 (08:41 +1300)]
Merge pull request #16479 from twomice/1579_avoid_needless_getPayPalPaymentProcessorID_call
dev/core#1579 CRM_Core_Payment_PayPalProIPN should not call getPayPalPaymentProcessorID() if processor_id is clearly provided in URL
Pradeep Nayak [Mon, 16 Mar 2020 17:28:48 +0000 (17:28 +0000)]
Added pseudoconstant for state province
colemanw [Mon, 16 Mar 2020 13:03:53 +0000 (09:03 -0400)]
Merge pull request #16755 from eileenmcnaughton/et
[NFC] Test cleanup, remove duplicate test
Usha Matisson [Sat, 14 Mar 2020 00:14:08 +0000 (01:14 +0100)]
Minor string error : for for > for
Matthew Wire [Mon, 16 Mar 2020 10:37:37 +0000 (10:37 +0000)]
Merge pull request #16546 from eileenmcnaughton/part_end2
Fix Bug where Payment Balance is sometimes miscalculated
Seamus Lee [Mon, 16 Mar 2020 08:46:44 +0000 (19:46 +1100)]
Merge pull request #16797 from civicrm/5.24
5.24
B. Endres [Mon, 16 Mar 2020 07:43:43 +0000 (08:43 +0100)]
would this fix CORE-1646?
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
Tim Otten [Mon, 16 Mar 2020 06:08:46 +0000 (23:08 -0700)]
release-notes/5.23.3.md
Yashodha Chaku [Mon, 16 Mar 2020 06:02:08 +0000 (11:32 +0530)]
Merge pull request #16792 from colemanw/dashboardContact
[REF] Cleanup api3 DashboardContact
Eileen McNaughton [Mon, 16 Mar 2020 05:12:14 +0000 (18:12 +1300)]
Merge pull request #16788 from civicrm/msg_template_no_id
[REF] Fixes a bug in Message Template create API where by user permissions checks were being done on system workflow messages
Seamus Lee [Mon, 16 Mar 2020 05:11:39 +0000 (16:11 +1100)]
Merge pull request #16794 from civicrm/5.24
5.24
eileen [Fri, 14 Feb 2020 22:03:08 +0000 (11:03 +1300)]
Fix Bug where Payment Balance is sometimes miscalculated
I observed that when this function is called without the mystical the paymentBalance is miscalculated
The payment balance is calculated as the Contribution Total less the amount paid (for less queries the
total is passed into getContributionBalance & used if passed in). We were passing in the Balance
as the total causing the balance to be calculated as the Balance less any amount paid.
From what I can tell this function has been honed & cleaned up but because the parameter never made much sense
the impact of different variants was not really tested. This removes & fixes
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
Coleman Watts [Mon, 16 Mar 2020 01:47:59 +0000 (21:47 -0400)]
Cleanup api3 DashboardContact
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.
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.
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.
Seamus Lee [Mon, 16 Mar 2020 00:03:55 +0000 (11:03 +1100)]
[REF] Fix permission check for system workflow message created
Seamus Lee [Sun, 15 Mar 2020 22:55:22 +0000 (09:55 +1100)]
[NFC] Add in unit test for creating a new system work flow message template with only edit system workflow message templates permission
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
Matthew Wire [Sat, 14 Mar 2020 17:04:29 +0000 (17:04 +0000)]
Fix setting outBound_option readonly in UI
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