Seamus Lee [Wed, 11 Dec 2019 19:19:34 +0000 (06:19 +1100)]
Merge pull request #16081 from artfulrobot/payment-property-bag-add-getters
Payment PropertyBag: Add generic getter, setter methods for convenience
Rich Lott / Artful Robot [Wed, 11 Dec 2019 10:27:56 +0000 (10:27 +0000)]
Payment PropertyBag: Add generic getter, setter methods for convenience
Seamus Lee [Wed, 11 Dec 2019 00:07:08 +0000 (11:07 +1100)]
Merge pull request #16076 from alifrumin/rn5.21
5.21 Release notes: First Pass
Alice Frumin [Mon, 9 Dec 2019 17:55:42 +0000 (12:55 -0500)]
Release Notes 5.21 - Sorting and Annotating
Seamus Lee [Tue, 10 Dec 2019 18:38:34 +0000 (05:38 +1100)]
Merge pull request #16071 from jitendrapurohit/521rc
dev/core#1463 Fix record payment form errors
Jitendra Purohit [Tue, 10 Dec 2019 10:41:43 +0000 (16:11 +0530)]
Fix record payment form errors
Tim Otten [Tue, 10 Dec 2019 07:28:38 +0000 (23:28 -0800)]
Merge pull request #16069 from seamuslee001/5.21
Add release-notes/5.20.1
Tim Otten [Tue, 10 Dec 2019 07:01:53 +0000 (23:01 -0800)]
Add release-notes/5.20.1
Eileen McNaughton [Mon, 9 Dec 2019 23:19:14 +0000 (12:19 +1300)]
Merge pull request #16060 from artfulrobot/payment-property-bag-add-props
Add extra Payment PropertyBag properties
Seamus Lee [Mon, 9 Dec 2019 23:14:19 +0000 (10:14 +1100)]
Merge pull request #16061 from eileenmcnaughton/cont_hook
dev/core#1460 move post hook to avoid errors with custom fields created in the hook
eileen [Mon, 9 Dec 2019 20:54:15 +0000 (09:54 +1300)]
dev/core#1460 move post hook to avoid errors with custom fields created in the hook
Per dev/core#1460 a fatal error can occur if custom data is created in the post hook. In addition I note it makes sense to
include custom data before the rollback
Rich Lott / Artful Robot [Mon, 9 Dec 2019 12:52:12 +0000 (12:52 +0000)]
Add extra Payment PropertyBag properties
Seamus Lee [Mon, 9 Dec 2019 02:25:50 +0000 (13:25 +1100)]
Merge pull request #16047 from eileenmcnaughton/521
dev/membership#21 Fix regression causing transfer of membership to another contact if they paid
Seamus Lee [Sun, 8 Dec 2019 23:22:51 +0000 (10:22 +1100)]
Merge pull request #16034 from seamuslee001/dev_core_1449
dev/core#1449 Do not dispatch pre/post hooks during upgrade
eileen [Sun, 8 Dec 2019 22:13:49 +0000 (11:13 +1300)]
dev/membership#21 Fix regression on transferring member to another contact if they paid
Seamus Lee [Fri, 6 Dec 2019 01:34:27 +0000 (12:34 +1100)]
dev/core#1449 Do not dispatch pre and post hooks whilst we are in an upgrade process
Add in code comments to point to new gitlab and reasoning for the change
Mathieu Lu [Sat, 7 Dec 2019 17:47:09 +0000 (12:47 -0500)]
Merge pull request #16033 from seamuslee001/dev_core_1447
dev/core#1447 Fix hard fail on upgrade due to duplicate names in the …
Seamus Lee [Fri, 6 Dec 2019 22:25:34 +0000 (09:25 +1100)]
Add in unit test locking in the fix
Seamus Lee [Fri, 6 Dec 2019 20:16:08 +0000 (07:16 +1100)]
Merge pull request #16036 from agh1/5.21.0-releasenotes
5.21.0 release notes: initial run
Andrew Hunt [Fri, 6 Dec 2019 19:33:24 +0000 (14:33 -0500)]
5.20.0 release notes: added boilerplate
Andrew Hunt [Fri, 6 Dec 2019 19:30:35 +0000 (14:30 -0500)]
5.20.0 release notes: raw from script
Seamus Lee [Thu, 5 Dec 2019 22:14:56 +0000 (09:14 +1100)]
dev/core#1447 Fix hard fail on upgrade due to duplicate names in the database when trying to fix the option group name
CiviCRM [Wed, 4 Dec 2019 22:46:40 +0000 (22:46 +0000)]
Set version to 5.21.beta1
Tim Otten [Wed, 4 Dec 2019 20:38:51 +0000 (12:38 -0800)]
release-notes.md - Fix 5.19.4 TOC
Tim Otten [Wed, 4 Dec 2019 20:08:07 +0000 (12:08 -0800)]
release-notes/5.20.0
totten [Wed, 4 Dec 2019 17:21:28 +0000 (17:21 +0000)]
Update 5.19.4.md
totten [Wed, 4 Dec 2019 17:04:52 +0000 (17:04 +0000)]
Update 5.19.4.md
Seamus Lee [Tue, 3 Dec 2019 19:39:14 +0000 (06:39 +1100)]
Update release notes for latest PR backported
Seamus Lee [Sun, 1 Dec 2019 23:09:30 +0000 (10:09 +1100)]
Add in release notes for 5.19.4 drop
Seamus Lee [Mon, 2 Dec 2019 19:30:58 +0000 (06:30 +1100)]
Also update composer.lock
Coleman Watts [Mon, 2 Dec 2019 18:47:40 +0000 (13:47 -0500)]
Upgrade CKEditor to v4.13.0
Seamus Lee [Sat, 30 Nov 2019 22:42:41 +0000 (09:42 +1100)]
Remove the check statement as not relevant to apiv4
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
Seamus Lee [Thu, 28 Nov 2019 23:03:00 +0000 (10:03 +1100)]
Ensure that API Explorer passes through necessary header
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
Seamus Lee [Wed, 4 Dec 2019 19:58:53 +0000 (06:58 +1100)]
Merge pull request #16028 from civicrm/5.20
5.20
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.
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
Andrew Hunt [Wed, 4 Dec 2019 18:34:00 +0000 (13:34 -0500)]
5.20.0 release notes: final edits
Andrew Hunt [Wed, 4 Dec 2019 17:28:24 +0000 (12:28 -0500)]
5.20.0 release notes: add late changes
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
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
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
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
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
Seamus Lee [Tue, 3 Dec 2019 19:19:47 +0000 (06:19 +1100)]
[NFC] Fix camelCase variable name following fix for dev/core#1435
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
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.
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
Matthew Wire (MJW Consulting) [Wed, 6 Nov 2019 15:17:57 +0000 (15:17 +0000)]
Remove unused cancelledStatus assign
Seamus Lee [Tue, 3 Dec 2019 08:28:24 +0000 (19:28 +1100)]
Merge pull request #16016 from seamuslee001/master
5.20
Seamus Lee [Tue, 3 Dec 2019 08:26:58 +0000 (19:26 +1100)]
Merge in 5.20
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
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
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
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
demeritcowboy [Tue, 3 Dec 2019 01:33:38 +0000 (20:33 -0500)]
remove unused function
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.
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
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
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
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
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
Seamus Lee [Mon, 2 Dec 2019 19:56:06 +0000 (06:56 +1100)]
Merge pull request #16008 from civicrm/5.20
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
Tim Otten [Mon, 25 Nov 2019 22:31:20 +0000 (14:31 -0800)]
Add release-notes/5.19.3.md
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.
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
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…
Justin Freeman [Sun, 1 Dec 2019 22:51:43 +0000 (09:51 +1100)]
CIVICRM-1383 Remove typo, double ;; from CiviCRM code
Seamus Lee [Mon, 2 Dec 2019 04:46:48 +0000 (15:46 +1100)]
Merge pull request #16004 from civicrm/5.20
5.20
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
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
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
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
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
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
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
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
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
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
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
eileen [Fri, 29 Nov 2019 22:39:58 +0000 (11:39 +1300)]
[NFC] cleanup on QueryTest
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
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
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
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
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
eileen [Fri, 29 Nov 2019 22:57:51 +0000 (11:57 +1300)]
Remove calls to deprecated pseudoconstant activityType, test
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
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
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
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
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().
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
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…
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
Eileen McNaughton [Fri, 29 Nov 2019 08:44:37 +0000 (21:44 +1300)]
Merge pull request #15986 from civicrm/5.20
5.20
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
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