Eileen McNaughton [Thu, 19 Mar 2020 22:17:09 +0000 (11:17 +1300)]
Merge pull request #16859 from civicrm/5.24
5.24 to master
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
Tim Otten [Thu, 19 Mar 2020 22:00:08 +0000 (15:00 -0700)]
Merge pull request #16851 from colemanw/bool2
CRM/Utils - Cleanup boolean expressions
Eileen McNaughton [Thu, 19 Mar 2020 21:20:24 +0000 (10:20 +1300)]
Merge pull request #16854 from colemanw/bool4
CRM - Cleanup boolean expressions
Eileen McNaughton [Thu, 19 Mar 2020 21:17:22 +0000 (10:17 +1300)]
Merge pull request #16836 from tunbola/modify-form-values
dev/core#1569: Increase Data Size for `form_values` column on civicrm_report_instance table
Eileen McNaughton [Thu, 19 Mar 2020 21:12:07 +0000 (10:12 +1300)]
Merge pull request #16856 from colemanw/writeRecord
Add DAO::writeRecord and DAO::deleteRecord methods
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
Eileen McNaughton [Thu, 19 Mar 2020 20:37:05 +0000 (09:37 +1300)]
Merge pull request #16848 from colemanw/profilePerms
Fix checking permissions in api3 profile get
Eileen McNaughton [Thu, 19 Mar 2020 19:48:36 +0000 (08:48 +1300)]
Merge pull request #16715 from mattwire/cancelsubscriptiongeneratetext
Generate text for cancelSubscription form in payment class
colemanw [Thu, 19 Mar 2020 19:43:41 +0000 (15:43 -0400)]
Merge pull request #16855 from ray-wright/patch-2
Fix batch contact/activity update with radio options
Matthew Wire [Thu, 19 Mar 2020 18:16:40 +0000 (18:16 +0000)]
Merge pull request #16762 from eileenmcnaughton/mem_allan
dev/core#1630 Partial fix on renew membership missing
Coleman Watts [Thu, 19 Mar 2020 18:04:56 +0000 (14:04 -0400)]
Add DAO::writeRecord and DAO::deleteRecord methods
colemanw [Thu, 19 Mar 2020 17:14:33 +0000 (13:14 -0400)]
Merge pull request #16849 from colemanw/ufMatch
UFMatch - deprecate unused functions
ray-wright [Thu, 19 Mar 2020 16:57:26 +0000 (12:57 -0400)]
Wrap value in single quotes
Wrap radio value in single quotes to account for options with spaces.
Coleman Watts [Tue, 17 Mar 2020 23:34:12 +0000 (19:34 -0400)]
CRM - Cleanup boolean expressions
Coleman Watts [Tue, 17 Mar 2020 23:34:12 +0000 (19:34 -0400)]
CRM/Utils - Cleanup boolean expressions
Coleman Watts [Thu, 19 Mar 2020 15:30:42 +0000 (11:30 -0400)]
UFMatch - deprecate unused functions
Coleman Watts [Thu, 19 Mar 2020 12:19:12 +0000 (08:19 -0400)]
Fix checking permissions in api3 profile get
The boolean being passed to the $skipPermission param was reversed.
Seamus Lee [Thu, 19 Mar 2020 07:19:52 +0000 (18:19 +1100)]
Merge pull request #16835 from colemanw/removeOldStuff
Remove old stuff
Seamus Lee [Thu, 19 Mar 2020 07:18:47 +0000 (18:18 +1100)]
Merge pull request #16839 from mlutfy/fixCustomDataViewMemo
Fix CustomDataView.tpl plain empty memo field.
Seamus Lee [Thu, 19 Mar 2020 05:30:33 +0000 (16:30 +1100)]
Merge pull request #16844 from eileenmcnaughton/coleman
CRM/Contact - Cleanup boolean expressions
Coleman Watts [Tue, 17 Mar 2020 23:34:12 +0000 (19:34 -0400)]
CRM/Contact - Cleanup boolean expressions
Seamus Lee [Wed, 18 Mar 2020 23:54:30 +0000 (10:54 +1100)]
Merge pull request #16843 from seamuslee001/master
5.24
Seamus Lee [Wed, 18 Mar 2020 23:53:07 +0000 (10:53 +1100)]
Merge in 5.24
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
Seamus Lee [Wed, 18 Mar 2020 22:16:36 +0000 (09:16 +1100)]
Update CKEditor 4.14
Eileen McNaughton [Wed, 18 Mar 2020 19:09:24 +0000 (08:09 +1300)]
Merge pull request #16771 from colemanw/pcp
Deprecate unused/unneeded pseudoconstant functions
Mathieu Lutfy [Wed, 18 Mar 2020 19:07:26 +0000 (15:07 -0400)]
Fix CustomDataView.tpl plain empty memo field.
Tunbola Ogunwande [Wed, 18 Mar 2020 14:56:10 +0000 (15:56 +0100)]
dev/core#1569: Add SQL code for modifying column in upgrader.
Tunbola Ogunwande [Wed, 18 Mar 2020 14:55:40 +0000 (15:55 +0100)]
dev/core#1569: Update XML schema and re-generate Report Instance DAO
Coleman Watts [Wed, 18 Mar 2020 14:29:18 +0000 (10:29 -0400)]
Deprecated unused pseudoconstant functions
Coleman Watts [Wed, 18 Mar 2020 14:48:15 +0000 (10:48 -0400)]
Annotate deprecated functions
Coleman Watts [Wed, 18 Mar 2020 14:36:02 +0000 (10:36 -0400)]
Remove deprecated report functions
Coleman Watts [Wed, 18 Mar 2020 14:33:06 +0000 (10:33 -0400)]
Remove deprecated CRM_Utils_Hook::alterMail
Seamus Lee [Tue, 17 Mar 2020 23:54:01 +0000 (10:54 +1100)]
Merge pull request #16829 from demeritcowboy/blank-joindate
dev/report#28 - Join date field has no label on constituent detail report
Seamus Lee [Tue, 17 Mar 2020 23:47:27 +0000 (10:47 +1100)]
Merge pull request #16831 from civicrm/5.24
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
colemanw [Tue, 17 Mar 2020 21:34:14 +0000 (17:34 -0400)]
Merge pull request #16828 from colemanw/api4Json
APIv4 - convert Result object to array when running through json_encode
Alice Frumin [Mon, 9 Mar 2020 18:29:08 +0000 (14:29 -0400)]
release-notes 5.24 first pass
demeritcowboy [Tue, 17 Mar 2020 19:51:10 +0000 (15:51 -0400)]
join date checkbox is blank
Coleman Watts [Tue, 17 Mar 2020 19:09:16 +0000 (15:09 -0400)]
APIv4 - convert Result object to array when running through json_encode
Before: entire Result object was getting serialized leading to some weird output
After: only the array gets serialized
Mathieu Lu [Tue, 17 Mar 2020 17:47:51 +0000 (13:47 -0400)]
Merge pull request #16827 from colemanw/typos
Fix typos in xml/dao
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
Coleman Watts [Tue, 17 Mar 2020 15:22:32 +0000 (11:22 -0400)]
Fix typos in xml/dao
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