civicrm-core.git
5 years ago(security/core#67) Port APIv3's escaping scheme to APIv4
Tim Otten [Fri, 25 Oct 2019 03:59:08 +0000 (20:59 -0700)]
(security/core#67) Port APIv3's escaping scheme to APIv4

5 years agoHTMLInputCoder - Add more variants for encoding arrays
Tim Otten [Fri, 25 Oct 2019 03:57:34 +0000 (20:57 -0700)]
HTMLInputCoder - Add more variants for encoding arrays

5 years agoFix unit test for APIv4 format
Seamus Lee [Wed, 9 Oct 2019 09:24:42 +0000 (20:24 +1100)]
Fix unit test for APIv4 format

5 years agoFix api_key handling from joins
Coleman Watts [Mon, 1 Jul 2019 00:47:47 +0000 (20:47 -0400)]
Fix api_key handling from joins

5 years agosecurity/core#65 - Fix XSS in Dashboard Report Title
Patrick Figel [Wed, 9 Oct 2019 10:45:33 +0000 (12:45 +0200)]
security/core#65 - Fix XSS in Dashboard Report Title

This fixes an XSS in report titles displayed on the dashboard page
by escaping the title on output.

5 years agosecurity/core#65 Fix Display of Report title that contains XSS in it when shown on...
Seamus Lee [Thu, 8 Aug 2019 21:38:06 +0000 (07:38 +1000)]
security/core#65 Fix Display of Report title that contains XSS in it when shown on dashboard

5 years agosecurity/core#59 - Fix SQL injection in civicrm/ajax/dedupefind
Patrick Figel [Fri, 5 Jul 2019 18:49:44 +0000 (20:49 +0200)]
security/core#59 - Fix SQL injection in civicrm/ajax/dedupefind

This fixes an SQL injection in civicrm/ajax/dedupefind by validating
the order direction parameter.

Fixes #59

5 years agoMerge pull request #15788 from seamuslee001/5_19_1_version_bump_release_notes
Tim Otten [Sat, 9 Nov 2019 02:33:35 +0000 (18:33 -0800)]
Merge pull request #15788 from seamuslee001/5_19_1_version_bump_release_notes

Bump version and add in release notes for a 5.19.1 drop

5 years agoUpdate 5.19.1.md
Tim Otten [Sat, 9 Nov 2019 02:32:54 +0000 (18:32 -0800)]
Update 5.19.1.md

5 years agoAdd in release notes for 5.19.1 drop
Seamus Lee [Sat, 9 Nov 2019 01:39:44 +0000 (12:39 +1100)]
Add in release notes for 5.19.1 drop

5 years agoSet version to 5.19.1
Seamus Lee [Sat, 9 Nov 2019 01:31:12 +0000 (12:31 +1100)]
Set version to 5.19.1

5 years agoMerge pull request #15780 from seamuslee001/dev_mailing_56_5_19
Seamus Lee [Fri, 8 Nov 2019 23:33:36 +0000 (10:33 +1100)]
Merge pull request #15780 from seamuslee001/dev_mailing_56_5_19

dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namesp…

5 years agodev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields...
Seamus Lee [Fri, 8 Nov 2019 21:27:41 +0000 (08:27 +1100)]
dev/mailing#56 dev/mailing#57 Ensure that we don't pass in any namespaced fields when building the row array for mailing reports

5 years agoMerge pull request #15766 from seamuslee001/dev_core_1376_5_19
Eileen McNaughton [Fri, 8 Nov 2019 02:19:56 +0000 (15:19 +1300)]
Merge pull request #15766 from seamuslee001/dev_core_1376_5_19

dev/core#1376 Catch Invalid Argument Exception when looking for APIv4…

5 years agoMerge pull request #15763 from seamuslee001/dev_core_1371_5_19
Seamus Lee [Thu, 7 Nov 2019 23:35:30 +0000 (10:35 +1100)]
Merge pull request #15763 from seamuslee001/dev_core_1371_5_19

dev/core#1371 Fix e-notice caused by trying to pass in known info to …

5 years agodev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services
Seamus Lee [Thu, 7 Nov 2019 23:07:32 +0000 (10:07 +1100)]
dev/core#1376 Catch Invalid Argument Exception when looking for APIv4 Services

5 years agodev/core#1371 Fix e-notice caused by trying to pass in known info to the extension...
Seamus Lee [Thu, 7 Nov 2019 20:20:21 +0000 (07:20 +1100)]
dev/core#1371 Fix e-notice caused by trying to pass in known info to the extension downloader when checking requirements

5 years agoSet version to 5.19.0
Tim Otten [Thu, 7 Nov 2019 01:39:32 +0000 (17:39 -0800)]
Set version to 5.19.0

5 years agoMerge pull request #15752 from agh1/5.19.0-releasenotes-final
Tim Otten [Thu, 7 Nov 2019 01:32:18 +0000 (17:32 -0800)]
Merge pull request #15752 from agh1/5.19.0-releasenotes-final

5.19.0 release notes: added late changes

5 years agoUpdate 5.19.0.md
Tim Otten [Thu, 7 Nov 2019 01:31:27 +0000 (17:31 -0800)]
Update 5.19.0.md

5 years ago5.19.0 release notes: added late changes
Andrew Hunt [Thu, 7 Nov 2019 01:16:33 +0000 (20:16 -0500)]
5.19.0 release notes: added late changes

5 years agoMerge pull request #15741 from totten/5.19-volinst
Seamus Lee [Wed, 6 Nov 2019 19:18:37 +0000 (06:18 +1100)]
Merge pull request #15741 from totten/5.19-volinst

(dev/core#1093) Fix regression during extension activation

5 years ago(dev/core#1093) Fix permission error when activating extension
Tim Otten [Wed, 6 Nov 2019 07:50:16 +0000 (23:50 -0800)]
(dev/core#1093) Fix permission error when activating extension

Overview
--------

This fixes a recent/unreleased regression from #15726 in which the D7 demo build fails.

Before
------

When running `civibuild reinstall ...` on a `drupal-demo` site, it fails at this step:

```
+++ drush -y cvapi extension.install key=org.civicrm.volunteer debug=1
Authorization failed                                                                                                                                                   [error]
Array
(
    [error_code] => unauthorized
    [entity] => Extension
    [action] => install
    [trace] => #0 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(166): Civi\API\Kernel->authorize(Object(Civi\Api4\Provider\ActionObjectProvider), Object(Civi\Api4\Generic\DAOSaveAction))
1 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php(235): Civi\API\Kernel->runRequest(Object(Civi\Api4\Generic\DAOSaveAction))
2 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(374): Civi\Api4\Generic\AbstractAction->execute()
3 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Utils/Migrate/Import.php(82): CRM_Utils_Migrate_Import->customFields(Object(SimpleXMLElement), Array)
4 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(836): CRM_Utils_Migrate_Import->runXmlElement(Object(SimpleXMLElement))
5 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader.php(48): CRM_Volunteer_Upgrader->executeCustomDataTemplateFile('volunteer-custo...')
6 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/CRM/Volunteer/Upgrader/Base.php(306): CRM_Volunteer_Upgrader->install()
7 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.civix.php(131): CRM_Volunteer_Upgrader_Base->onInstall()
8 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/tools/extensions/civivolunteer/volunteer.php(204): _volunteer_civix_civicrm_install()
9 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(76): volunteer_civicrm_install()
10 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager/Module.php(48): CRM_Extension_Manager_Module->callHook(Object(CRM_Extension_Info), 'install')
11 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/CRM/Extension/Manager.php(264): CRM_Extension_Manager_Module->onPreInstall(Object(CRM_Extension_Info))
12 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/v3/Extension.php(58): CRM_Extension_Manager->install(Array)
13 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Provider/MagicFunctionProvider.php(101): civicrm_api3_extension_install(Array)
14 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(168): Civi\API\Provider\MagicFunctionProvider->invoke(Array)
15 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php(99): Civi\API\Kernel->runRequest(Array)
16 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/api/api.php(23): Civi\API\Kernel->runSafe('extension', 'install', Array, NULL)
17 /Users/myuser/bknix/build/dmaster/web/sites/all/modules/civicrm/drupal/drush/civicrm.drush.inc(1557): civicrm_api('extension', 'install', Array)
18 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(422): drush_civicrm_api('extension.insta...', 'key=org.civicrm...', 'debug=1')
19 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(231): _drush_invoke_hooks(Array, Array)
20 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/command.inc(199): drush_command('extension.insta...', 'key=org.civicrm...', 'debug=1')
21 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/lib/Drush/Boot/BaseBoot.php(67): drush_dispatch(Array)
22 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/preflight.inc(66): Drush\Boot\BaseBoot->bootstrap_and_dispatch()
23 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(465): drush_main()
24 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/includes/startup.inc(369): drush_run_main(false, '/', 'Phar detected. ...')
25 phar:///Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar/drush(114): drush_startup(Array)
26 /Users/myuser/bknix/civicrm-buildkit/extern/drush8.phar(10): require('phar:///Users/t...')
27 {main}
    [is_error] => 1
    [error_message] => Authorization failed
)
```

After
-----

It works again.

5 years agoMerge pull request #15726 from MiyaNoctem/dev-core-1093-fix-installation-of-custom...
Eileen McNaughton [Mon, 4 Nov 2019 21:00:06 +0000 (10:00 +1300)]
Merge pull request #15726 from MiyaNoctem/dev-core-1093-fix-installation-of-custom-fields-with-option-values

dev/core#1093: Fix Installation of Custom Fields with Option Values From XML

5 years agoMerge pull request #15724 from MiyaNoctem/dev-core-1360-fix-programatic-installation...
Seamus Lee [Mon, 4 Nov 2019 19:32:35 +0000 (06:32 +1100)]
Merge pull request #15724 from MiyaNoctem/dev-core-1360-fix-programatic-installation-of-extensions-v519

dev/core#1360: Fix Programatic Installation Of Multiple Extensions on v5.19

5 years agodev/core#1093: Fix Installation of Custom Fields with Option Values From XML
Camilo Rodriguez [Mon, 4 Nov 2019 16:40:36 +0000 (16:40 +0000)]
dev/core#1093: Fix Installation of Custom Fields with Option Values From XML

5 years agodev/core#1360: Fix Programatic Installation Of Multiple Extensions
Camilo Rodriguez [Fri, 1 Nov 2019 15:03:39 +0000 (15:03 +0000)]
dev/core#1360: Fix Programatic Installation Of Multiple Extensions

5 years agoMerge pull request #15690 from seamuslee001/nfc_authorize_test_fix
Seamus Lee [Fri, 1 Nov 2019 05:42:46 +0000 (16:42 +1100)]
Merge pull request #15690 from seamuslee001/nfc_authorize_test_fix

[NFC] Fix AuthorizeNet Test failure due to credit card being expired

5 years ago[NFC] Fix AuthorizeNet Test failure due to credit card being expired
Seamus Lee [Fri, 1 Nov 2019 04:50:46 +0000 (15:50 +1100)]
[NFC] Fix AuthorizeNet Test failure due to credit card being expired

5 years agoMerge pull request #15657 from demeritcowboy/pledge-search-backport
Eileen McNaughton [Tue, 29 Oct 2019 23:35:51 +0000 (12:35 +1300)]
Merge pull request #15657 from demeritcowboy/pledge-search-backport

dev/core#1348 - pledge search not working backport of 15656

5 years agoMerge pull request #15655 from demeritcowboy/activity-search-form-values
Seamus Lee [Tue, 29 Oct 2019 22:08:27 +0000 (09:08 +1100)]
Merge pull request #15655 from demeritcowboy/activity-search-form-values

dev/core#1348 - backport of PR 15654

5 years agopledge search not working
DemeritCowboy [Tue, 29 Oct 2019 21:44:00 +0000 (17:44 -0400)]
pledge search not working

5 years agoactivity search not working at all
DemeritCowboy [Tue, 29 Oct 2019 21:08:31 +0000 (17:08 -0400)]
activity search not working at all

5 years agoMerge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc
Eileen McNaughton [Mon, 28 Oct 2019 19:32:36 +0000 (08:32 +1300)]
Merge pull request #15642 from MiyaNoctem/dev-core-1093-backport-fix-to-v5.19-rc

dev/core#1093: Bckport Fix to v.5.19 to Add Custom Fields to Logging Tables

5 years agodev/core#1093: Add Custom Fields to Logging Tables
Camilo Rodríguez [Thu, 24 Oct 2019 18:34:54 +0000 (13:34 -0500)]
dev/core#1093: Add Custom Fields to Logging Tables

BulkSave method was adding fields to custom group table, but not to custom
group logging table. If these tables were updated on installation, before all
the schema is synced bewtween main and logging tables, fatal errors would be
thrown, as triggers tried to insert info into log tables missing required
fields.

Fixed by building log table after all fields are added to main table, and
before rebuilding triggers.

5 years agoMerge pull request #15598 from alifrumin/rn5.19
Seamus Lee [Thu, 24 Oct 2019 19:35:46 +0000 (06:35 +1100)]
Merge pull request #15598 from alifrumin/rn5.19

5.19 Release Notes - first pass of sorting, annotating and editing

5 years ago5.19 Release Notes - first pass
Alice Frumin [Fri, 18 Oct 2019 00:14:02 +0000 (20:14 -0400)]
5.19 Release Notes - first pass

5 years agoMerge pull request #15583 from seamuslee001/5.19
Tim Otten [Wed, 23 Oct 2019 00:08:02 +0000 (17:08 -0700)]
Merge pull request #15583 from seamuslee001/5.19

5.18.4 Release notes

5 years agoUpdate 5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:53:11 +0000 (16:53 -0700)]
Update 5.18.4.md

5 years ago5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:48:52 +0000 (16:48 -0700)]
5.18.4.md

There was some ambiguity between original problem-report and PR-description.
Update per MM.

5 years agorelease-notes/5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:38:47 +0000 (16:38 -0700)]
release-notes/5.18.4.md

5 years agoMerge pull request #15569 from eileenmcnaughton/pay_notice
Seamus Lee [Mon, 21 Oct 2019 23:52:51 +0000 (10:52 +1100)]
Merge pull request #15569 from eileenmcnaughton/pay_notice

Enotice fix (unreleased enotice)

5 years agoMerge pull request #15537 from eileenmcnaughton/pay_check
Seamus Lee [Mon, 21 Oct 2019 23:47:54 +0000 (10:47 +1100)]
Merge pull request #15537 from eileenmcnaughton/pay_check

Fix a regression whereby payment details are not saved from the AdditionalPayment form

5 years agoEnotice fix
eileen [Mon, 21 Oct 2019 21:56:59 +0000 (10:56 +1300)]
Enotice fix

per https://github.com/civicrm/civicrm-core/pull/15545#issuecomment-544531438

5 years agoSupport payment related fields on Payment.Create
eileen [Fri, 18 Oct 2019 04:20:40 +0000 (17:20 +1300)]
Support payment related fields on Payment.Create

On some digging I found that various payment related fields like pan_truncation & card_type_id were
being quietly ignored rather than saved by Payment.create

The additional payment form now uses this api so it is a regression on that form.

This fixes the metadata, tests & support for payment-related trxn fields

5 years agoMerge pull request #15561 from eileenmcnaughton/payment_amount
Seamus Lee [Mon, 21 Oct 2019 06:59:09 +0000 (17:59 +1100)]
Merge pull request #15561 from eileenmcnaughton/payment_amount

dev/core#1333 Fix incorrect balance amount on fully paid payment

5 years agoMerge pull request #15558 from eileenmcnaughton/report_page519
Eileen McNaughton [Mon, 21 Oct 2019 03:35:59 +0000 (16:35 +1300)]
Merge pull request #15558 from eileenmcnaughton/report_page519

(dev/core#1252) Fix paging on contact summary

5 years agodev/core#1333 Fix incorrect balance amount on fully paid payment
eileen [Mon, 21 Oct 2019 00:46:55 +0000 (13:46 +1300)]
dev/core#1333 Fix incorrect balance amount on fully paid payment

Per https://lab.civicrm.org/dev/core/issues/1333 this is resulting in an incorrect balance.

The code was previously marked as highly dubious

5 years agoAttempt to fix paging on contact summary
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary

5 years agoMerge pull request #15539 from eileenmcnaughton/pay_back
Matthew Wire [Sun, 20 Oct 2019 18:04:44 +0000 (19:04 +0100)]
Merge pull request #15539 from eileenmcnaughton/pay_back

Rename balanceTrxnParams to paymentTrxnParams [REF]

5 years agoMerge pull request #15545 from eileenmcnaughton/pay_email_p
Eileen McNaughton [Sat, 19 Oct 2019 23:20:57 +0000 (12:20 +1300)]
Merge pull request #15545 from eileenmcnaughton/pay_email_p

dev/core#1322 Fix regression whereby Additional Payment Form not setting from when sending email confirmations

5 years agoEnsure a default FROM address is used when sending email confirmations
eileen [Fri, 18 Oct 2019 22:27:23 +0000 (11:27 +1300)]
Ensure a default FROM address is used when sending email confirmations

5 years agoMerge pull request #15538 from eileenmcnaughton/ppal_std
Eileen McNaughton [Fri, 18 Oct 2019 21:08:29 +0000 (10:08 +1300)]
Merge pull request #15538 from eileenmcnaughton/ppal_std

Regression fix on Paypal Std with memberships not being finalised correctly.

5 years agoRename balanceTrxnParams to paymentTrxnParams [REF]
eileen [Fri, 18 Oct 2019 03:53:13 +0000 (16:53 +1300)]
Rename balanceTrxnParams to paymentTrxnParams [REF]

This array needs some fixes but I wanted to rename the parameter first as balanceTrxnParams is misleading.

The parameters are for the financial_trxn entry corresponding to the payment

5 years agoRegression fix on Paypal Std with memberships not being finalised correctly.
eileen [Fri, 18 Oct 2019 06:46:47 +0000 (19:46 +1300)]
Regression fix on Paypal Std with memberships not being finalised correctly.

Per https://github.com/civicrm/civicrm-core/pull/15053#issuecomment-542770130

5 years agoMerge pull request #15527 from eileenmcnaughton/merge
Seamus Lee [Thu, 17 Oct 2019 04:43:21 +0000 (06:43 +0200)]
Merge pull request #15527 from eileenmcnaughton/merge

Fix default mode on Contact.merge api

5 years agoMerge pull request #15521 from agh1/5.19.0-releasenotes-initial
Eileen McNaughton [Thu, 17 Oct 2019 03:58:07 +0000 (16:58 +1300)]
Merge pull request #15521 from agh1/5.19.0-releasenotes-initial

5.19.0 release notes initial run

5 years agoMerge branch '5.19' into 5.19.0-releasenotes-initial
Eileen McNaughton [Thu, 17 Oct 2019 03:57:59 +0000 (16:57 +1300)]
Merge branch '5.19' into 5.19.0-releasenotes-initial

5 years agoFix default mode on Contact.merge api
eileen [Wed, 16 Oct 2019 23:09:36 +0000 (12:09 +1300)]
Fix default mode on Contact.merge api

I believe this was a change I made in error & only the Contact.get_merge_conflicts api should
receive an array for 'mode'. The mode is part of a loop within that api

5 years agoMerge pull request #15524 from seamuslee001/5_18_3_release_notes
Eileen McNaughton [Wed, 16 Oct 2019 22:52:33 +0000 (11:52 +1300)]
Merge pull request #15524 from seamuslee001/5_18_3_release_notes

5 18 3 release notes

5 years agoUpdate 5.18.3.md
Tim Otten [Tue, 15 Oct 2019 21:08:43 +0000 (14:08 -0700)]
Update 5.18.3.md

5 years agoAdd in release notes for 5.18.3
Seamus Lee [Tue, 15 Oct 2019 06:04:43 +0000 (17:04 +1100)]
Add in release notes for 5.18.3

5 years ago5.19.0 release notes: added boilerplate
Andrew Hunt [Wed, 16 Oct 2019 16:40:57 +0000 (12:40 -0400)]
5.19.0 release notes: added boilerplate

5 years ago5.19.0 release notes - raw from script
Andrew Hunt [Wed, 16 Oct 2019 16:32:18 +0000 (12:32 -0400)]
5.19.0 release notes - raw from script

5 years agoMerge pull request #15502 from eileenmcnaughton/payment_bug
Monish Deb [Tue, 15 Oct 2019 03:25:38 +0000 (08:55 +0530)]
Merge pull request #15502 from eileenmcnaughton/payment_bug

dev/financial#69 Fix misrecording of payments against non pay_later Pending contribution.

5 years agoMerge pull request #15506 from seamuslee001/ignore_own_extension
Seamus Lee [Mon, 14 Oct 2019 22:12:45 +0000 (00:12 +0200)]
Merge pull request #15506 from seamuslee001/ignore_own_extension

Do not check for the extension we are trying to download itself

5 years agoDo not check for the extension we are trying to download itself
Seamus Lee [Mon, 14 Oct 2019 20:51:08 +0000 (07:51 +1100)]
Do not check for the extension we are trying to download itself

5 years agodev/financial#69 Fix misrecording of payments against non pay_later Pending contribution.
eileen [Mon, 14 Oct 2019 05:20:52 +0000 (18:20 +1300)]
dev/financial#69 Fix misrecording of payments against non pay_later Pending contribution.

Fixes bugs when payments are added against a non-pay later contribution. There were 2 different bugs
1) bug in form layer when the payment is fully paid
2) bug in BAO layer for partial payments.

This fixes both. It may be a regression, hence 5.19

5 years agoMerge pull request #15450 from mattwire/extensionupgrade
Seamus Lee [Mon, 14 Oct 2019 02:33:17 +0000 (04:33 +0200)]
Merge pull request #15450 from mattwire/extensionupgrade

Check requirements before upgrading extensions via the UI

5 years agoMerge pull request #15494 from eileenmcnaughton/519_mem
Matthew Wire [Sun, 13 Oct 2019 19:16:13 +0000 (20:16 +0100)]
Merge pull request #15494 from eileenmcnaughton/519_mem

Fix 5.18 regression on membership handling

5 years agoFix 5.18 regression on membership handling
eileen [Sun, 13 Oct 2019 18:11:31 +0000 (07:11 +1300)]
Fix 5.18 regression on membership handling

Fixes a bug caused by
https://github.com/civicrm/civicrm-core/commit/5b9d3ce80f1a64b39bdd63160ad0a1b960f2faed

And picked up in test with https://github.com/civicrm/civicrm-core/pull/15399

5 years agoMerge pull request #15464 from seamuslee001/5.19
Eileen McNaughton [Wed, 9 Oct 2019 11:29:38 +0000 (13:29 +0200)]
Merge pull request #15464 from seamuslee001/5.19

5.18.2 release notes

5 years agoUpdate release-notes.md
Tim Otten [Wed, 9 Oct 2019 10:24:10 +0000 (12:24 +0200)]
Update release-notes.md

5 years agoUpdate 5.18.2.md
Tim Otten [Wed, 9 Oct 2019 10:22:05 +0000 (12:22 +0200)]
Update 5.18.2.md

5 years agoUpdate release notes following recent merges
Seamus Lee [Wed, 9 Oct 2019 08:00:43 +0000 (19:00 +1100)]
Update release notes following recent merges

5 years agoUpdate release notes for fix for dev/core#1269
Seamus Lee [Tue, 8 Oct 2019 12:40:42 +0000 (23:40 +1100)]
Update release notes for fix for dev/core#1269

5 years agoAdd in release notes for 5.18.2
Seamus Lee [Tue, 8 Oct 2019 09:36:42 +0000 (20:36 +1100)]
Add in release notes for 5.18.2

5 years agoMerge pull request #15453 from eileenmcnaughton/import_campaign
Seamus Lee [Wed, 9 Oct 2019 07:48:07 +0000 (09:48 +0200)]
Merge pull request #15453 from eileenmcnaughton/import_campaign

dev/core#1285 import support for campaign_id (& other fields where it could be an id, a name or a label.

5 years agoMerge pull request #15454 from demeritcowboy/custom-fieldspec-bao
Seamus Lee [Tue, 8 Oct 2019 22:56:50 +0000 (00:56 +0200)]
Merge pull request #15454 from demeritcowboy/custom-fieldspec-bao

dev/core#1305 - fieldspec bao not defined for custom fields

5 years agodev/core#1305
DemeritCowboy [Tue, 8 Oct 2019 17:04:26 +0000 (13:04 -0400)]
dev/core#1305

5 years agodev/core#1285 import support for campaign_id (& other fields where it could be an...
eileen [Tue, 8 Oct 2019 16:51:13 +0000 (18:51 +0200)]
dev/core#1285 import support for campaign_id (& other fields where it could be an id, a name or a label.

After digging into https://lab.civicrm.org/dev/core/issues/1285 it feels a little arguable what we should support but issues in
gitlab indicate there is at least some demand for id & label so it now will
- accept id if input matches an id
- accept name if input matches a name
- accept label if input matches a label.

This means for payment instrument it would accept '1', 'Check' or 'Cheque' (in that order if name were renamed).

This should apply to a few fields - payment instrument, constribution status & per the issue campaign
(on contribution). There are 'some' on membership too I think

5 years agoMerge pull request #15443 from eileenmcnaughton/ex_merge
Seamus Lee [Tue, 8 Oct 2019 15:50:11 +0000 (17:50 +0200)]
Merge pull request #15443 from eileenmcnaughton/ex_merge

dev/core#1302 fix regression on exported when merging addresses with specified fields

5 years ago dev/core#1302 fix regression on merge export
eileen [Tue, 8 Oct 2019 14:18:23 +0000 (16:18 +0200)]
 dev/core#1302 fix regression on merge export

5 years agoCheck requirements before upgrading extensions via the UI
Matthew Wire (MJW Consulting) [Tue, 8 Oct 2019 13:32:41 +0000 (15:32 +0200)]
Check requirements before upgrading extensions via the UI

5 years agoMerge pull request #15447 from seamuslee001/dev_core_1269
Seamus Lee [Tue, 8 Oct 2019 12:31:56 +0000 (14:31 +0200)]
Merge pull request #15447 from seamuslee001/dev_core_1269

dev/core#1269 Add in fix for undefined index bao in parsePseudoConst…

5 years agoMerge pull request #15439 from eileenmcnaughton/ex_bug
Seamus Lee [Tue, 8 Oct 2019 10:20:59 +0000 (12:20 +0200)]
Merge pull request #15439 from eileenmcnaughton/ex_bug

dev/core#1293 Fix regression on  export filtering for postal address only

5 years agodev/core#1269 Add in fix for underfined index bao in parsePseudoConstantField for...
Seamus Lee [Tue, 8 Oct 2019 10:04:10 +0000 (21:04 +1100)]
dev/core#1269 Add in fix for underfined index bao in parsePseudoConstantField for Import Parser

5 years agoMerge pull request #15440 from eileenmcnaughton/ex_zero
Seamus Lee [Tue, 8 Oct 2019 09:10:47 +0000 (11:10 +0200)]
Merge pull request #15440 from eileenmcnaughton/ex_zero

dev/core#1293 Still output csv file on export, even if no rows are in it

5 years agodev/core#1293 Fix regression on export filtering for postal address only
eileen [Tue, 8 Oct 2019 06:21:21 +0000 (08:21 +0200)]
dev/core#1293 Fix regression on  export filtering for postal address only

5 years agoStill output csv file, even if no rows are in it
eileen [Tue, 8 Oct 2019 07:33:26 +0000 (09:33 +0200)]
Still output csv file, even if no rows are in it

5 years agoMerge pull request #15428 from greenpeace-cee/fix-status-check
Eileen McNaughton [Mon, 7 Oct 2019 22:55:50 +0000 (00:55 +0200)]
Merge pull request #15428 from greenpeace-cee/fix-status-check

Fix status check not rendering before 5.19 migrations

5 years agoMerge pull request #15420 from eileenmcnaughton/live_notice
Seamus Lee [Mon, 7 Oct 2019 17:42:13 +0000 (19:42 +0200)]
Merge pull request #15420 from eileenmcnaughton/live_notice

dev/core#1281 fix e-notice on isLiveMode

5 years agoFix status check not rendering before 5.19 migrations
Patrick Figel [Mon, 7 Oct 2019 17:05:59 +0000 (19:05 +0200)]
Fix status check not rendering before 5.19 migrations

This fixes an issue where the status check page does not render when
migrations to 5.19 are pending because the is_active column hasn't been
added yet.

The rationale for this change is to avoid scenarios where users forget
to run upgrades because there's no status check warning.

5 years agoSet version to 5.19.beta1
CiviCRM [Mon, 7 Oct 2019 15:01:46 +0000 (15:01 +0000)]
Set version to 5.19.beta1

5 years agodev/core#1281 fix e-notice on isLiveMode
eileen [Mon, 7 Oct 2019 13:49:28 +0000 (15:49 +0200)]
dev/core#1281 fix e-notice on isLiveMode

Looks like a regression from https://github.com/civicrm/civicrm-core/commit/752cee47213094c29b8e6ae5d0b20f0800520d80
which hit in 5.15 - seems good to merge to rc / about to cut to rc

5 years agoMerge pull request #15417 from eileenmcnaughton/matt
Matthew Wire [Mon, 7 Oct 2019 12:43:02 +0000 (14:43 +0200)]
Merge pull request #15417 from eileenmcnaughton/matt

Add trxn_id as a parameter on Payment.get

5 years agoMerge pull request #15414 from eileenmcnaughton/fix_log_text
Seamus Lee [Mon, 7 Oct 2019 11:44:02 +0000 (13:44 +0200)]
Merge pull request #15414 from eileenmcnaughton/fix_log_text

dev/core#1283 fix inability to export more than 255 chars

5 years agoMerge pull request #15416 from civicrm/eileenmcnaughton-patch-1
Seamus Lee [Mon, 7 Oct 2019 11:43:32 +0000 (13:43 +0200)]
Merge pull request #15416 from civicrm/eileenmcnaughton-patch-1

Update fix - should not be localisable

5 years agoAccept trxn_id to Payment.get
eileen [Mon, 7 Oct 2019 11:22:42 +0000 (13:22 +0200)]
Accept trxn_id to Payment.get

Alternative to #15166 (incorporates #15229 )

5 years agoUnit test for #15166 fix
Jitendra Purohit [Fri, 6 Sep 2019 12:09:28 +0000 (17:39 +0530)]
Unit test for #15166 fix