civicrm-core.git
5 years agoFix version for pledge message update, also remove 'please print'
eileen [Thu, 6 Jun 2019 22:46:44 +0000 (10:46 +1200)]
Fix version for pledge message update, also remove 'please print'

5 years agoMerge pull request #14465 from philmb/dev/core#1010
Eileen McNaughton [Thu, 6 Jun 2019 22:43:08 +0000 (10:43 +1200)]
Merge pull request #14465 from philmb/dev/core#1010

dev/core#1010 pledge_acknowledge template - capitalization and greeting

5 years agoMerge pull request #14442 from colemanw/drupal8jquery
Eileen McNaughton [Thu, 6 Jun 2019 22:11:36 +0000 (10:11 +1200)]
Merge pull request #14442 from colemanw/drupal8jquery

Conditionally use Drupal's jQuery only if available

5 years agoMerge pull request #14464 from mattwire/smartgroupeditcriteria
Eileen McNaughton [Thu, 6 Jun 2019 22:07:23 +0000 (10:07 +1200)]
Merge pull request #14464 from mattwire/smartgroupeditcriteria

Don't run search when editing smartgroup criteria

5 years agodev/core#1010 pledge_acknowledge template - capitalization and greeting
PhilMB [Thu, 6 Jun 2019 17:51:11 +0000 (12:51 -0500)]
dev/core#1010 pledge_acknowledge template - capitalization and greeting

Pledge Acknowledgements have incorrect capitalization in greetings, and greetings do not use email_greeting.

5 years agoConditionally use Drupal's jQuery only if available
Coleman Watts [Thu, 6 Jun 2019 00:54:47 +0000 (20:54 -0400)]
Conditionally use Drupal's jQuery only if available

5 years agoDon't search before showing smartgroup criteria
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 15:11:29 +0000 (16:11 +0100)]
Don't search before showing smartgroup criteria

5 years agoWhitespace formatting in CRM/Group/Form/Edit.tpl
Matthew Wire (MJW Consulting) [Thu, 6 Jun 2019 14:57:35 +0000 (15:57 +0100)]
Whitespace formatting in CRM/Group/Form/Edit.tpl

5 years agoMerge pull request #14463 from seamuslee001/5_14_master
Seamus Lee [Thu, 6 Jun 2019 13:57:08 +0000 (23:57 +1000)]
Merge pull request #14463 from seamuslee001/5_14_master

5.14

5 years agoMerge in 5.14
Seamus Lee [Thu, 6 Jun 2019 13:55:06 +0000 (23:55 +1000)]
Merge in 5.14

5 years agoMerge pull request #14394 from eileenmcnaughton/merge_get_conflicts
Eileen McNaughton [Thu, 6 Jun 2019 12:35:42 +0000 (00:35 +1200)]
Merge pull request #14394 from eileenmcnaughton/merge_get_conflicts

Add Contact.get_merge_conflicts api

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 11:45:07 +0000 (04:45 -0700)]
Update 5.14.0.md

5 years agoinstall/index.php - Fix misleading install text
Tim Otten [Thu, 6 Jun 2019 11:39:43 +0000 (04:39 -0700)]
install/index.php - Fix misleading install text

During GUI install, there's a health-check based on the PHP version.  Now
that PHP 7 is required, this message *always* talks about PHP 7.x. But
it's presented under a bucket labeled "PHP5".

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 11:12:11 +0000 (04:12 -0700)]
Update 5.14.0.md

5 years agoSet version to 5.14.0
CiviCRM [Thu, 6 Jun 2019 10:52:41 +0000 (10:52 +0000)]
Set version to 5.14.0

5 years agoMerge pull request #14451 from eileenmcnaughton/format
Eileen McNaughton [Thu, 6 Jun 2019 10:30:17 +0000 (22:30 +1200)]
Merge pull request #14451 from eileenmcnaughton/format

[NFC] array formatting in api_v3_paymentTest class

5 years agoMerge pull request #14458 from eileenmcnaughton/cachekey
Eileen McNaughton [Thu, 6 Jun 2019 10:29:44 +0000 (22:29 +1200)]
Merge pull request #14458 from eileenmcnaughton/cachekey

Test tweaks that *might* help with intermittant test weirdness

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 10:28:58 +0000 (03:28 -0700)]
Update 5.14.0.md

5 years agoMerge pull request #14201 from seamuslee001/5.14
Tim Otten [Thu, 6 Jun 2019 10:28:37 +0000 (03:28 -0700)]
Merge pull request #14201 from seamuslee001/5.14

Fix AssetBuilderTest when running on WordPress. Use Guzzle.

5 years agoMerge pull request #14449 from demeritcowboy/bulksms-enotice
Eileen McNaughton [Thu, 6 Jun 2019 10:25:36 +0000 (22:25 +1200)]
Merge pull request #14449 from demeritcowboy/bulksms-enotice

dev/core#1023 - E_NOTICE when creating bulk SMS

5 years agoMerge pull request #14457 from civicrm/5.14
Eileen McNaughton [Thu, 6 Jun 2019 10:11:14 +0000 (22:11 +1200)]
Merge pull request #14457 from civicrm/5.14

5.14

5 years agoAssetBuilderTest - Add more assertions for Guzzle variant of test
Tim Otten [Thu, 6 Jun 2019 09:34:50 +0000 (02:34 -0700)]
AssetBuilderTest - Add more assertions for Guzzle variant of test

5 years agoTest tweaks that *might* help with intermittant test weirdness
eileen [Thu, 6 Jun 2019 09:27:52 +0000 (21:27 +1200)]
Test tweaks that *might* help with intermittant test weirdness

It's technically possible for the 2 cache keys to be the same - which would break stuff - although it seems
a bit too frequent to be the reason...

Also we clear one cache in tear down & not the other.

I'm not optimistic either of these will solve the intermittant fails but they seem more correct changed

Also I added verbosity

5 years agoMerge pull request #14445 from demeritcowboy/deletedActivitiesSearchFilter
Yashodha Chaku [Thu, 6 Jun 2019 09:23:16 +0000 (14:53 +0530)]
Merge pull request #14445 from demeritcowboy/deletedActivitiesSearchFilter

dev/core#1022 - Manage Case deleted activities search filter no longer working

5 years agoFix Invalid asset builder test by using guzzle
Seamus Lee [Sun, 5 May 2019 01:43:12 +0000 (11:43 +1000)]
Fix Invalid asset builder test by using guzzle

5 years agoRevert "Fix Asset builder test by altering error_reporting level to match Drupal...
Tim Otten [Thu, 6 Jun 2019 09:15:55 +0000 (02:15 -0700)]
Revert "Fix Asset builder test by altering error_reporting level to match Drupal and changing regex to not care about HTTP version"

This reverts commit be441aa368ef7f1e5a8dd115c065caa172f95a6a.

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:38:24 +0000 (01:38 -0700)]
Update 5.14.0.md

5 years agoUpdate 5.14.0.md
Tim Otten [Thu, 6 Jun 2019 08:36:06 +0000 (01:36 -0700)]
Update 5.14.0.md

5 years agoMerge pull request #14212 from seamuslee001/wordpress_e2e_assetbuilder_fix
Tim Otten [Thu, 6 Jun 2019 08:33:34 +0000 (01:33 -0700)]
Merge pull request #14212 from seamuslee001/wordpress_e2e_assetbuilder_fix

Fix AssetBuilderTest by altering error_reporting level to match Dru…

5 years agoMerge pull request #14439 from seamuslee001/5_14_0_release_notes_update
Eileen McNaughton [Thu, 6 Jun 2019 07:50:29 +0000 (19:50 +1200)]
Merge pull request #14439 from seamuslee001/5_14_0_release_notes_update

Update 5.14.0 release notes with latest changes

5 years agoMerge pull request #14455 from civicrm/5.14
Eileen McNaughton [Thu, 6 Jun 2019 07:45:04 +0000 (19:45 +1200)]
Merge pull request #14455 from civicrm/5.14

5.14 to master

5 years agoMerge pull request #14454 from eileenmcnaughton/php72
Eileen McNaughton [Thu, 6 Jun 2019 07:43:28 +0000 (19:43 +1200)]
Merge pull request #14454 from eileenmcnaughton/php72

(NFC) Remove without param tests

5 years agoMerge pull request #14453 from eileenmcnaughton/export_sc_514
Tim Otten [Thu, 6 Jun 2019 07:24:19 +0000 (00:24 -0700)]
Merge pull request #14453 from eileenmcnaughton/export_sc_514

dev/core#1015 fix regression on exporting soft credits

5 years agoRemove without param tests
eileen [Thu, 6 Jun 2019 06:40:56 +0000 (18:40 +1200)]
Remove without param tests

These really date back to when we were creating the api wrapper. I don't think
they add much value now - esp since php is not quiet if we break the wrapper
contract

5 years agodev/core#1015 fix regression on exporting soft credits
eileen [Thu, 6 Jun 2019 06:34:20 +0000 (18:34 +1200)]
dev/core#1015 fix regression on exporting soft credits

Cut down from https://github.com/civicrm/civicrm-core/pull/14440/commits due to test fails

5 years agoUpdate Release 5.14.0 release notes with latest changes
Seamus Lee [Wed, 5 Jun 2019 23:09:45 +0000 (09:09 +1000)]
Update Release 5.14.0 release notes with latest changes

Update release notes for PR #14440

Withdraw soft credits item

5 years agofix E_NOTICE
DemeritCowboy [Thu, 6 Jun 2019 05:10:51 +0000 (01:10 -0400)]
fix E_NOTICE

5 years ago[NFC] array formatting in api_v3_paymentTest class
eileen [Thu, 6 Jun 2019 05:44:24 +0000 (17:44 +1200)]
[NFC] array formatting in api_v3_paymentTest class

5 years agoMerge pull request #14441 from colemanw/sortable
Eileen McNaughton [Thu, 6 Jun 2019 04:15:38 +0000 (16:15 +1200)]
Merge pull request #14441 from colemanw/sortable

dev/core#628 - Make Quicksearch options sortable

5 years agoMerge pull request #14411 from eileenmcnaughton/merge_get_duplicates
Eileen McNaughton [Thu, 6 Jun 2019 04:05:43 +0000 (16:05 +1200)]
Merge pull request #14411 from eileenmcnaughton/merge_get_duplicates

Add api for Dedupe.getduplicates

5 years agomake search filter work again
DemeritCowboy [Thu, 6 Jun 2019 02:59:32 +0000 (22:59 -0400)]
make search filter work again

5 years agoUpdate get_merge_conflicts api
eileen [Mon, 3 Jun 2019 03:42:33 +0000 (15:42 +1200)]
Update get_merge_conflicts api

Increase result nuance in response to review

5 years agodev/core#628 - Make Quicksearch options sortable
Coleman Watts [Wed, 5 Jun 2019 21:47:10 +0000 (17:47 -0400)]
dev/core#628 - Make Quicksearch options sortable

5 years agoMerge pull request #14438 from eileenmcnaughton/display
Seamus Lee [Thu, 6 Jun 2019 00:09:30 +0000 (10:09 +1000)]
Merge pull request #14438 from eileenmcnaughton/display

(dev/core#1000) Fixes contact's displayname not appearing in membership edit, if no registered email is found

5 years agoMerge pull request #14363 from mfb/error-msg
Seamus Lee [Thu, 6 Jun 2019 00:08:23 +0000 (10:08 +1000)]
Merge pull request #14363 from mfb/error-msg

Avoid logging error message if status check query fails.

5 years agoMerge pull request #14407 from eileenmcnaughton/514
Seamus Lee [Wed, 5 Jun 2019 23:34:27 +0000 (09:34 +1000)]
Merge pull request #14407 from eileenmcnaughton/514

Fix checksum failure on editing recurring contributions

5 years agoMerge pull request #14435 from eileenmcnaughton/5.14
Seamus Lee [Wed, 5 Jun 2019 23:11:04 +0000 (09:11 +1000)]
Merge pull request #14435 from eileenmcnaughton/5.14

Revert "Create contribution before taking payment, per contribution page workflow"

5 years agoFix checksum failure on editing recurring contributions
eileen [Sun, 2 Jun 2019 23:11:49 +0000 (11:11 +1200)]
Fix checksum failure on editing recurring contributions

5 years agoFixes contact's displayname not appearing in membership edit, if no registered email...
Vangelis Pantazis [Wed, 29 May 2019 10:54:38 +0000 (11:54 +0100)]
Fixes contact's displayname not appearing in membership edit, if no registered email is found

Add a unit test to lock in fix to dev/core#1000

5 years ago5.14.0 release notes (#14245)
Andrew Hunt [Wed, 5 Jun 2019 22:42:23 +0000 (18:42 -0400)]
5.14.0 release notes (#14245)

* 5.14.0 release notes: raw from script

* 5.14.0 release notes: add boilerplate

* sorting misc and deleting 5.13 commits

* fixing up contributors

* fixing up gitlab issues titles

* annotating

* rearranging sections

* editing and clean up

* 5.14.0 release notes: edits

* 5.14.0 release notes: incorporated late changes

5 years agoMerge pull request #14437 from agh1/no-php-56
Tim Otten [Wed, 5 Jun 2019 22:27:09 +0000 (15:27 -0700)]
Merge pull request #14437 from agh1/no-php-56

Minimum supported PHP version is 7.0

5 years agoMerge pull request #14426 from eileenmcnaughton/cont_notice
Eileen McNaughton [Wed, 5 Jun 2019 22:02:00 +0000 (10:02 +1200)]
Merge pull request #14426 from eileenmcnaughton/cont_notice

dev/core#1014 fix e-notice regression

5 years agoAdd api for Dedupe.getduplicates
eileen [Mon, 3 Jun 2019 04:21:46 +0000 (16:21 +1200)]
Add api for Dedupe.getduplicates

5 years agoMinimum supported PHP version is 7.0
Andrew Hunt [Wed, 5 Jun 2019 16:33:24 +0000 (12:33 -0400)]
Minimum supported PHP version is 7.0

5 years agoImprove handling of 1st option on search prefs
Coleman Watts [Wed, 5 Jun 2019 15:38:47 +0000 (11:38 -0400)]
Improve handling of 1st option on search prefs

5 years agoMerge pull request #14247 from pradpnayak/ActvityTags
Monish Deb [Wed, 5 Jun 2019 15:23:32 +0000 (20:53 +0530)]
Merge pull request #14247 from pradpnayak/ActvityTags

Change Activity tag to use select2

5 years agoRevert "Create contribution before taking payment, per contribution page workflow"
eileen [Wed, 5 Jun 2019 13:18:23 +0000 (01:18 +1200)]
Revert "Create contribution before taking payment, per contribution page workflow"

This reverts commit 9257f129

5 years agoMerge pull request #14434 from eileenmcnaughton/activity_form
Eileen McNaughton [Wed, 5 Jun 2019 12:24:55 +0000 (00:24 +1200)]
Merge pull request #14434 from eileenmcnaughton/activity_form

[REF] Activity form - very minor tidy up

5 years agoRemove fatal errors in favour of status bounces
eileen [Wed, 5 Jun 2019 04:21:10 +0000 (16:21 +1200)]
Remove fatal errors in favour of status bounces

5 years ago[REF] very small code cleanup
eileen [Wed, 5 Jun 2019 04:19:29 +0000 (16:19 +1200)]
[REF] very small code cleanup

activityTName is only ever set in the proceeding IF clause so moving this chunk of code into that
clause makes that a little more readable

5 years agoMerge pull request #14432 from civicrm/5.14
Eileen McNaughton [Wed, 5 Jun 2019 03:24:53 +0000 (15:24 +1200)]
Merge pull request #14432 from civicrm/5.14

5.14 to master

5 years agoMerge pull request #14430 from agileware/5.14--CIVICRM-1228
Eileen McNaughton [Wed, 5 Jun 2019 03:24:27 +0000 (15:24 +1200)]
Merge pull request #14430 from agileware/5.14--CIVICRM-1228

dev/core#1017: Always bootstrap CRM_Utils_System against 5.14

5 years agodev/core#1017: Always bootstrap CRM_Utils_System
Francis Whittle [Wed, 5 Jun 2019 01:15:45 +0000 (11:15 +1000)]
dev/core#1017: Always bootstrap CRM_Utils_System

5 years agodev/core#1014 fix e-notice regression
eileen [Tue, 4 Jun 2019 23:46:40 +0000 (11:46 +1200)]
dev/core#1014 fix e-notice regression

5 years agoMerge pull request #14424 from seamuslee001/phpunit6_money_test
Eileen McNaughton [Tue, 4 Jun 2019 23:42:05 +0000 (11:42 +1200)]
Merge pull request #14424 from seamuslee001/phpunit6_money_test

Fix running of CRM_Utils_MoneyTest on PHPUnit6+

5 years agoMerge pull request #14419 from colemanw/settingsCheckbox
Eileen McNaughton [Tue, 4 Jun 2019 23:38:28 +0000 (11:38 +1200)]
Merge pull request #14419 from colemanw/settingsCheckbox

Improve formatting for settings checkboxes

5 years agoFix enable components form validation
Coleman Watts [Tue, 4 Jun 2019 22:18:24 +0000 (18:18 -0400)]
Fix enable components form validation

5 years agoImprove formatting for settings checkboxes
Coleman Watts [Mon, 3 Jun 2019 15:50:03 +0000 (11:50 -0400)]
Improve formatting for settings checkboxes

5 years agoFix running of CRM_Utils_MoneyTest on PHPUnit6+
Seamus Lee [Tue, 4 Jun 2019 21:48:12 +0000 (07:48 +1000)]
Fix running of CRM_Utils_MoneyTest on PHPUnit6+

5 years agoMerge pull request #14423 from totten/master-cache-test
Eileen McNaughton [Tue, 4 Jun 2019 19:23:39 +0000 (07:23 +1200)]
Merge pull request #14423 from totten/master-cache-test

Caches - Normalize dependency on php-cache integration-tests

5 years agoMerge pull request #14421 from seamuslee001/phpunit6_tap
Tim Otten [Tue, 4 Jun 2019 07:12:01 +0000 (00:12 -0700)]
Merge pull request #14421 from seamuslee001/phpunit6_tap

phpunit6 - Implement TAP printer

5 years agoCacheTestCase - Extend the canonical upstream class instead of a forked class from...
Tim Otten [Tue, 4 Jun 2019 06:36:34 +0000 (23:36 -0700)]
CacheTestCase - Extend the canonical upstream class instead of a forked class from 'packages'

5 years agocomposer.json - Get php-cache integration-tests via composer
Tim Otten [Tue, 4 Jun 2019 06:36:07 +0000 (23:36 -0700)]
composer.json - Get php-cache integration-tests via composer

5 years agotools/scripts/phpunit - Accept `--tap` on PHP 7.x / PHPUnit 6.x
Tim Otten [Mon, 3 Jun 2019 23:46:45 +0000 (16:46 -0700)]
tools/scripts/phpunit - Accept `--tap` on PHP 7.x / PHPUnit 6.x

The `--tap` option was removed in PHPUnit 6.x.  For backwared compatibility,
the preceding commit adds a printer with same/similar output format.  This
continues adding the backward comapt by respecting `--tap` as an alias
for `--printer Civi/Test/TAP`.

5 years agoMerge pull request #14422 from civicrm/5.14
Eileen McNaughton [Mon, 3 Jun 2019 22:53:32 +0000 (10:53 +1200)]
Merge pull request #14422 from civicrm/5.14

5.14 to master

5 years agoMerge pull request #14420 from colemanw/menuFix
Mathieu Lu [Mon, 3 Jun 2019 22:16:37 +0000 (18:16 -0400)]
Merge pull request #14420 from colemanw/menuFix

dev/core#1012 Fix selection of quicksearch options

5 years agoImplement Civi Native TAP class
Seamus Lee [Mon, 3 Jun 2019 22:03:11 +0000 (08:03 +1000)]
Implement Civi Native TAP class

5 years agoMerge pull request #14404 from seamuslee001/test_run_phpunit6
Eileen McNaughton [Mon, 3 Jun 2019 21:09:09 +0000 (09:09 +1200)]
Merge pull request #14404 from seamuslee001/test_run_phpunit6

Try running unit tests on phpunit6

5 years agodev/core#1012 Fix selection of quicksearch options
Coleman Watts [Mon, 3 Jun 2019 20:15:45 +0000 (16:15 -0400)]
dev/core#1012 Fix selection of quicksearch options

5 years agoMerge pull request #14395 from eileenmcnaughton/recur_status
Matthew Wire [Mon, 3 Jun 2019 14:40:15 +0000 (15:40 +0100)]
Merge pull request #14395 from eileenmcnaughton/recur_status

dev/core#905 Add contribution recur statuses 'Processing' and 'Failing'

5 years agoMerge pull request #14348 from mattwire/sql_engine_config
Monish Deb [Mon, 3 Jun 2019 13:28:14 +0000 (18:58 +0530)]
Merge pull request #14348 from mattwire/sql_engine_config

Allow updating ENGINE_CONFIG for System.updatelogtables

5 years agoMerge pull request #14389 from christianwach/lab-1005
Seamus Lee [Mon, 3 Jun 2019 11:23:22 +0000 (21:23 +1000)]
Merge pull request #14389 from christianwach/lab-1005

Force link in confirmation email to be front-end

5 years agoMerge pull request #14416 from JMAConsulting/core-785-1
Seamus Lee [Mon, 3 Jun 2019 10:39:09 +0000 (20:39 +1000)]
Merge pull request #14416 from JMAConsulting/core-785-1

dev/Core#785: Extend addField to support select2 widget

5 years agoMerge pull request #14417 from civicrm/5.14
Seamus Lee [Mon, 3 Jun 2019 10:38:55 +0000 (20:38 +1000)]
Merge pull request #14417 from civicrm/5.14

5.14

5 years agoMerge pull request #14414 from eileenmcnaughton/xeditable2
Seamus Lee [Mon, 3 Jun 2019 10:10:21 +0000 (20:10 +1000)]
Merge pull request #14414 from eileenmcnaughton/xeditable2

Add angular-xeditable to angular

5 years agoForce link in confirmation email to be front-end
Christian Wach [Mon, 3 Jun 2019 10:01:09 +0000 (11:01 +0100)]
Force link in confirmation email to be front-end

5 years agoMerge pull request #14409 from eileenmcnaughton/rel_cont
Seamus Lee [Mon, 3 Jun 2019 09:50:07 +0000 (19:50 +1000)]
Merge pull request #14409 from eileenmcnaughton/rel_cont

dev/core#1002 fix fatal on searching on related contacts.

5 years agoMerge pull request #14393 from eileenmcnaughton/setting_frm
Eileen McNaughton [Mon, 3 Jun 2019 08:35:28 +0000 (20:35 +1200)]
Merge pull request #14393 from eileenmcnaughton/setting_frm

dev/core#1004 Fix regression causing notices on components screen

5 years agoExtend addField to support select2 widget
Monish Deb [Mon, 3 Jun 2019 08:25:20 +0000 (13:55 +0530)]
Extend addField to support select2 widget

5 years agoAdd angular-xeditable to angular
eileen [Mon, 3 Jun 2019 07:30:54 +0000 (19:30 +1200)]
Add angular-xeditable to angular

From my digging xeditable seems like the main option for angular edit in place
https://vitalets.github.io/angular-xeditable/#overview

I think it makes sense to ship with core & sooner rather than later so we don't get
in muddles with different versions in extensions

My sample afform using this is here

https://github.com/totten/afform/issues/15

5 years agoMerge pull request #14413 from civicrm/5.14
Seamus Lee [Mon, 3 Jun 2019 07:25:37 +0000 (17:25 +1000)]
Merge pull request #14413 from civicrm/5.14

5.14

5 years agoMerge pull request #14412 from eileenmcnaughton/514_another
Seamus Lee [Mon, 3 Jun 2019 07:25:06 +0000 (17:25 +1000)]
Merge pull request #14412 from eileenmcnaughton/514_another

Fix test / possible live error on submitting credit card renewals

5 years agoFix test / possible live error on submitting credit card renewals
eileen [Fri, 24 May 2019 00:28:00 +0000 (12:28 +1200)]
Fix test / possible live error on submitting credit card renewals

5 years agodev/core#1002 fix fatal on searching on recurring contacts.
eileen [Mon, 3 Jun 2019 02:10:11 +0000 (14:10 +1200)]
dev/core#1002 fix fatal on searching on recurring contacts.

This is happening because the alphabet query is using the simpleFrom on the class rather than the returned from

5 years agoMerge pull request #14401 from eileenmcnaughton/cust_fields
Seamus Lee [Mon, 3 Jun 2019 04:10:53 +0000 (14:10 +1000)]
Merge pull request #14401 from eileenmcnaughton/cust_fields

dev/core#389 [preliminary cleanup+ test] Standardise metadat for custom field

5 years agoMerge pull request #14405 from seamuslee001/lab_core_985
Seamus Lee [Mon, 3 Jun 2019 02:51:07 +0000 (12:51 +1000)]
Merge pull request #14405 from seamuslee001/lab_core_985

dev/core#985 Fix trailing slash for urls on Windows

5 years agoAdd Contact.get_merge_conflicts api
eileen [Sat, 1 Jun 2019 06:42:10 +0000 (18:42 +1200)]
Add Contact.get_merge_conflicts api

THe goal here is to
1) improve testing
2) cleanup the code & define parameters where they are actually used rather than pass from pillar to post
3) expose to the api so we can be less coupled to the current form

I thought about putting the api on the Dedupe entity but my thinking is that actions relating to
individual pairs go on the contact entity & those relating to the batch find, cache, merge
functionality go on the Dedupe entity.

I'm doing another round of dedupe code cleanup at the moment... In conjunction with efforts to write an
angular form which highlights what functionality a form needs to access & where the code is awful....

5 years agoMerge pull request #14399 from mattwire/entitypagetrait
Eileen McNaughton [Mon, 3 Jun 2019 00:53:29 +0000 (12:53 +1200)]
Merge pull request #14399 from mattwire/entitypagetrait

Add EntityPageTrait

5 years agoMerge pull request #14406 from eileenmcnaughton/ipn
Seamus Lee [Sun, 2 Jun 2019 23:27:36 +0000 (09:27 +1000)]
Merge pull request #14406 from eileenmcnaughton/ipn

dev/drupal#66 Fix legacy IPN endpoint for Drupal (gitlab issue 973)

5 years agoFix legacy IPN endpoint for Drupal (gitlab issue 973)
Rich Lott [Tue, 21 May 2019 10:23:26 +0000 (11:23 +0100)]
Fix legacy IPN endpoint for Drupal (gitlab issue 973)