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
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
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
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
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
eileen [Thu, 12 Mar 2020 03:06:21 +0000 (16:06 +1300)]
[NFC] Test cleanup, remove duplicate test
It turns out the removed test is identical to testEntityTagDeleteINDHH earlier in the class
- probably consolidation of the functions called led to this
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
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
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