civicrm-core.git
4 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

4 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

4 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.

4 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

4 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

4 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

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

4 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.

4 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

4 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)

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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]

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

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

4 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

4 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

4 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

4 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.

4 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

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

4 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

4 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

4 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

4 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

4 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…

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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.

4 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

4 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

4 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

4 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

4 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

4 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 )

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

4 years agoMerge pull request #15381 from eileenmcnaughton/w_test
Matthew Wire [Mon, 7 Oct 2019 11:00:55 +0000 (13:00 +0200)]
Merge pull request #15381 from eileenmcnaughton/w_test

Add test for uF group one bug

4 years agoUpdate fix - should not be localisable
Eileen McNaughton [Mon, 7 Oct 2019 10:54:05 +0000 (12:54 +0200)]
Update fix - should not be localisable

4 years agodev/core#1283 fix inability to export more than 255 chars
eileen [Mon, 7 Oct 2019 08:34:21 +0000 (10:34 +0200)]
dev/core#1283 fix inability to export more than 255 chars

4 years agoMerge pull request #15409 from eileenmcnaughton/status
Seamus Lee [Mon, 7 Oct 2019 10:01:59 +0000 (12:01 +0200)]
Merge pull request #15409 from eileenmcnaughton/status

dev/core#1295 Add is_active field to civicrm_status_preference

4 years agoMerge pull request #15413 from eileenmcnaughton/default_sub_type
Seamus Lee [Mon, 7 Oct 2019 08:44:05 +0000 (10:44 +0200)]
Merge pull request #15413 from eileenmcnaughton/default_sub_type

[REF] don't handle non-array, pass by reference

4 years agoHeed is_active value if set to zero
eileen [Sun, 6 Oct 2019 18:13:54 +0000 (20:13 +0200)]
Heed is_active value if set to zero

Note this is done BEFORE doing checks in case it is for performance reasons

4 years agoAdd test for uF group one bug
eileen [Thu, 3 Oct 2019 07:26:16 +0000 (09:26 +0200)]
Add test for uF group one bug

4 years ago[REF] don't handle non-array, pass by reference
eileen [Mon, 7 Oct 2019 04:57:29 +0000 (06:57 +0200)]
[REF] don't handle non-array, pass by reference

This is only called from one place & it is definitely coming in as an array & using the return values.

4 years agoMerge pull request #15352 from colemanw/extCompat
Tim Otten [Sun, 6 Oct 2019 23:48:13 +0000 (00:48 +0100)]
Merge pull request #15352 from colemanw/extCompat

Improve obsolete extension management

4 years agoMerge pull request #15404 from seamuslee001/dev_core_861
Seamus Lee [Sun, 6 Oct 2019 18:59:34 +0000 (20:59 +0200)]
Merge pull request #15404 from seamuslee001/dev_core_861

dev/core#861 Ensure that when processing mailings that no emails are …

4 years agoMerge pull request #15384 from mattwire/membership_updaterecur
Seamus Lee [Sun, 6 Oct 2019 18:59:08 +0000 (20:59 +0200)]
Merge pull request #15384 from mattwire/membership_updaterecur

Remove call to updateRecurMembership which is handled by Membership::create BAO

4 years agoMerge pull request #15406 from mattwire/morecontributionstatuslabel
Seamus Lee [Sun, 6 Oct 2019 18:58:17 +0000 (20:58 +0200)]
Merge pull request #15406 from mattwire/morecontributionstatuslabel

Fix checking of isSubscriptionCancelled when label is changed

4 years agoMerge pull request #15405 from MikeyMJCO/nomoreyahoo
Matthew Wire [Sun, 6 Oct 2019 18:20:22 +0000 (20:20 +0200)]
Merge pull request #15405 from MikeyMJCO/nomoreyahoo

Remove legacy Yahoo references from the Mapping/Geocoding settings/code.

4 years agoFix check for isSubscriptionCancelled in contribute
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:22:20 +0000 (19:22 +0200)]
Fix check for isSubscriptionCancelled in contribute

4 years agoExplicitly retrieve label for contributionStatus (no change in behaviour)
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:21:41 +0000 (19:21 +0200)]
Explicitly retrieve label for contributionStatus (no change in behaviour)

4 years agoAdd is_active to status pref
eileen [Sun, 6 Oct 2019 16:21:52 +0000 (18:21 +0200)]
Add is_active to status pref

4 years agoMerge pull request #15403 from smaen123/patch-1
Matthew Wire [Sun, 6 Oct 2019 17:01:23 +0000 (19:01 +0200)]
Merge pull request #15403 from smaen123/patch-1

Fix height of select2 box (appears squished)

4 years agoRemove call to updateRecurMembership which is handled by Membership::create BAO
Matthew Wire (MJW Consulting) [Thu, 3 Oct 2019 10:23:52 +0000 (11:23 +0100)]
Remove call to updateRecurMembership which is handled by Membership::create BAO

4 years agoextension-compatibility - Update DB state of force-uninstalled extensions
Tim Otten [Sun, 6 Oct 2019 16:49:16 +0000 (17:49 +0100)]
extension-compatibility - Update DB state of force-uninstalled extensions

Note:
1. This is more advisory than functional - the functionality is really in the runtime bits
   in the previous commits.
2. Technically, this is more of a disable, but we should keep the record around in
   `civicrm_extension` so that we know the old schema revision.

4 years agodev/core#861 Ensure that when processing mailings that no emails are sent to deceased...
Seamus Lee [Sun, 6 Oct 2019 16:26:46 +0000 (03:26 +1100)]
dev/core#861 Ensure that when processing mailings that no emails are sent to deceased contacts or those with emails now on hold

4 years agoUpdate ConfigTaskList to remove Yahoo reference and add OSM
Mikey O'Toole [Sun, 6 Oct 2019 15:49:01 +0000 (16:49 +0100)]
Update ConfigTaskList to remove Yahoo reference and add OSM

4 years agoRemove Yahoo reference from the Mapping settings.
Mikey O'Toole [Sun, 6 Oct 2019 15:47:21 +0000 (16:47 +0100)]
Remove Yahoo reference from the Mapping settings.

4 years agoMerge remote-tracking branch 'MikeyMJCO/patch-2' into patch-1
Mikey O'Toole [Sun, 6 Oct 2019 15:34:59 +0000 (16:34 +0100)]
Merge remote-tracking branch 'MikeyMJCO/patch-2' into patch-1

4 years agoRemove conditional for Yahoo mapping provider
Mikey O'Toole [Sun, 6 Oct 2019 15:32:01 +0000 (16:32 +0100)]
Remove conditional for Yahoo mapping provider

The Yahoo mapping provider is no longer in core and therefore this conditional logic is no longer necessary.

4 years agoMerge pull request #14184 from mattwire/relationshipcolumns
Seamus Lee [Sun, 6 Oct 2019 15:29:15 +0000 (17:29 +0200)]
Merge pull request #14184 from mattwire/relationshipcolumns

Allow columns in relationship table to be modified by searchColumns hook

4 years agoRemove Yahoo references
Mikey O'Toole [Sun, 6 Oct 2019 15:27:21 +0000 (16:27 +0100)]
Remove Yahoo references

Remove references to Yahoo Geocoder which is no longer included core.

4 years agoMerge pull request #15397 from mattwire/contributionstatuslabel
Seamus Lee [Sun, 6 Oct 2019 15:17:36 +0000 (17:17 +0200)]
Merge pull request #15397 from mattwire/contributionstatuslabel

REF Explicitly specify params so we can find problems with comparing translated labels

4 years agoMerge pull request #14577 from mattwire/type_consolidation
Eileen McNaughton [Sun, 6 Oct 2019 10:05:01 +0000 (12:05 +0200)]
Merge pull request #14577 from mattwire/type_consolidation

REF Remove some duplication in CRM_Utils_Type::escape/validate

4 years agoMerge pull request #15402 from eileenmcnaughton/nfc
Seamus Lee [Sun, 6 Oct 2019 07:49:50 +0000 (09:49 +0200)]
Merge pull request #15402 from eileenmcnaughton/nfc

[NFC] code formatting & exceptions in doc blocks

4 years agoMerge pull request #15401 from seamuslee001/master
Seamus Lee [Sun, 6 Oct 2019 07:49:43 +0000 (09:49 +0200)]
Merge pull request #15401 from seamuslee001/master

Master / 5.19 version of #15392

4 years agoFix height of select2 box (appears squished)
smaen123 [Sat, 5 Oct 2019 15:57:28 +0000 (17:57 +0200)]
Fix height of select2 box (appears squished)

4 years agoAdd exceptions to phpdoc
eileen [Sat, 5 Oct 2019 13:50:57 +0000 (15:50 +0200)]
Add exceptions to phpdoc