civicrm-core.git
4 years agoMerge pull request #17776 from totten/master-org-check
Seamus Lee [Wed, 8 Jul 2020 23:17:27 +0000 (09:17 +1000)]
Merge pull request #17776 from totten/master-org-check

Status Checks - Use more specific label regarding "Domain"/"Organization" check

4 years agoStatus Checks - Use more specific label regarding "Domain"/"Organization" check
Tim Otten [Wed, 8 Jul 2020 22:01:24 +0000 (15:01 -0700)]
Status Checks - Use more specific label regarding "Domain"/"Organization" check

Before
------

Suppose you install CiviCRM anew.  The installer shows a bulleted list of
things to do.  One of those takes you to another, much longer list of things
to do.  And *then* there's a popup on the sidebar which says you need to
"Complete Setup".

You say to yourself, "I thought that's what I was doing!" But you click it anyway.

That takes you to a page with another list of things to do, one of which is
to "Complete Setup".  The text and link clarify that "Complete Setup"
actually means *set the name and address of the organization*.

After
-----

There are still several different pages telling you what to do after setup.

But at least the label is more precise. :)

4 years agoMerge pull request #17770 from civicrm/5.28
Eileen McNaughton [Wed, 8 Jul 2020 07:34:43 +0000 (19:34 +1200)]
Merge pull request #17770 from civicrm/5.28

5.28 to master

4 years agoMerge pull request #17768 from seamuslee001/flexmailer_distmaker
Eileen McNaughton [Wed, 8 Jul 2020 06:59:25 +0000 (18:59 +1200)]
Merge pull request #17768 from seamuslee001/flexmailer_distmaker

[NFC] Include flexmailer in distmaker

4 years ago[NFC] Include flexmailer in distmaker
Seamus Lee [Wed, 8 Jul 2020 05:33:43 +0000 (15:33 +1000)]
[NFC] Include flexmailer in distmaker

4 years agoMerge pull request #17754 from demeritcowboy/resourceurl-check
colemanw [Tue, 7 Jul 2020 19:31:00 +0000 (15:31 -0400)]
Merge pull request #17754 from demeritcowboy/resourceurl-check

dev/drupal#114 and dev/core#1647 - Remove resource url status check

4 years agoMerge pull request #17750 from colemanw/upgradeBump
Seamus Lee [Tue, 7 Jul 2020 06:04:37 +0000 (16:04 +1000)]
Merge pull request #17750 from colemanw/upgradeBump

Bump minimum upgradable version to 4.4.7

4 years agoBump minimum upgradable version to 4.4.7
Coleman Watts [Sat, 4 Jul 2020 20:43:29 +0000 (16:43 -0400)]
Bump minimum upgradable version to 4.4.7

4 years agoMerge pull request #17767 from demeritcowboy/loss-of-face
Seamus Lee [Tue, 7 Jul 2020 02:07:38 +0000 (12:07 +1000)]
Merge pull request #17767 from demeritcowboy/loss-of-face

[REF] Unused interface CRM_Report_Interface

4 years agoMerge pull request #17256 from demeritcowboy/test-for-16559
Seamus Lee [Tue, 7 Jul 2020 02:06:29 +0000 (12:06 +1000)]
Merge pull request #17256 from demeritcowboy/test-for-16559

[TEST] Failing test for PR 16559

4 years agounused file
demeritcowboy [Mon, 6 Jul 2020 23:56:07 +0000 (19:56 -0400)]
unused file

4 years agoMerge pull request #17764 from jaapjansma/caseActivity
Seamus Lee [Mon, 6 Jul 2020 23:09:16 +0000 (09:09 +1000)]
Merge pull request #17764 from jaapjansma/caseActivity

update to pr 16559

4 years agoupdate to pr 16559
Jaap Jansma [Mon, 6 Jul 2020 14:33:54 +0000 (16:33 +0200)]
update to pr 16559

4 years agoMerge pull request #17761 from eileenmcnaughton/acl
colemanw [Mon, 6 Jul 2020 13:27:46 +0000 (09:27 -0400)]
Merge pull request #17761 from eileenmcnaughton/acl

Remove unused, deprecated functions

4 years agoMerge pull request #17745 from artfulrobot/artfulrobot-findfiles
Matthew Wire [Mon, 6 Jul 2020 10:02:20 +0000 (11:02 +0100)]
Merge pull request #17745 from artfulrobot/artfulrobot-findfiles

Improve efficiency of findFiles

4 years agoRemove unused, deprecated functions
eileen [Mon, 6 Jul 2020 01:14:39 +0000 (13:14 +1200)]
Remove unused, deprecated functions

These functions were deemed unused in January and deprecation warnings were added at that point.
Time to go

4 years agoMerge pull request #17746 from colemanw/apiExpHaving
Eileen McNaughton [Sun, 5 Jul 2020 22:53:53 +0000 (10:53 +1200)]
Merge pull request #17746 from colemanw/apiExpHaving

APIv4 Explorer: Improve selection of fields for HAVING

4 years agoMerge pull request #17756 from demeritcowboy/unused-gencode-2
Eileen McNaughton [Sun, 5 Jul 2020 22:51:18 +0000 (10:51 +1200)]
Merge pull request #17756 from demeritcowboy/unused-gencode-2

More unused functions in GenCode

4 years agoMerge pull request #17758 from mattwire/wpaclpermsphpnotice
Eileen McNaughton [Sun, 5 Jul 2020 22:47:55 +0000 (10:47 +1200)]
Merge pull request #17758 from mattwire/wpaclpermsphpnotice

Fix PHP notice on wordpress permissions form

4 years agoMerge pull request #17645 from MegaphoneJon/core-1826
Eileen McNaughton [Sun, 5 Jul 2020 22:47:04 +0000 (10:47 +1200)]
Merge pull request #17645 from MegaphoneJon/core-1826

core#1826: Ignore location_type_id when deduping postal address

4 years agoFix PHP notice on wordpress ACL permissions form
Matthew Wire [Sun, 5 Jul 2020 16:38:00 +0000 (17:38 +0100)]
Fix PHP notice on wordpress ACL permissions form

4 years agoMerge pull request #17755 from demeritcowboy/test-activity-tag-search
Seamus Lee [Sun, 5 Jul 2020 08:45:07 +0000 (18:45 +1000)]
Merge pull request #17755 from demeritcowboy/test-activity-tag-search

[Unit Test] dev/core#1173 and dev/core#1827 - Test for activity tag search - PR 17655

4 years agoMerge pull request #17757 from colemanw/karmaTime
Seamus Lee [Sun, 5 Jul 2020 05:02:51 +0000 (15:02 +1000)]
Merge pull request #17757 from colemanw/karmaTime

Convert CRM.utils.formatDate tests to karma

4 years agoConvert CRM.utils.formatDate tests to karma
Coleman Watts [Sun, 5 Jul 2020 03:29:57 +0000 (23:29 -0400)]
Convert CRM.utils.formatDate tests to karma

4 years agoMerge pull request #17655 from samuelsov/lab1827
Eileen McNaughton [Sun, 5 Jul 2020 03:11:09 +0000 (15:11 +1200)]
Merge pull request #17655 from samuelsov/lab1827

dev/core#1827 activity search - fixing search by tags

4 years agounused functions
demeritcowboy [Sun, 5 Jul 2020 02:55:57 +0000 (22:55 -0400)]
unused functions

4 years agotest for activity tag search
demeritcowboy [Sun, 5 Jul 2020 02:43:39 +0000 (22:43 -0400)]
test for activity tag search

4 years agoMerge pull request #17753 from demeritcowboy/unused-gencode
Eileen McNaughton [Sun, 5 Jul 2020 02:33:30 +0000 (14:33 +1200)]
Merge pull request #17753 from demeritcowboy/unused-gencode

Unused functions in GenCode

4 years agoMerge pull request #17751 from civicrm/5.28
Eileen McNaughton [Sun, 5 Jul 2020 02:18:48 +0000 (14:18 +1200)]
Merge pull request #17751 from civicrm/5.28

5.28

4 years agoMerge pull request #17684 from colemanw/time
colemanw [Sun, 5 Jul 2020 01:54:44 +0000 (21:54 -0400)]
Merge pull request #17684 from colemanw/time

Teach CRM.utils.formatDate to also show time

4 years agoTeach CRM.utils.formatDate to also show time
Coleman Watts [Wed, 24 Jun 2020 00:05:56 +0000 (20:05 -0400)]
Teach CRM.utils.formatDate to also show time

4 years agoremove resource url check
demeritcowboy [Sat, 4 Jul 2020 23:59:57 +0000 (19:59 -0400)]
remove resource url check

4 years agounused functions
demeritcowboy [Sat, 4 Jul 2020 23:52:14 +0000 (19:52 -0400)]
unused functions

4 years agoMerge pull request #17748 from demeritcowboy/double-vision
colemanw [Sat, 4 Jul 2020 19:45:47 +0000 (15:45 -0400)]
Merge pull request #17748 from demeritcowboy/double-vision

Pre-upgrade message for php-intl shows twice

4 years agoImprove efficiency of findFiles
Rich Lott / Artful Robot [Sat, 4 Jul 2020 07:10:30 +0000 (08:10 +0100)]
Improve efficiency of findFiles

4 years agoonly show message once
demeritcowboy [Fri, 3 Jul 2020 23:27:57 +0000 (19:27 -0400)]
only show message once

4 years agoMerge pull request #17747 from mlutfy/fixReportGroupbyTpl
Seamus Lee [Fri, 3 Jul 2020 22:25:16 +0000 (08:25 +1000)]
Merge pull request #17747 from mlutfy/fixReportGroupbyTpl

Fix typo in templates/CRM/Report/Form/Tabs/GroupBy.tpl

4 years agotest for ignoring location_type_id on import
Jon Goldberg [Fri, 3 Jul 2020 22:02:43 +0000 (18:02 -0400)]
test for ignoring location_type_id on import

4 years agoIgnore location_type_id for dedupe on import also
Jon Goldberg [Fri, 3 Jul 2020 21:56:54 +0000 (17:56 -0400)]
Ignore location_type_id for dedupe on import also

4 years agoFix typo in templates/CRM/Report/Form/Tabs/GroupBy.tpl
Mathieu Lutfy [Fri, 3 Jul 2020 18:28:04 +0000 (14:28 -0400)]
Fix typo in templates/CRM/Report/Form/Tabs/GroupBy.tpl

4 years agoAPIv4 Explorer: Improve selection of fields for HAVING
Coleman Watts [Fri, 3 Jul 2020 18:12:08 +0000 (14:12 -0400)]
APIv4 Explorer: Improve selection of fields for HAVING

4 years agoMerge pull request #17741 from eileenmcnaughton/eventcart
Seamus Lee [Fri, 3 Jul 2020 06:01:43 +0000 (16:01 +1000)]
Merge pull request #17741 from eileenmcnaughton/eventcart

Add eventcart shell

4 years agoSet version to 5.29.alpha1
CiviCRM [Fri, 3 Jul 2020 05:55:14 +0000 (05:55 +0000)]
Set version to 5.29.alpha1

4 years agoSet version to 5.28.beta1
CiviCRM [Fri, 3 Jul 2020 05:22:47 +0000 (05:22 +0000)]
Set version to 5.28.beta1

4 years agoMerge pull request #17733 from eileenmcnaughton/pvv
Eileen McNaughton [Fri, 3 Jul 2020 04:04:08 +0000 (16:04 +1200)]
Merge pull request #17733 from eileenmcnaughton/pvv

Set locales for all domains when enabling multilingual

4 years agoMerge pull request #17721 from colemanw/isDeletedPerm
Eileen McNaughton [Fri, 3 Jul 2020 02:48:03 +0000 (14:48 +1200)]
Merge pull request #17721 from colemanw/isDeletedPerm

Add permission metadata to contact is_deleted field

4 years agoAdd eventcart shell
eileen [Thu, 2 Jul 2020 22:14:54 +0000 (10:14 +1200)]
Add eventcart shell

4 years agoMerge pull request #17738 from colemanw/upgradeLocales
Tim Otten [Fri, 3 Jul 2020 02:01:34 +0000 (19:01 -0700)]
Merge pull request #17738 from colemanw/upgradeLocales

dev/core#1852 Ensure all domains have the same value for locales

4 years agoEnsure that we are testing on multiple domains
Seamus Lee [Fri, 3 Jul 2020 01:57:58 +0000 (11:57 +1000)]
Ensure that we are testing on multiple domains

Co-authored-by: colemanw <coleman@civicrm.org>
4 years agoMerge pull request #17739 from colemanw/byeByeWiki
Seamus Lee [Thu, 2 Jul 2020 21:58:55 +0000 (07:58 +1000)]
Merge pull request #17739 from colemanw/byeByeWiki

[NFC] Fix some outdated wiki links

4 years agoFix some outdated wiki links
Coleman Watts [Thu, 2 Jul 2020 20:42:07 +0000 (16:42 -0400)]
Fix some outdated wiki links

4 years agoAdd permission metadata to contact is_deleted field
Coleman Watts [Wed, 1 Jul 2020 02:16:49 +0000 (22:16 -0400)]
Add permission metadata to contact is_deleted field

4 years agoMerge pull request #17737 from christianwach/lab-core-1851
colemanw [Thu, 2 Jul 2020 17:20:49 +0000 (13:20 -0400)]
Merge pull request #17737 from christianwach/lab-core-1851

Fix saving of State/Province Multi-select values

4 years agoEnsure all domains have the same value for locales
Coleman Watts [Thu, 2 Jul 2020 17:09:20 +0000 (13:09 -0400)]
Ensure all domains have the same value for locales

4 years agoFix saving of State/Province Multi-select values
Christian Wach [Thu, 2 Jul 2020 14:39:24 +0000 (15:39 +0100)]
Fix saving of State/Province Multi-select values

4 years agoMerge pull request #17736 from civicrm/5.27
Seamus Lee [Thu, 2 Jul 2020 04:02:24 +0000 (14:02 +1000)]
Merge pull request #17736 from civicrm/5.27

5.27

4 years agoMerge pull request #17731 from agh1/5.27.0-releasenotes-final
Seamus Lee [Thu, 2 Jul 2020 03:14:57 +0000 (13:14 +1000)]
Merge pull request #17731 from agh1/5.27.0-releasenotes-final

5.27.0 release notes: final edits

4 years agoMerge pull request #17735 from totten/master-field-ver
Eileen McNaughton [Thu, 2 Jul 2020 02:52:32 +0000 (14:52 +1200)]
Merge pull request #17735 from totten/master-field-ver

API/DAO Metadata - Retain versioning metadata for possible usage in runtime+tooling

4 years agoUpdate 5.27.0.md
Tim Otten [Thu, 2 Jul 2020 02:17:21 +0000 (19:17 -0700)]
Update 5.27.0.md

4 years agoUpdate 5.27.0.md
Tim Otten [Thu, 2 Jul 2020 02:02:36 +0000 (19:02 -0700)]
Update 5.27.0.md

4 years agoSet locales for all domains when enabling multilingual
eileen [Thu, 2 Jul 2020 00:36:13 +0000 (12:36 +1200)]
Set locales for all domains when enabling multilingual

In the process of trying to test a possible wordpress regression I found that enabling
mutlilingual on a domain other than domain 1 breaks the site. The reason is that without
only domain 1 is being updated with the new language and locales. Since I'm on domain
2 when I do this I can no longer load any page as the locales value has not been set
and the queries look for option_value.label not option_value.label_us.

Since 'no locale' is no longer valid the locale needs to be set on all sites. Note the
code change is primarily an extraction inn order to only run the table update part once

4 years agoMerge pull request #17732 from civicrm/5.27
Seamus Lee [Thu, 2 Jul 2020 01:50:20 +0000 (11:50 +1000)]
Merge pull request #17732 from civicrm/5.27

5.27

4 years agoMerge pull request #17722 from eileenmcnaughton/up
Seamus Lee [Thu, 2 Jul 2020 01:36:48 +0000 (11:36 +1000)]
Merge pull request #17722 from eileenmcnaughton/up

dev/core#1846 Regression (sorta) Hacks to avoid failure on upgrade due to new field not yet being in the DB

4 years agoAPI/DAO Metadata - Retain versioning metadata for possible usage in runtime+tooling
Coleman Watts [Wed, 1 Jul 2020 15:12:23 +0000 (11:12 -0400)]
API/DAO Metadata - Retain versioning metadata for possible usage in runtime+tooling

4 years ago[NFC] Update Domain version number in tests to be at test v5.27.alpha1
Seamus Lee [Thu, 2 Jul 2020 00:17:50 +0000 (10:17 +1000)]
[NFC] Update Domain version number in tests to be at test v5.27.alpha1

4 years agoMerge pull request #17725 from eileenmcnaughton/pvv
Seamus Lee [Wed, 1 Jul 2020 23:53:50 +0000 (09:53 +1000)]
Merge pull request #17725 from eileenmcnaughton/pvv

Ensure pricefield value label column is not null on upgrade

4 years agoEnsure that the unexpected version check doesn't show if the version matches
Seamus Lee [Wed, 1 Jul 2020 23:10:41 +0000 (09:10 +1000)]
Ensure that the unexpected version check doesn't show if the version matches

4 years agoFix logical errors and fix ENV file as well
Seamus Lee [Wed, 1 Jul 2020 22:51:28 +0000 (08:51 +1000)]
Fix logical errors and fix ENV file as well

4 years agoMerge pull request #17669 from seamuslee001/flexmailer_core
Eileen McNaughton [Wed, 1 Jul 2020 22:42:55 +0000 (10:42 +1200)]
Merge pull request #17669 from seamuslee001/flexmailer_core

[REF] Ship Flexmailer extension with Core

4 years agoMerge pull request #17730 from agh1/moneyformatcheckgrammar
Seamus Lee [Wed, 1 Jul 2020 22:39:22 +0000 (08:39 +1000)]
Merge pull request #17730 from agh1/moneyformatcheckgrammar

dev/core#1494 System check for moneyvalueformat: grammar & clarity

4 years agoMerge pull request #17727 from MegaphoneJon/fix-lcd
Seamus Lee [Wed, 1 Jul 2020 22:21:32 +0000 (08:21 +1000)]
Merge pull request #17727 from MegaphoneJon/fix-lcd

[NFC] Fix contributor key for Lighthouse Consulting and Design

4 years agoMerge pull request #17728 from agh1/php-intl-upgrade-message
Seamus Lee [Wed, 1 Jul 2020 22:21:06 +0000 (08:21 +1000)]
Merge pull request #17728 from agh1/php-intl-upgrade-message

dev/translation#48: fix up system check grammar and add pre-upgrade message.

4 years agoEnsure pricefield value label column is not null on upgrade
eileen [Wed, 1 Jul 2020 13:13:52 +0000 (01:13 +1200)]
Ensure pricefield value label column is not null on upgrade

On testing locally I found I did have a null value in a field & this fatalled if I enabled
multilingual

4 years ago5.27.0 release notes: further edits
Andrew Hunt [Wed, 1 Jul 2020 22:05:02 +0000 (18:05 -0400)]
5.27.0 release notes: further edits

4 years agodev/core#1494 System check for moneyvalueformat: grammar & clarity
Andrew Hunt [Wed, 1 Jul 2020 21:23:26 +0000 (17:23 -0400)]
dev/core#1494 System check for moneyvalueformat: grammar & clarity

4 years agoMerge pull request #17726 from colemanw/noWiki
colemanw [Wed, 1 Jul 2020 17:14:06 +0000 (13:14 -0400)]
Merge pull request #17726 from colemanw/noWiki

Remove obsolete function formatWikiURL

4 years agoPHP-Intl: fix up system check grammar and add pre-upgrade message.
Andrew Hunt [Wed, 1 Jul 2020 15:59:28 +0000 (11:59 -0400)]
PHP-Intl: fix up system check grammar and add pre-upgrade message.

4 years agoFix contributor key for Lighthouse Consulting and Design
Jon Goldberg [Wed, 1 Jul 2020 14:54:51 +0000 (10:54 -0400)]
Fix contributor key for Lighthouse Consulting and Design

4 years agoFix version check for custom field serialize col
Coleman Watts [Wed, 1 Jul 2020 14:31:29 +0000 (10:31 -0400)]
Fix version check for custom field serialize col

4 years agoMark unused functions as deprecated and update doc link
Coleman Watts [Wed, 1 Jul 2020 14:07:06 +0000 (10:07 -0400)]
Mark unused functions as deprecated and update doc link

4 years agoRemove obsolete function formatWikiURL
Coleman Watts [Wed, 1 Jul 2020 13:33:57 +0000 (09:33 -0400)]
Remove obsolete function formatWikiURL

4 years ago[REF] Ship Flexmailer extension with Core
Seamus Lee [Sat, 20 Jun 2020 08:06:25 +0000 (18:06 +1000)]
[REF] Ship Flexmailer extension with Core

4 years agoHacks to avoid failure on upgrade due to new field not yet being in the DB
eileen [Wed, 1 Jul 2020 05:31:36 +0000 (17:31 +1200)]
Hacks to avoid failure on upgrade due to new field not yet being in the DB

On attempting to upgrade I found I couldn't get to the upgrade screen add the new serialize field as
I got fatal errors in these 2 places (maybe more to come).

The new field is civicrm_custom_field.serialize

4 years agoMerge pull request #17701 from demeritcowboy/name-label-accountrelationship
Eileen McNaughton [Wed, 1 Jul 2020 04:40:53 +0000 (16:40 +1200)]
Merge pull request #17701 from demeritcowboy/name-label-accountrelationship

dev/wordpress#61 - Financial Account by Relationship lookup is incorrectly using label not name

4 years agoMerge pull request #17602 from mattwire/supportsrecurring
Eileen McNaughton [Wed, 1 Jul 2020 04:00:52 +0000 (16:00 +1200)]
Merge pull request #17602 from mattwire/supportsrecurring

REF Access the method not the property directly to check if a payment processor supports recurring

4 years agoMerge pull request #17719 from civicrm/5.27
Seamus Lee [Wed, 1 Jul 2020 01:26:16 +0000 (11:26 +1000)]
Merge pull request #17719 from civicrm/5.27

5.27

4 years agoMerge pull request #17720 from alifrumin/5.27.0-releasenotes
Seamus Lee [Tue, 30 Jun 2020 22:38:03 +0000 (08:38 +1000)]
Merge pull request #17720 from alifrumin/5.27.0-releasenotes

[NFC] 5.27 release notes - first pass

4 years ago5.27 release notes first pass
Alice Frumin [Tue, 30 Jun 2020 17:51:31 +0000 (13:51 -0400)]
5.27 release notes first pass

4 years agoMerge pull request #17718 from agh1/5.27.0-releasenotes
Seamus Lee [Tue, 30 Jun 2020 21:31:56 +0000 (07:31 +1000)]
Merge pull request #17718 from agh1/5.27.0-releasenotes

5.27.0 release notes - initial run

4 years agoMerge pull request #17716 from mattwire/setnamesutf8mb4
Seamus Lee [Tue, 30 Jun 2020 20:49:02 +0000 (06:49 +1000)]
Merge pull request #17716 from mattwire/setnamesutf8mb4

Connect to database using SET NAMES utf8mb4

4 years agoMerge pull request #17717 from colemanw/jsComments
Seamus Lee [Tue, 30 Jun 2020 20:45:02 +0000 (06:45 +1000)]
Merge pull request #17717 from colemanw/jsComments

Fix CRM_Utils_JS::dedupeClosures to ignore comments

4 years agodev/core#1827 activity search - fixing search by tags - simple and tag set
Samuel Vanhove [Tue, 30 Jun 2020 20:15:54 +0000 (16:15 -0400)]
dev/core#1827 activity search - fixing search by tags - simple and tag set

4 years ago5.27.0 release notes: added boilerplate
Andrew Hunt [Tue, 30 Jun 2020 15:47:05 +0000 (11:47 -0400)]
5.27.0 release notes: added boilerplate

4 years ago5.27.0 release notes: raw from script
Andrew Hunt [Tue, 30 Jun 2020 15:44:23 +0000 (11:44 -0400)]
5.27.0 release notes: raw from script

4 years agoFix CRM_Utils_JS::dedupeClosures to ignore comments
Coleman Watts [Tue, 30 Jun 2020 15:40:26 +0000 (11:40 -0400)]
Fix CRM_Utils_JS::dedupeClosures to ignore comments

This runs stripComments BEFORE dedupeClosures so that comments don't interfere with the deduping.
Also fixes stripComments to remove the line break as well as the comment line.

4 years agoSET NAMES utf8mb4
Matthew Wire [Tue, 30 Jun 2020 13:18:00 +0000 (14:18 +0100)]
SET NAMES utf8mb4

4 years agoMerge pull request #17714 from colemanw/jsDocblocks
Seamus Lee [Tue, 30 Jun 2020 01:41:19 +0000 (11:41 +1000)]
Merge pull request #17714 from colemanw/jsDocblocks

NFC cleanup docblocks in CRM_Utils_JS

4 years agoMerge pull request #17715 from civicrm/5.27
Seamus Lee [Tue, 30 Jun 2020 01:28:03 +0000 (11:28 +1000)]
Merge pull request #17715 from civicrm/5.27

5.27

4 years agoMerge pull request #17713 from MegaphoneJon/multi-record-import-fix-527
colemanw [Tue, 30 Jun 2020 00:46:42 +0000 (20:46 -0400)]
Merge pull request #17713 from MegaphoneJon/multi-record-import-fix-527

Multi record import screen fix

4 years agoNFC cleanup docblocks in CRM_Utils_JS
Coleman Watts [Tue, 30 Jun 2020 00:22:58 +0000 (20:22 -0400)]
NFC cleanup docblocks in CRM_Utils_JS