Seamus Lee [Tue, 10 Dec 2019 05:09:30 +0000 (16:09 +1100)]
Merge pull request #16063 from seamuslee001/unit_test_1460
[NFC] Add in unit test for dev/core#1460
Seamus Lee [Tue, 10 Dec 2019 01:02:31 +0000 (12:02 +1100)]
Merge pull request #16066 from civicrm/5.21
5.21
Seamus Lee [Mon, 9 Dec 2019 23:10:24 +0000 (10:10 +1100)]
[NFC] Add in unit test for dev/core#1460
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
Eileen McNaughton [Mon, 9 Dec 2019 23:18:59 +0000 (12:18 +1300)]
Merge pull request #16064 from civicrm/5.21
5.21
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
Seamus Lee [Mon, 9 Dec 2019 20:37:32 +0000 (07:37 +1100)]
Merge pull request #16058 from eileenmcnaughton/mem_js
Fix js error on choosing membership type
Seamus Lee [Mon, 9 Dec 2019 20:27:46 +0000 (07:27 +1100)]
Merge pull request #16056 from eileenmcnaughton/add_part
[REF] Minor simplification on additional_participants checks
Rich Lott / Artful Robot [Mon, 9 Dec 2019 12:52:12 +0000 (12:52 +0000)]
Add extra Payment PropertyBag properties
eileen [Mon, 9 Dec 2019 10:10:37 +0000 (23:10 +1300)]
Fix js error on choosing membership type
I'm seeing a js error when I select a membership type in the back end form. It seems I have recurProcessors assigned
& they have an onChange that calls
buildAutoRenew - which is non existant if the action is not 2. It seems to me that the code is simplest when functions
can be relied on to exist and aree called conditionally - this makes that change, also ensuring 'something' is
assigned for recurProcessors to prevent the error when it's not defined that probably let to the fn being encased in an if
I can't spot any obvious regression cause & perhaps there is something in my config but this might be a regression
eileen [Mon, 29 Jul 2019 03:52:19 +0000 (15:52 +1200)]
Minor simplification on additional_participants checks
Eileen McNaughton [Mon, 9 Dec 2019 06:04:28 +0000 (19:04 +1300)]
Merge pull request #16054 from seamuslee001/sort_contact
[REF] Refactor Contact Search form to use standardised getSortID func…
Eileen McNaughton [Mon, 9 Dec 2019 05:20:55 +0000 (18:20 +1300)]
Merge pull request #16053 from seamuslee001/activity_sort
[REF] Refactor Activity Search to use parent getSortID function
Eileen McNaughton [Mon, 9 Dec 2019 05:20:40 +0000 (18:20 +1300)]
Merge pull request #16055 from seamuslee001/campaign_sort
[REF] Refactor Campaign Search form to use standardised getSortID fun…
Seamus Lee [Mon, 9 Dec 2019 03:55:23 +0000 (14:55 +1100)]
[REF] Refactor Campaign Search form to use standardised getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:55:17 +0000 (14:55 +1100)]
[REF] Refactor Contact Search form to use standardised getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:48:15 +0000 (14:48 +1100)]
Merge pull request #16050 from eileenmcnaughton/qf
[NFC] code cleanup
Seamus Lee [Mon, 9 Dec 2019 03:47:55 +0000 (14:47 +1100)]
[REF] Refactor Activity Search to use parent getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:34:38 +0000 (14:34 +1100)]
Merge pull request #15942 from seamuslee001/contact_fields_metadata
Add in searchFieldMetadata for contact_tags, contact_type, group and …
Eileen McNaughton [Mon, 9 Dec 2019 02:36:45 +0000 (15:36 +1300)]
Merge pull request #16051 from civicrm/5.21
5.21
Seamus Lee [Mon, 9 Dec 2019 02:31:38 +0000 (13:31 +1100)]
Merge pull request #15927 from eileenmcnaughton/event_form
[REF] Move wrangling of Front end form contribution param for autoRenew back to form
Seamus Lee [Tue, 26 Nov 2019 19:57:43 +0000 (06:57 +1100)]
Only add in the additional metadata if we are also adding them to the form
Seamus Lee [Sun, 24 Nov 2019 03:20:24 +0000 (14:20 +1100)]
Add in searchFieldMetadata for contact_tags, contact_type, group and deleted_contacts fields for contribute, pledge searches
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
eileen [Mon, 9 Dec 2019 02:11:04 +0000 (15:11 +1300)]
[NFC] code cleanup
Add some throws statements, fix some double quotes to single, fix some comparisons to strict
Eileen McNaughton [Mon, 9 Dec 2019 01:42:58 +0000 (14:42 +1300)]
Merge pull request #16049 from civicrm/5.21
5.21
Eileen McNaughton [Mon, 9 Dec 2019 01:42:20 +0000 (14:42 +1300)]
Merge pull request #16038 from seamuslee001/proper_event_badge_fix
Proper Fix for dev/core#1422
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 McNaughton [Sun, 8 Dec 2019 22:57:59 +0000 (11:57 +1300)]
Merge pull request #16045 from seamuslee001/nfc_settings_array
[NFC] Add in a unit test of passing an array into the Civi::settings …
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
Seamus Lee [Sun, 8 Dec 2019 21:38:44 +0000 (08:38 +1100)]
Merge pull request #16044 from seamuslee001/remove_deprecated_function
[REF] Replace Deprecated function CRM_Core_BAO_Setting::setItem with …
Seamus Lee [Sun, 8 Dec 2019 20:42:30 +0000 (07:42 +1100)]
[NFC] Add in a unit test of passing an array into the Civi::settings set facade and getting it back
Seamus Lee [Sun, 8 Dec 2019 20:30:28 +0000 (07:30 +1100)]
Merge pull request #16042 from agileware/CIVICRM-1392
Update Smart Group form uses different labels for Group Title and Group Description
Seamus Lee [Sun, 8 Dec 2019 20:29:37 +0000 (07:29 +1100)]
Merge pull request #16043 from agileware/CIVICRM-1391
Update Smart Group form unsets the existing Group Types
Seamus Lee [Sun, 8 Dec 2019 19:46:24 +0000 (06:46 +1100)]
[REF] Replace Deprecated function CRM_Core_BAO_Setting::setItem with the relevant Civi::contactSettings function
Justin Freeman [Sun, 8 Dec 2019 05:28:36 +0000 (16:28 +1100)]
CIVICRM-1391 Update Smart Group form unsets the existing Group Types for the Group
Justin Freeman [Sun, 8 Dec 2019 04:45:52 +0000 (15:45 +1100)]
CIVICRM-1392 - Group, Update Smart Group uses different labels for Group Title and Group Description
Seamus Lee [Sat, 7 Dec 2019 22:05:29 +0000 (09:05 +1100)]
Merge pull request #16040 from civicrm/5.21
5.21
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 21:58:32 +0000 (08:58 +1100)]
Proper Fix for dev/core#1422
Seamus Lee [Fri, 6 Dec 2019 20:40:33 +0000 (07:40 +1100)]
Merge pull request #15975 from eileenmcnaughton/setting
dev/core#1425 More aggressively deprecate old setItem & setOptionValue functions on BAO_Setting
Seamus Lee [Fri, 6 Dec 2019 20:26:04 +0000 (07:26 +1100)]
Merge pull request #16037 from civicrm/5.21
5.21
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
Matthew Wire [Thu, 5 Dec 2019 12:05:09 +0000 (12:05 +0000)]
Merge pull request #16031 from agileware/CIVICRM-1389
Fix typo, Mailign should be Mailing
Justin Freeman [Thu, 5 Dec 2019 10:14:08 +0000 (21:14 +1100)]
CIVICRM-1389 Fix typo, Mailign should be Mailing
colemanw [Wed, 4 Dec 2019 23:38:52 +0000 (18:38 -0500)]
Merge pull request #16006 from demeritcowboy/case-role-manager-api
dev/core#1426 Return correct manager role info during Case api get
CiviCRM [Wed, 4 Dec 2019 22:52:56 +0000 (22:52 +0000)]
Set version to 5.22.alpha1
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
eileen [Mon, 2 Dec 2019 21:02:13 +0000 (10:02 +1300)]
Remove test on function we are deprecating to remove.
Tests fail on this now due to deprecation. Looking to remove the whole fn in future
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
demeritcowboy [Mon, 2 Dec 2019 18:15:49 +0000 (13:15 -0500)]
return manager info during api call
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.