civicrm-core.git
4 years agoAlso ensure that updates etc cannot be done via get only via post as per APIv3
Seamus Lee [Fri, 29 Nov 2019 07:46:51 +0000 (18:46 +1100)]
Also ensure that updates etc cannot be done via get only via post as per APIv3

4 years agoEnsure that API Explorer passes through necessary header
Seamus Lee [Thu, 28 Nov 2019 23:03:00 +0000 (10:03 +1100)]
Ensure that API Explorer passes through necessary header

4 years agosecurity/core#71 Prevent CSRF by ensuring that AJAX endpoint of the API Explorer...
Seamus Lee [Thu, 28 Nov 2019 21:33:44 +0000 (08:33 +1100)]
security/core#71 Prevent CSRF by ensuring that AJAX endpoint of the API Explorer can only be hit by javascript clinets

4 years agoMerge pull request #16028 from civicrm/5.20
Seamus Lee [Wed, 4 Dec 2019 19:58:53 +0000 (06:58 +1100)]
Merge pull request #16028 from civicrm/5.20

5.20

4 years agoMerge pull request #16026 from eileenmcnaughton/payment_update
Seamus Lee [Wed, 4 Dec 2019 19:46:07 +0000 (06:46 +1100)]
Merge pull request #16026 from eileenmcnaughton/payment_update

[NFC] code cleanup in test class.

4 years agoMerge pull request #16027 from agh1/5.20.0-releasenotes-final
Tim Otten [Wed, 4 Dec 2019 18:51:38 +0000 (10:51 -0800)]
Merge pull request #16027 from agh1/5.20.0-releasenotes-final

5.20.0 release notes: final edits

4 years ago5.20.0 release notes: final edits
Andrew Hunt [Wed, 4 Dec 2019 18:34:00 +0000 (13:34 -0500)]
5.20.0 release notes: final edits

4 years ago5.20.0 release notes: add late changes
Andrew Hunt [Wed, 4 Dec 2019 17:28:24 +0000 (12:28 -0500)]
5.20.0 release notes: add late changes

4 years ago[NFC] code cleanup in test class.
eileen [Wed, 4 Dec 2019 06:20:07 +0000 (19:20 +1300)]
[NFC] code cleanup in test class.

Declare exceptions, use single quotes, call static functions statically

4 years agoMerge pull request #15697 from artfulrobot/payment-property-bag
Eileen McNaughton [Wed, 4 Dec 2019 05:32:02 +0000 (18:32 +1300)]
Merge pull request #15697 from artfulrobot/payment-property-bag

Add Payment PropertyBag for payment processor method arguments

4 years agoMerge pull request #16021 from mattwire/paymentinfo_amountpaid
Eileen McNaughton [Wed, 4 Dec 2019 05:20:06 +0000 (18:20 +1300)]
Merge pull request #16021 from mattwire/paymentinfo_amountpaid

Always display amount paid even if it is 0.00. Blank looks like it's missing data rather than nothing paid

4 years agoMerge pull request #16024 from jmcclelland/pcp-contribution-status
Eileen McNaughton [Wed, 4 Dec 2019 04:56:28 +0000 (17:56 +1300)]
Merge pull request #16024 from jmcclelland/pcp-contribution-status

allow PCP report to filter on contribution status

4 years agoMerge pull request #16023 from seamuslee001/1435_nfc
Eileen McNaughton [Wed, 4 Dec 2019 04:33:27 +0000 (17:33 +1300)]
Merge pull request #16023 from seamuslee001/1435_nfc

[NFC] Fix camelCase variable name following fix for dev/core#1435

4 years ago[NFC] Fix camelCase variable name following fix for dev/core#1435
Seamus Lee [Tue, 3 Dec 2019 19:19:47 +0000 (06:19 +1100)]
[NFC] Fix camelCase variable name following fix for dev/core#1435

4 years agoMerge pull request #16019 from mattwire/contributionview_removecancelled
Seamus Lee [Tue, 3 Dec 2019 19:49:48 +0000 (06:49 +1100)]
Merge pull request #16019 from mattwire/contributionview_removecancelled

Remove unused cancelledStatus assign on contributionView

4 years agoallow PCP report to filter on contribution status
Jamie McClelland [Tue, 3 Dec 2019 19:38:10 +0000 (14:38 -0500)]
allow PCP report to filter on contribution status

Without this filter, incomplete contributions are included in the report
which really throws off the total.

4 years agoAlways display amount paid even if it is 0.00. Blank looks like it's missing data...
Matthew Wire (MJW Consulting) [Wed, 6 Nov 2019 16:22:16 +0000 (16:22 +0000)]
Always display amount paid even if it is 0.00. Blank looks like it's missing data rather than nothing paid

4 years agoRemove unused cancelledStatus assign
Matthew Wire (MJW Consulting) [Wed, 6 Nov 2019 15:17:57 +0000 (15:17 +0000)]
Remove unused cancelledStatus assign

4 years agoMerge pull request #16016 from seamuslee001/master
Seamus Lee [Tue, 3 Dec 2019 08:28:24 +0000 (19:28 +1100)]
Merge pull request #16016 from seamuslee001/master

5.20

4 years agoMerge in 5.20
Seamus Lee [Tue, 3 Dec 2019 08:26:58 +0000 (19:26 +1100)]
Merge in 5.20

4 years agoMerge pull request #16013 from eileenmcnaughton/reg
Seamus Lee [Tue, 3 Dec 2019 08:13:00 +0000 (19:13 +1100)]
Merge pull request #16013 from eileenmcnaughton/reg

dev/core#1435 Fix lack of filtering in Contribution tab on Membership or Participant View

4 years agoMerge pull request #15989 from seamuslee001/dev_core_523
Eileen McNaughton [Tue, 3 Dec 2019 06:47:04 +0000 (19:47 +1300)]
Merge pull request #15989 from seamuslee001/dev_core_523

dev/core#523 get the Lybunt charts working again

4 years agodev/core#1435 Fix lack of filtering in Contribution tab on Membership or Participant...
eileen [Tue, 3 Dec 2019 05:46:21 +0000 (18:46 +1300)]
dev/core#1435 Fix lack of filtering in Contribution tab on Membership or Participant View

4 years agoMerge pull request #16010 from demeritcowboy/remove-recordactivityviaemail
Seamus Lee [Tue, 3 Dec 2019 02:59:42 +0000 (13:59 +1100)]
Merge pull request #16010 from demeritcowboy/remove-recordactivityviaemail

[NFC] Remove dinosaur function

4 years agoremove unused function
demeritcowboy [Tue, 3 Dec 2019 01:33:38 +0000 (20:33 -0500)]
remove unused function

4 years agoMerge pull request #15523 from jamie-tillman/patch-1
Mathieu Lu [Mon, 2 Dec 2019 22:14:39 +0000 (17:14 -0500)]
Merge pull request #15523 from jamie-tillman/patch-1

PayPalImpl: Add SOLUTIONTYPE parameter that triggers allowing to pay without having to create a paypal account.

4 years agoMerge pull request #15971 from aydun/report#23
Mathieu Lu [Mon, 2 Dec 2019 21:38:18 +0000 (16:38 -0500)]
Merge pull request #15971 from aydun/report#23

dev/report#23 - Fix contact sub-type 'is not one of' filtering

4 years agoMerge pull request #15946 from seamuslee001/status_check_improve
Mathieu Lu [Mon, 2 Dec 2019 21:33:49 +0000 (16:33 -0500)]
Merge pull request #15946 from seamuslee001/status_check_improve

Make utf8mb4 status check language more for the general consumer

4 years agoMerge pull request #15974 from eileenmcnaughton/ex_clean
Seamus Lee [Mon, 2 Dec 2019 21:29:54 +0000 (08:29 +1100)]
Merge pull request #15974 from eileenmcnaughton/ex_clean

Make else statement more legible

4 years agoMerge pull request #15908 from eileenmcnaughton/anet_setup
Mathieu Lu [Mon, 2 Dec 2019 21:25:54 +0000 (16:25 -0500)]
Merge pull request #15908 from eileenmcnaughton/anet_setup

[Test] fix test setup on ANet tests

4 years agoMerge pull request #15997 from seamuslee001/dev_core_1166
Mathieu Lu [Mon, 2 Dec 2019 20:22:33 +0000 (15:22 -0500)]
Merge pull request #15997 from seamuslee001/dev_core_1166

dev/core#1166 Update the name of Macedonia, Republic of to North Macedonia

4 years agoMerge pull request #16008 from civicrm/5.20
Seamus Lee [Mon, 2 Dec 2019 19:56:06 +0000 (06:56 +1100)]
Merge pull request #16008 from civicrm/5.20

5.20

4 years agoMerge pull request #16007 from seamuslee001/5.20
Seamus Lee [Mon, 2 Dec 2019 19:55:06 +0000 (06:55 +1100)]
Merge pull request #16007 from seamuslee001/5.20

Add release-notes/5.19.3.md

4 years agoAdd release-notes/5.19.3.md
Tim Otten [Mon, 25 Nov 2019 22:31:20 +0000 (14:31 -0800)]
Add release-notes/5.19.3.md

4 years agoMerge pull request #15970 from eileenmcnaughton/ex_easy
Monish Deb [Mon, 2 Dec 2019 12:32:40 +0000 (18:02 +0530)]
Merge pull request #15970 from eileenmcnaughton/ex_easy

[REF] clean up merge array.

4 years agoMerge pull request #16001 from agileware/CIVICRM-1383
Seamus Lee [Mon, 2 Dec 2019 06:48:47 +0000 (17:48 +1100)]
Merge pull request #16001 from agileware/CIVICRM-1383

Code style, remove typo, double ;; from code where it makes sense to do so

4 years agoMerge pull request #15937 from seamuslee001/dev_core_1405
Seamus Lee [Mon, 2 Dec 2019 05:49:26 +0000 (16:49 +1100)]
Merge pull request #15937 from seamuslee001/dev_core_1405

dev/core#1405 Strip any spaces from Option Group name parameter and r…

4 years agoCIVICRM-1383 Remove typo, double ;; from CiviCRM code
Justin Freeman [Sun, 1 Dec 2019 22:51:43 +0000 (09:51 +1100)]
CIVICRM-1383 Remove typo, double ;; from CiviCRM code

4 years agoMerge pull request #16004 from civicrm/5.20
Seamus Lee [Mon, 2 Dec 2019 04:46:48 +0000 (15:46 +1100)]
Merge pull request #16004 from civicrm/5.20

5.20

4 years agoMerge pull request #16000 from seamuslee001/dev_core_1434
Yashodha Chaku [Mon, 2 Dec 2019 04:27:49 +0000 (09:57 +0530)]
Merge pull request #16000 from seamuslee001/dev_core_1434

dev/core#1434 Fix table alias used in select when ouputting as a chart

4 years agoMerge pull request #16002 from seamuslee001/handle_custom_field_deleted
Seamus Lee [Mon, 2 Dec 2019 01:47:35 +0000 (12:47 +1100)]
Merge pull request #16002 from seamuslee001/handle_custom_field_deleted

Fix regression from fixing relative key handling where custom field no longer exists in the database

4 years agoCatch CiviCRM APIv3 Error if custom field no longer exists in the database
Seamus Lee [Mon, 2 Dec 2019 00:10:14 +0000 (11:10 +1100)]
Catch CiviCRM APIv3 Error if custom field no longer exists in the database

4 years agoAdd in unit test demonstrating the regression where smart group fails to load if...
Seamus Lee [Sun, 1 Dec 2019 23:52:46 +0000 (10:52 +1100)]
Add in unit test demonstrating the regression where smart group fails to load if a custom field has been deleted which was stored in the form values array

4 years agodev/core#1434 Fix table alias used in select when ouputting as a chart
Seamus Lee [Sun, 1 Dec 2019 20:17:09 +0000 (07:17 +1100)]
dev/core#1434 Fix table alias used in select when ouputting as a chart

4 years agoMerge pull request #15996 from eileenmcnaughton/act_test_priority
Seamus Lee [Sun, 1 Dec 2019 07:22:45 +0000 (18:22 +1100)]
Merge pull request #15996 from eileenmcnaughton/act_test_priority

Add testing for various params that pass through Contact_BAO_Query::optionValueQuery

4 years ago[REF] minor code simplification. Test where handling for gender_id etc
eileen [Sat, 30 Nov 2019 00:16:19 +0000 (13:16 +1300)]
[REF] minor code simplification. Test where handling for gender_id etc

Add test & reduce special handling for gender_id, suffix_id, prefix_id, communication_style_id

4 years agoMerge pull request #15995 from eileenmcnaughton/act_test_qill
Seamus Lee [Sun, 1 Dec 2019 05:32:45 +0000 (16:32 +1100)]
Merge pull request #15995 from eileenmcnaughton/act_test_qill

Remove calls to deprecated pseudoconstant activityType, test

4 years agoMerge pull request #15994 from eileenmcnaughton/act_test
Eileen McNaughton [Sat, 30 Nov 2019 22:34:33 +0000 (11:34 +1300)]
Merge pull request #15994 from eileenmcnaughton/act_test

[NFC] cleanup on QueryTest

4 years agoMerge pull request #15945 from seamuslee001/dev_core_874
colemanw [Sat, 30 Nov 2019 21:21:59 +0000 (16:21 -0500)]
Merge pull request #15945 from seamuslee001/dev_core_874

dev/core#874 [UI] Fix styling of the menubar colour picker in joomla

4 years agoUpdate the name of Macedonia, Republic of to North Macedonia following ISO 3166-1...
Seamus Lee [Sat, 30 Nov 2019 21:15:58 +0000 (08:15 +1100)]
Update the name of Macedonia, Republic of to North Macedonia following ISO 3166-1 update

4 years ago[NFC] cleanup on QueryTest
eileen [Fri, 29 Nov 2019 22:39:58 +0000 (11:39 +1300)]
[NFC] cleanup on QueryTest

4 years agoMerge pull request #15990 from eileenmcnaughton/act_search
Seamus Lee [Sat, 30 Nov 2019 01:56:04 +0000 (12:56 +1100)]
Merge pull request #15990 from eileenmcnaughton/act_search

Fix activity search to work by url params

4 years agodev/core#1405 Strip any spaces from Option Group name parameter and remove the name...
Seamus Lee [Sat, 23 Nov 2019 00:18:34 +0000 (11:18 +1100)]
dev/core#1405 Strip any spaces from Option Group name parameter and remove the name field from front end form as will be auto generated

Ensure that option group names are lower csae

Ensure that option group names are created as lower case and fix as per Justin's review

4 years agoMerge pull request #15981 from eileenmcnaughton/setting_fix2
Seamus Lee [Sat, 30 Nov 2019 01:25:27 +0000 (12:25 +1100)]
Merge pull request #15981 from eileenmcnaughton/setting_fix2

dev/core#1425 Replace deprecated setting function

4 years agoMerge pull request #15993 from eileenmcnaughton/acti_priority
Eileen McNaughton [Fri, 29 Nov 2019 23:34:40 +0000 (12:34 +1300)]
Merge pull request #15993 from eileenmcnaughton/acti_priority

Add import & export metadata to activity.priority_id

4 years ago[Test] fix test setup on ANet tests
eileen [Thu, 21 Nov 2019 09:42:40 +0000 (22:42 +1300)]
[Test] fix test setup on ANet tests

Per https://github.com/civicrm/civicrm-core/pull/15706 the setup for this test
is creating invalid transactions. This fixes - I had to do an order fix in the process

4 years agoRemove calls to deprecated pseudoconstant activityType, test
eileen [Fri, 29 Nov 2019 22:57:51 +0000 (11:57 +1300)]
Remove calls to deprecated pseudoconstant activityType, test

4 years agoAdd import & export metadata to activity.priority_id
eileen [Fri, 29 Nov 2019 22:27:35 +0000 (11:27 +1300)]
Add import & export metadata to activity.priority_id

There is a lot of special handling for this field we can eliminate. Given no other tables have
priority_id I'm not thinking to add the uniqueName & just add import & export to add it
to metadata. I'll follow up with removals / fixes to support silliness

4 years agoFix activity search to work by url params
eileen [Fri, 29 Nov 2019 21:11:24 +0000 (10:11 +1300)]
Fix activity search to work by url params

It seems to be missing the call to the parent fn

Note I feel like the parent should also handle some of the rows below in future

4 years agodev/core#523 get the Lybunt charts working again
Seamus Lee [Fri, 29 Nov 2019 20:55:14 +0000 (07:55 +1100)]
dev/core#523 get the Lybunt charts working again

Also ensure that the lifetime total and last year total field boxes look correct in the sample report

4 years agoMerge pull request #15988 from jensschuppe/dev_core_1425
Eileen McNaughton [Fri, 29 Nov 2019 20:34:12 +0000 (09:34 +1300)]
Merge pull request #15988 from jensschuppe/dev_core_1425

dev/core#1425 Remove misleading type hint for Setting value parameter

4 years agodev/core#1425 Remove misleading type hint for setting value parameter in CRM_Core_BAO...
Jens Schuppe [Fri, 29 Nov 2019 13:13:03 +0000 (14:13 +0100)]
dev/core#1425 Remove misleading type hint for setting value parameter in CRM_Core_BAO_Setting::setItem().

4 years agoMerge pull request #15983 from eileenmcnaughton/search_nfc
Seamus Lee [Fri, 29 Nov 2019 10:07:09 +0000 (21:07 +1100)]
Merge pull request #15983 from eileenmcnaughton/search_nfc

[NFC] Cleanup comments, string comparison in grant search

4 years agoMerge pull request #15987 from seamuslee001/master_metadata
Seamus Lee [Fri, 29 Nov 2019 10:06:56 +0000 (21:06 +1100)]
Merge pull request #15987 from seamuslee001/master_metadata

Only add in the metadata for advanced search if use has access to the…

4 years agoOnly add in the metadata for advanced search if use has access to the relevant component
Seamus Lee [Fri, 29 Nov 2019 08:40:22 +0000 (19:40 +1100)]
Only add in the metadata for advanced search if use has access to the relevant component

CiviPledge is separate to CiviContribute

4 years agoMerge pull request #15986 from civicrm/5.20
Eileen McNaughton [Fri, 29 Nov 2019 08:44:37 +0000 (21:44 +1300)]
Merge pull request #15986 from civicrm/5.20

5.20

4 years agoMerge pull request #15845 from jitendrapurohit/dev-1390
Eileen McNaughton [Fri, 29 Nov 2019 08:44:21 +0000 (21:44 +1300)]
Merge pull request #15845 from jitendrapurohit/dev-1390

dev/core#1390 - Search builder error on Membership source field

4 years agoMerge pull request #15923 from eileenmcnaughton/act_order
Seamus Lee [Fri, 29 Nov 2019 08:38:23 +0000 (19:38 +1100)]
Merge pull request #15923 from eileenmcnaughton/act_order

Fix fatal error when sorting by status in activity search

4 years agoMerge pull request #15985 from seamuslee001/master
Eileen McNaughton [Fri, 29 Nov 2019 08:34:26 +0000 (21:34 +1300)]
Merge pull request #15985 from seamuslee001/master

5.20 port to master

4 years agoMerge in 5.20
Seamus Lee [Fri, 29 Nov 2019 08:33:26 +0000 (19:33 +1100)]
Merge in 5.20

4 years agoMerge pull request #15962 from seamuslee001/dev_core_1422
Eileen McNaughton [Fri, 29 Nov 2019 08:25:18 +0000 (21:25 +1300)]
Merge pull request #15962 from seamuslee001/dev_core_1422

dev/core#1422 Ensure that the form values are correctly passed onto t…

4 years agoMerge pull request #15966 from seamuslee001/permission_access_metadata
Eileen McNaughton [Fri, 29 Nov 2019 08:18:24 +0000 (21:18 +1300)]
Merge pull request #15966 from seamuslee001/permission_access_metadata

Conditionally add metadata for advanced search only if the user has a…

4 years ago[NFC] Cleanup comments, string comparision in grant search
eileen [Fri, 29 Nov 2019 07:44:23 +0000 (20:44 +1300)]
[NFC] Cleanup comments, string comparision in grant search

4 years agoMerge pull request #15931 from seamuslee001/standardise_grant_search
Eileen McNaughton [Fri, 29 Nov 2019 07:34:09 +0000 (20:34 +1300)]
Merge pull request #15931 from seamuslee001/standardise_grant_search

[REF] Standardise the Grant Search form handling

4 years agodev/core#1390 - Search builder error on Membership source field
Jitendra Purohit [Thu, 14 Nov 2019 10:09:36 +0000 (15:39 +0530)]
dev/core#1390 - Search builder error on Membership source field

use handleWhereFromMetadata()

4 years agoMerge pull request #15980 from eileenmcnaughton/setting_fix
Seamus Lee [Thu, 28 Nov 2019 23:30:46 +0000 (10:30 +1100)]
Merge pull request #15980 from eileenmcnaughton/setting_fix

dev/core#1425 Replace deprecated settings fns in test suite

4 years agoMerge pull request #15979 from eileenmcnaughton/search
Seamus Lee [Thu, 28 Nov 2019 23:30:21 +0000 (10:30 +1100)]
Merge pull request #15979 from eileenmcnaughton/search

Remove CRM_Contact_Form_Search_Custom_Basic from searches added on install.

4 years agoMerge pull request #15982 from civicrm/5.20
Seamus Lee [Thu, 28 Nov 2019 23:30:13 +0000 (10:30 +1100)]
Merge pull request #15982 from civicrm/5.20

5.20

4 years agodev/core#1425 Replace deprecated settings fns in test suite
eileen [Thu, 28 Nov 2019 20:05:18 +0000 (09:05 +1300)]
dev/core#1425 Replace deprecated settings fns in test suite

4 years agoMerge pull request #15977 from seamuslee001/fix_issue_number_range_smart_group_empty_...
Seamus Lee [Thu, 28 Nov 2019 21:17:38 +0000 (08:17 +1100)]
Merge pull request #15977 from seamuslee001/fix_issue_number_range_smart_group_empty_values

Ensure that Relative key is not added for non Select Date is_search_range custom fields

4 years agoReplace deprecated setting function
eileen [Thu, 28 Nov 2019 20:37:08 +0000 (09:37 +1300)]
Replace deprecated setting function

Note we can't use Civi::setting here because only the api handles options & arrays well - I wonder what apiv4 does

4 years agoOnly add in relative key when its a custom date field
Seamus Lee [Thu, 28 Nov 2019 03:22:11 +0000 (14:22 +1100)]
Only add in relative key when its a custom date field

Ensure that we strip the _to _from _high _low from the element name first

4 years agoRegenerate sql
eileen [Thu, 28 Nov 2019 19:57:27 +0000 (08:57 +1300)]
Regenerate sql

4 years agoRemove CRM_Contact_Form_Search_Custom_Basic from searches added on install.
eileen [Thu, 28 Nov 2019 19:07:49 +0000 (08:07 +1300)]
Remove CRM_Contact_Form_Search_Custom_Basic from searches added on install.

From https://github.com/civicrm/civicrm-core/pull/15963 this search appears to do what the main basic search does but
we can see that to make it work with sort etc we have to make changes to the BAO_Query object - doing
that to support a custom search scares me & we have a big picture position that we should move these
from core to an extension. However, an easy first step is not to add on new installs. In the case of
this search it seems like an easy call as it doesn't add anything discernable

4 years agoMerge pull request #15978 from civicrm/5.20
Seamus Lee [Thu, 28 Nov 2019 08:32:49 +0000 (19:32 +1100)]
Merge pull request #15978 from civicrm/5.20

5.20

4 years agoMerge pull request #15976 from eileenmcnaughton/5.20
Seamus Lee [Thu, 28 Nov 2019 05:18:51 +0000 (16:18 +1100)]
Merge pull request #15976 from eileenmcnaughton/5.20

Fix 5.20 regression on retrieving template transaction with no logged  in user

4 years agoMerge pull request #15901 from eileenmcnaughton/matt
Matthew Wire [Thu, 28 Nov 2019 03:09:59 +0000 (16:09 +1300)]
Merge pull request #15901 from eileenmcnaughton/matt

[REF] further removal of unnecessary  params

4 years agoFix 5.20 regression on retrieving template transaction with no logged in user
eileen [Thu, 28 Nov 2019 02:26:45 +0000 (15:26 +1300)]
Fix 5.20 regression on retrieving template transaction with no logged in user

4 years agoMerge pull request #15973 from kcristiano/5.20-msg-tpl
Seamus Lee [Thu, 28 Nov 2019 01:11:32 +0000 (12:11 +1100)]
Merge pull request #15973 from kcristiano/5.20-msg-tpl

Link to docs.civicrm.org instead of wiki

4 years agoMake else statement more legible
eileen [Mon, 25 Nov 2019 03:53:20 +0000 (16:53 +1300)]
Make else statement more legible

This just condenses the statement since  != '' is so broad we know the final
else is only when that is true - ergo it's the same as above

4 years agoLink to docs.civicrm.org instead of wiki
Kevin Cristiano [Wed, 27 Nov 2019 20:46:53 +0000 (15:46 -0500)]
Link to docs.civicrm.org instead of wiki

4 years agoMerge pull request #15877 from demeritcowboy/casereport-unittest
Seamus Lee [Wed, 27 Nov 2019 19:34:03 +0000 (06:34 +1100)]
Merge pull request #15877 from demeritcowboy/casereport-unittest

[TEST] dev/core#1366 Unit test for case audit

4 years agoMerge pull request #15909 from eileenmcnaughton/payment
Eileen McNaughton [Wed, 27 Nov 2019 18:45:07 +0000 (07:45 +1300)]
Merge pull request #15909 from eileenmcnaughton/payment

Fix api Payment.create to support overpayments

4 years agoMerge pull request #15951 from eileenmcnaughton/export_bom
Mathieu Lu [Wed, 27 Nov 2019 14:57:43 +0000 (09:57 -0500)]
Merge pull request #15951 from eileenmcnaughton/export_bom

CSV Export: Add deprecation warning

4 years agoFix dev/report#23
Aidan Saunders [Wed, 27 Nov 2019 12:13:15 +0000 (12:13 +0000)]
Fix dev/report#23
When filtering by contact sub-type using 'is not one of' do not exclude where sub-type is null.

Add unit tests for contact sub-type 'is one of' and 'is not one of'
Tighten the matching on sub-type to avoid problems where one contact sub-type is a substring of another.

4 years agoFix fatal error when sorting by status in activity search
eileen [Thu, 21 Nov 2019 22:53:02 +0000 (11:53 +1300)]
Fix fatal error when sorting by status in activity search

4 years ago[REF] clean up merge array.
eileen [Wed, 27 Nov 2019 06:56:55 +0000 (19:56 +1300)]
[REF] clean up merge array.

This code has been doing my head in because it is just like 'construct complex array & then another
complex array & iterate them together in nasty ways.

However, after another round of misery I'm pretty sure that this cleanup works. Basically the whole removed
section of code amounts to 'the array built in the first pass takes precedence over the one in the
second pass'. By using a property & only setting the array values when not-yet-set we can
allow the second pass to not clobber the first while populating it rather than as follow up wrangling

4 years agoMerge pull request #15967 from seamuslee001/dev_core_1329
Seamus Lee [Wed, 27 Nov 2019 03:04:58 +0000 (14:04 +1100)]
Merge pull request #15967 from seamuslee001/dev_core_1329

dev/core1329 Reduce number of deceased contacts in the demo data from…

4 years agoMake utf8mb4 status check language more for the general consumer
Seamus Lee [Sun, 24 Nov 2019 20:33:00 +0000 (07:33 +1100)]
Make utf8mb4 status check language more for the general consumer

Fix grammar and change title of check to be a bit more human related

4 years agodev/core1329 Reduce number of deceased contacts in the demo data from 31 to 12
Seamus Lee [Tue, 26 Nov 2019 20:39:04 +0000 (07:39 +1100)]
dev/core1329 Reduce number of deceased contacts in the demo data from 31 to 12

Limit number of deceased contacts to 4 and add in age checks as per Justin