civicrm-core.git
4 years agoEnsure Dashboard respects multiple Domains
Christian Wach [Thu, 22 Aug 2019 12:08:19 +0000 (13:08 +0100)]
Ensure Dashboard respects multiple Domains

4 years agoMerge pull request #15064 from seamuslee001/fee_amount_id_search_fix
Eileen McNaughton [Thu, 22 Aug 2019 09:03:17 +0000 (21:03 +1200)]
Merge pull request #15064 from seamuslee001/fee_amount_id_search_fix

CRM-17182 Fix Search on fee_level_id and ensure that participant.fee_amount isn't updated when label changes

4 years agoAdd in unit test of searching when price field value label has changed
Seamus Lee [Sun, 18 Aug 2019 03:17:09 +0000 (13:17 +1000)]
Add in unit test of searching when price field value label has changed

4 years agoResolve CRM-17182 by filtering on civicrm_line_item.price_field_value_id instead...
Seamus Lee [Sun, 18 Aug 2019 02:11:09 +0000 (12:11 +1000)]
Resolve CRM-17182 by filtering on civicrm_line_item.price_field_value_id instead of th fee_amount column

Pass id in the params array rather than in the ids array

4 years agoAdd in unit test demonstrating that fee label changes when the price field value...
Seamus Lee [Sat, 17 Aug 2019 22:56:18 +0000 (08:56 +1000)]
Add in unit test demonstrating that fee label changes when the price field value label changes

4 years agoMerge pull request #15095 from eileenmcnaughton/export_metadata
Seamus Lee [Thu, 22 Aug 2019 05:37:18 +0000 (15:37 +1000)]
Merge pull request #15095 from eileenmcnaughton/export_metadata

[Test] [NFC] upgrade remaining export tests

4 years agoMerge pull request #15098 from civicrm/5.17
Eileen McNaughton [Thu, 22 Aug 2019 05:18:19 +0000 (17:18 +1200)]
Merge pull request #15098 from civicrm/5.17

5.17

4 years agoMerge pull request #15089 from totten/5.17-install-msg
Eileen McNaughton [Thu, 22 Aug 2019 05:15:55 +0000 (17:15 +1200)]
Merge pull request #15089 from totten/5.17-install-msg

(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x

4 years agoMerge pull request #15061 from eileenmcnaughton/agile
Seamus Lee [Thu, 22 Aug 2019 01:07:53 +0000 (11:07 +1000)]
Merge pull request #15061 from eileenmcnaughton/agile

Fix readability & caching on CRM_Contact_BAO_Relationship::isInheritedMembershipInvalidated

4 years agoMerge pull request #15068 from eileenmcnaughton/mapping_test
colemanw [Thu, 22 Aug 2019 00:40:58 +0000 (20:40 -0400)]
Merge pull request #15068 from eileenmcnaughton/mapping_test

[REF] minor code refactor on import - Pass ProcessorObject into loadSavedMapping & use it to load the formName

4 years agoPass ProcessorObject into loadSavedMapping & use it to load the formName
eileen [Sun, 18 Aug 2019 08:08:24 +0000 (20:08 +1200)]
Pass ProcessorObject into loadSavedMapping & use it to load the formName

After a few more steps we can eliminate most of this function & use the processor but this is jusut a very small
change....

4 years agoMerge pull request #15072 from eileenmcnaughton/test_ext2
Seamus Lee [Wed, 21 Aug 2019 22:24:43 +0000 (08:24 +1000)]
Merge pull request #15072 from eileenmcnaughton/test_ext2

[NFC] Add ImportProcessor class & unit tests + extend existing cover

4 years ago[Test] [NFC] upgrade remamining export tests
eileen [Wed, 21 Aug 2019 19:43:23 +0000 (07:43 +1200)]
[Test] [NFC] upgrade remamining export tests

Fully switch to checking csv output with new helper - this allows us to remove the hack from the core fn

4 years agoMerge pull request #15093 from mattwire/contributionpage_typo
Eileen McNaughton [Wed, 21 Aug 2019 19:52:38 +0000 (07:52 +1200)]
Merge pull request #15093 from mattwire/contributionpage_typo

Fix wrong variable in check for profiles on contributionpage

4 years agoMerge pull request #15002 from demeritcowboy/activity-type-assignment-1116
Eileen McNaughton [Wed, 21 Aug 2019 18:19:14 +0000 (06:19 +1200)]
Merge pull request #15002 from demeritcowboy/activity-type-assignment-1116

dev/core#1116 - refactor/rename activityTypeName

4 years agocomposer.lock - Run: "composer update php"
Tim Otten [Wed, 21 Aug 2019 18:14:03 +0000 (11:14 -0700)]
composer.lock - Run: "composer update php"

4 years agoMerge pull request #14989 from eileenmcnaughton/import_sc
Eileen McNaughton [Wed, 21 Aug 2019 17:54:54 +0000 (05:54 +1200)]
Merge pull request #14989 from eileenmcnaughton/import_sc

 dev/core#1001 Fix count notice warnings in php 7.2 [Import]

4 years agoMerge pull request #15092 from christianwach/lab-1196
colemanw [Wed, 21 Aug 2019 16:17:49 +0000 (12:17 -0400)]
Merge pull request #15092 from christianwach/lab-1196

Fix recursion in crmInArray()

4 years agoFix recursion in crmInArray()
Christian Wach [Wed, 21 Aug 2019 14:35:09 +0000 (15:35 +0100)]
Fix recursion in crmInArray()

4 years agoMerge pull request #15091 from JKingsnorth/rm-unused-maxlocations
Eileen McNaughton [Wed, 21 Aug 2019 10:52:19 +0000 (22:52 +1200)]
Merge pull request #15091 from JKingsnorth/rm-unused-maxlocations

Remove unused method CRM_Contact_BAO_Contact_Utils::maxLocations

4 years agoRemove unused method CRM_Contact_BAO_Contact_Utils::maxLocations
JKingsnorth [Wed, 21 Aug 2019 08:14:31 +0000 (09:14 +0100)]
Remove unused method CRM_Contact_BAO_Contact_Utils::maxLocations

4 years agoMerge pull request #15069 from demeritcowboy/1-2-tolerance
Seamus Lee [Wed, 21 Aug 2019 08:05:13 +0000 (18:05 +1000)]
Merge pull request #15069 from demeritcowboy/1-2-tolerance

[Test] Tolerance parameter in attachmenttest needs to be one higher for integers

4 years ago(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x
Tim Otten [Wed, 21 Aug 2019 02:48:41 +0000 (19:48 -0700)]
(dev/drupal#79) Fail more gracefully when attempting to install on PHP 5.x

Before
------

If an admin stracts the code and navigates to `/sites/all/modules/civicrm/install/index.php`, it displays
a syntax error.

After
-----

If an admin stracts the code and navigates to `/sites/all/modules/civicrm/install/index.php`, it displays
the message:

> __PHP Version Requirement__
> CiviCRM requires PHP 7.0+. The web server is running PHP 5.6.38.

Comments
--------

This is similar to https://github.com/civicrm/civicrm-drupal/pull/583

The canonical representation of the minimum PHP version is in
`$civicrm_root/CRM/Upgrade/Form.php`.  However, setting up the classloader
triggers a syntax error, so we need to read this without having access to
the classloader.

The approach herein has a few effects:

* The minimum PHP can be read from a JSON file.
* That JSON file is also used by `composer`, so you'll also get better errors when downloading that way.
* At some unknown point, the minimum will probably bump up again (7.1 or 7.2 or whatever). When that
  happens, the unit-test will ensure we keep `CRM/Upgrade/Form.php` and `composer.json` in sync.

Note: I was little concerned that the `composer.json` file might not be
available when normal installers run, so I checked the published tarballs
for D7, BD, WP, and J - in all cases, the `composer.json` looks to be
included at the expected location.

4 years agoMerge pull request #15088 from civicrm/5.17
Eileen McNaughton [Tue, 20 Aug 2019 19:55:04 +0000 (07:55 +1200)]
Merge pull request #15088 from civicrm/5.17

5.17 to master

4 years agoMerge pull request #15087 from agh1/5.17.0-releasenotes
Eileen McNaughton [Tue, 20 Aug 2019 19:52:41 +0000 (07:52 +1200)]
Merge pull request #15087 from agh1/5.17.0-releasenotes

5.17.0 release notes - initial run

4 years agoMerge pull request #15085 from seamuslee001/update_examples
Eileen McNaughton [Tue, 20 Aug 2019 19:52:20 +0000 (07:52 +1200)]
Merge pull request #15085 from seamuslee001/update_examples

[NFC] Update Examples

4 years ago5.17.0 release notes: added boilerplate
Andrew Hunt [Tue, 20 Aug 2019 16:39:44 +0000 (12:39 -0400)]
5.17.0 release notes: added boilerplate

4 years ago5.17.0 release notes: raw from script
Andrew Hunt [Tue, 20 Aug 2019 16:36:31 +0000 (12:36 -0400)]
5.17.0 release notes: raw from script

4 years agoMerge pull request #14916 from eileenmcnaughton/export_mem
Eileen McNaughton [Tue, 20 Aug 2019 12:47:50 +0000 (00:47 +1200)]
Merge pull request #14916 from eileenmcnaughton/export_mem

Fix metadata on member export

4 years ago[NFC] Update Examples
Seamus Lee [Tue, 20 Aug 2019 10:10:16 +0000 (20:10 +1000)]
[NFC] Update Examples

4 years agoFix wrong variable in check for profiles
Matthew Wire (MJW Consulting) [Tue, 20 Aug 2019 08:55:45 +0000 (09:55 +0100)]
Fix wrong variable in check for profiles

4 years agoMerge pull request #15078 from mlutfy/remove-old-scripts
Eileen McNaughton [Tue, 20 Aug 2019 04:50:39 +0000 (16:50 +1200)]
Merge pull request #15078 from mlutfy/remove-old-scripts

Remove a few unused scripts from tools/bin/scripts

4 years agoMerge pull request #15070 from eileenmcnaughton/deprecation
Eileen McNaughton [Tue, 20 Aug 2019 04:49:20 +0000 (16:49 +1200)]
Merge pull request #15070 from eileenmcnaughton/deprecation

Remove deprecated unused function.

4 years agoMerge pull request #15083 from civicrm/5.17
Seamus Lee [Tue, 20 Aug 2019 04:37:50 +0000 (14:37 +1000)]
Merge pull request #15083 from civicrm/5.17

5.17

4 years agoMerge pull request #15082 from totten/5.17-php-min
Seamus Lee [Tue, 20 Aug 2019 03:29:56 +0000 (13:29 +1000)]
Merge pull request #15082 from totten/5.17-php-min

(dev/drupal#79) CRM_Upgrade_Form - Raise MINIMUM_PHP_VERSION from 5.6 to 7.0

4 years agoMerge pull request #15051 from agileware/CIVICRM-1290
Seamus Lee [Tue, 20 Aug 2019 03:22:43 +0000 (13:22 +1000)]
Merge pull request #15051 from agileware/CIVICRM-1290

Remove "Copy Case custom data" code (circa 2013)

4 years agoCIVICRM-1290 CIVICRM-967 Add unit test: Migrate custom file attachments to new case...
Justin Freeman [Fri, 16 Aug 2019 21:24:26 +0000 (07:24 +1000)]
CIVICRM-1290 CIVICRM-967 Add unit test: Migrate custom file attachments to new case on reassignment
Add unit test from PR #14213 Migrate custom file attachments to new case on reassignment. https://github.com/civicrm/civicrm-core/pull/14213

4 years agoCIVICRM-1290 Remove "Copy Case custom data" code
Justin Freeman [Fri, 16 Aug 2019 07:20:50 +0000 (17:20 +1000)]
CIVICRM-1290 Remove "Copy Case custom data" code

Remove "Copy Case custom data" code. Fixes https://lab.civicrm.org/dev/core/issues/1183

4 years ago(dev/drupal#79) CRM_Upgrade_Form - Raise MINIMUM_PHP_VERSION from 5.6 to 7.0
Tim Otten [Tue, 20 Aug 2019 00:29:32 +0000 (17:29 -0700)]
(dev/drupal#79) CRM_Upgrade_Form - Raise MINIMUM_PHP_VERSION from 5.6 to 7.0

This version requirement officially went up to PHP 7.0 circa Civi 5.14.
However, at that time, the upgrade metadata was kept at PHP 5.6 to allow somewhat
softer landing for stragglers. That's no longer possible in 5.16+, so this
just updates the requirement.

Before
------

When upgrading via drush to Civi 5.16+ on PHP 5.6, the Civi class-loader fails to initialize.

```
Parse error: syntax error, unexpected ':', expecting '{' in /Users/totten/bknix/build/dmaster/web/sites/all/modules/civicrm/vendor/league/csv/src/functions.php on line 33
```

(Approximate call-path: `civicrm.drush.inc` => `civicrm.settings.php` =>
`CRM_Core_ClassLoader` => `vendor/autoload.php` => `vendor/league/csv/src/functions.php`)

After
-----

It still fails, but at least the metadata is accurate.

There will be a separate patch in another repo to make `drush` use this
metadata and present a better error.

4 years agoMerge pull request #15079 from demeritcowboy/enotice-add-multi-activity
Seamus Lee [Mon, 19 Aug 2019 22:47:52 +0000 (08:47 +1000)]
Merge pull request #15079 from demeritcowboy/enotice-add-multi-activity

dev/core#1192 - E_NOTICE on using Add Activity action on contact search results

4 years agoMerge pull request #15052 from 19ATF77/manageGroupFixes
Seamus Lee [Mon, 19 Aug 2019 21:55:01 +0000 (07:55 +1000)]
Merge pull request #15052 from 19ATF77/manageGroupFixes

Manage Group search message fix

4 years agoAdd ImportProcessor class & unit tests + extend existing cover
eileen [Mon, 19 Aug 2019 01:01:47 +0000 (13:01 +1200)]
Add ImportProcessor class & unit tests + extend existing cover

This adds the full ImportProcessor class from the WIP pr #15034 - minus the functions that
replace loadSavedMapping) along with tests. It does NOT start to use the new class as yet.

Note that #15068 will need rebasing if this is merged first & vice versa

The goal is to bring it into use along with extending tests but this is 'safe' in that no funcitonal code is changed

4 years agoMerge pull request #15076 from sushantpaste/priceset-hook
Eileen McNaughton [Mon, 19 Aug 2019 20:21:47 +0000 (08:21 +1200)]
Merge pull request #15076 from sushantpaste/priceset-hook

dev/core#870 priceset hook

4 years agoMerge pull request #15077 from mlutfy/api-docs-urls
Eileen McNaughton [Mon, 19 Aug 2019 20:20:27 +0000 (08:20 +1200)]
Merge pull request #15077 from mlutfy/api-docs-urls

[NFC] Update the APIv3 documentation links.

4 years agoMerge pull request #15075 from JMAConsulting/core-14172
Eileen McNaughton [Mon, 19 Aug 2019 20:18:50 +0000 (08:18 +1200)]
Merge pull request #15075 from JMAConsulting/core-14172

Fixes for taking dynamic form name in grant search

4 years agofix enotice
DemeritCowboy [Mon, 19 Aug 2019 18:57:47 +0000 (14:57 -0400)]
fix enotice

4 years agoRemove a few unused scripts from tools/bin/scripts
Mathieu Lutfy [Mon, 19 Aug 2019 18:51:00 +0000 (14:51 -0400)]
Remove a few unused scripts from tools/bin/scripts

4 years agoUpdate the APIv3 documentation links.
Mathieu Lutfy [Mon, 19 Aug 2019 18:39:37 +0000 (14:39 -0400)]
Update the APIv3 documentation links.

4 years agoMerge pull request #15074 from sushantpaste/report-hook
Yashodha Chaku [Mon, 19 Aug 2019 14:05:21 +0000 (19:35 +0530)]
Merge pull request #15074 from sushantpaste/report-hook

dev/core#1077 Fixes making report listing actions links hookable

4 years agoChanged to standardize message
Micah [Fri, 16 Aug 2019 11:54:56 +0000 (12:54 +0100)]
Changed to standardize message

4 years agoMerge pull request #14673 from eileenmcnaughton/payment_create
Eileen McNaughton [Mon, 19 Aug 2019 12:02:10 +0000 (00:02 +1200)]
Merge pull request #14673 from eileenmcnaughton/payment_create

Further work on payment.create consolidation - always handle financials from payment.create

4 years agodev/core#870 priceset hook
sushantpaste [Mon, 19 Aug 2019 11:55:21 +0000 (17:25 +0530)]
dev/core#870 priceset hook

4 years agoFixes for taking dynamic form name in grant search
sushantpaste [Mon, 19 Aug 2019 10:55:41 +0000 (16:25 +0530)]
Fixes for taking dynamic form name in grant search

4 years agodev/core#1077 Fixes making report listing actions links hookable
sushantpaste [Mon, 19 Aug 2019 10:58:21 +0000 (16:28 +0530)]
dev/core#1077 Fixes making report listing actions links hookable

4 years agoMerge pull request #15071 from totten/master-gat
Eileen McNaughton [Mon, 19 Aug 2019 02:55:43 +0000 (14:55 +1200)]
Merge pull request #15071 from totten/master-gat

(NFC) GenericAssertionsTrait - Improve docblocks

4 years ago(NFC) GenericAssertionsTrait - Improve docblocks
Tim Otten [Mon, 19 Aug 2019 00:21:47 +0000 (17:21 -0700)]
(NFC) GenericAssertionsTrait - Improve docblocks

This code was previously extracted from CiviUnitTestCase. It had weak docblocks. Make them better.

Changes:

* Add more types and examples.
* Describe some of the subtleties in the different forms of array-comparison.
* Remove dependency on `ts()`.  Unit-test assertions are not actually translated.

4 years agoRemove deprecated function.
eileen [Sun, 18 Aug 2019 22:29:22 +0000 (10:29 +1200)]
Remove deprecated function.

I noticed this has been deprecated for over a year (& is unused). Removing

4 years agoFix readability & caching on CRM_Contact_BAO_Relationship::isInheritedMembershipInval...
eileen [Sat, 17 Aug 2019 21:39:19 +0000 (09:39 +1200)]
Fix readability & caching on CRM_Contact_BAO_Relationship::isInheritedMembershipInvalidated

This removes an sql query & some hard wrangling & uses the api - wrapped in a caching helper.

4 years agopull out activitytype block
DemeritCowboy [Sun, 18 Aug 2019 14:25:03 +0000 (10:25 -0400)]
pull out activitytype block

4 years agomore tolerance
DemeritCowboy [Sun, 18 Aug 2019 13:18:33 +0000 (09:18 -0400)]
more tolerance

4 years agoMerge pull request #15050 from eileenmcnaughton/loadmappingtest
Seamus Lee [Sun, 18 Aug 2019 07:31:39 +0000 (17:31 +1000)]
Merge pull request #15050 from eileenmcnaughton/loadmappingtest

[Import] [Test] Initial test on loadSavedMapping function.

4 years agoMerge pull request #15066 from seamuslee001/attachment_api_stablize
Seamus Lee [Sun, 18 Aug 2019 07:31:18 +0000 (17:31 +1000)]
Merge pull request #15066 from seamuslee001/attachment_api_stablize

Stabalize Attachment API Test

4 years agoMerge pull request #15067 from seamuslee001/fix_test_syntax
Seamus Lee [Sun, 18 Aug 2019 06:02:45 +0000 (16:02 +1000)]
Merge pull request #15067 from seamuslee001/fix_test_syntax

[NFC] Fix test syntax

4 years agoInitial test on loadSavedMapping function.
eileen [Thu, 15 Aug 2019 23:34:55 +0000 (11:34 +1200)]
Initial test on loadSavedMapping function.

To facilitate this I
1) made it public - in the end it will go anyway
2) removed a 'pass-through' variable from the return array - it is passed in & returned unchanged
3) made it cope without a notice when a class property is not defined - that will go too soon

4 years agoMerge pull request #15049 from eileenmcnaughton/loadMapping
Seamus Lee [Sun, 18 Aug 2019 04:44:59 +0000 (14:44 +1000)]
Merge pull request #15049 from eileenmcnaughton/loadMapping

[NFC] swap instances where double = is used but it should be triple =

4 years ago[NFC] Fix test syntax
Seamus Lee [Sun, 18 Aug 2019 04:37:08 +0000 (14:37 +1000)]
[NFC] Fix test syntax

4 years agoStabalize Attachment API Test
Seamus Lee [Sun, 18 Aug 2019 04:18:50 +0000 (14:18 +1000)]
Stabalize Attachment API Test

4 years agoMerge pull request #15065 from civicrm/5.17
Eileen McNaughton [Sun, 18 Aug 2019 04:02:19 +0000 (16:02 +1200)]
Merge pull request #15065 from civicrm/5.17

5.17

4 years agoMerge pull request #15018 from eileenmcnaughton/metadata
Seamus Lee [Sun, 18 Aug 2019 03:36:44 +0000 (13:36 +1000)]
Merge pull request #15018 from eileenmcnaughton/metadata

[Ref] [Import] move metadata calculations to a trait

4 years agoMerge pull request #15048 from eileenmcnaughton/5.17
Seamus Lee [Sun, 18 Aug 2019 03:33:12 +0000 (13:33 +1000)]
Merge pull request #15048 from eileenmcnaughton/5.17

Fix unreleased regression on import

4 years agoMerge pull request #15043 from prondubuisi/fix-civi-api3-exception
Eileen McNaughton [Sat, 17 Aug 2019 20:13:47 +0000 (08:13 +1200)]
Merge pull request #15043 from prondubuisi/fix-civi-api3-exception

dev/core#1188 Fix API v3  error Class or interface CiviCRM_API3_Exception does not exist

4 years agoMerge pull request #15059 from civicrm/5.17
Eileen McNaughton [Sat, 17 Aug 2019 20:11:57 +0000 (08:11 +1200)]
Merge pull request #15059 from civicrm/5.17

5.17

4 years agoMerge pull request #15060 from bsilvern/event-10.1
Eileen McNaughton [Sat, 17 Aug 2019 20:11:16 +0000 (08:11 +1200)]
Merge pull request #15060 from bsilvern/event-10.1

dev/event#10 - Prevent old notes from being exposed in event confirmation email

4 years agodev/event#10 - Prevent old notes exposed in event confirmation email
Bob Silvern [Sat, 17 Aug 2019 18:08:27 +0000 (11:08 -0700)]
dev/event#10 - Prevent old notes exposed in event confirmation email

4 years agoMerge pull request #15058 from seamuslee001/dev_core_1186
Seamus Lee [Sat, 17 Aug 2019 08:10:48 +0000 (18:10 +1000)]
Merge pull request #15058 from seamuslee001/dev_core_1186

dev/core#1186 add in unit test to lock in fix from dmeritcowboy in #1…

4 years agoMerge pull request #15057 from seamuslee001/nfc_upgrade_template_reformat
Seamus Lee [Sat, 17 Aug 2019 05:48:40 +0000 (15:48 +1000)]
Merge pull request #15057 from seamuslee001/nfc_upgrade_template_reformat

[NFC] Update Upgrade Template to use short array syntax

4 years agoMerge pull request #15055 from demeritcowboy/file-no-description
Eileen McNaughton [Sat, 17 Aug 2019 04:48:01 +0000 (16:48 +1200)]
Merge pull request #15055 from demeritcowboy/file-no-description

dev/core#1186 - ignore exception if no description field

4 years agodev/core#1186 add in unit test to lock in fix from dmeritcowboy in #15055
Seamus Lee [Sat, 17 Aug 2019 04:42:33 +0000 (14:42 +1000)]
dev/core#1186 add in unit test to lock in fix from dmeritcowboy in #15055

4 years ago[NFC] Update Upgrade Template to use short array syntax
Seamus Lee [Sat, 17 Aug 2019 03:53:58 +0000 (13:53 +1000)]
[NFC] Update Upgrade Template to use short array syntax

4 years agoMerge pull request #15046 from 19ATF77/Fix_Activitytpl
Eileen McNaughton [Sat, 17 Aug 2019 03:39:51 +0000 (15:39 +1200)]
Merge pull request #15046 from 19ATF77/Fix_Activitytpl

Do not show Activity Separation on when viewing an Activity

4 years agoMerge pull request #15056 from civicrm/5.17
Eileen McNaughton [Sat, 17 Aug 2019 03:34:49 +0000 (15:34 +1200)]
Merge pull request #15056 from civicrm/5.17

5.17

4 years agoMerge pull request #15054 from colemanw/select2
Tim Otten [Sat, 17 Aug 2019 01:46:01 +0000 (18:46 -0700)]
Merge pull request #15054 from colemanw/select2

Update select2 to latest 3.x + patches

4 years agoMerge pull request #15047 from eileenmcnaughton/pptx
Seamus Lee [Sat, 17 Aug 2019 01:42:49 +0000 (11:42 +1000)]
Merge pull request #15047 from eileenmcnaughton/pptx

dev/core#1190 Add pptx to safe file types

4 years agocatch exception when no description
DemeritCowboy [Sat, 17 Aug 2019 01:31:42 +0000 (21:31 -0400)]
catch exception when no description

4 years agoUpdate select2 to latest 3.x + patches
Coleman Watts [Fri, 16 Aug 2019 23:18:59 +0000 (19:18 -0400)]
Update select2 to latest 3.x + patches

4 years agoFix metadata on member export
eileen [Sun, 28 Jul 2019 15:41:12 +0000 (03:41 +1200)]
Fix metadata on member export

Note auto_renew seems un-exportable so I removed it from return properties

4 years agoMerge pull request #15029 from reecebenson/bugfix/reports-remove-sorting-filters
Eileen McNaughton [Fri, 16 Aug 2019 21:13:05 +0000 (09:13 +1200)]
Merge pull request #15029 from reecebenson/bugfix/reports-remove-sorting-filters

Allow for the deselection of sorting filters

4 years agoDo not show Activity Separation on when viewing an Activity
Micah [Thu, 15 Aug 2019 12:34:33 +0000 (13:34 +0100)]
Do not show Activity Separation on when viewing an Activity

4 years agoFix undefined index when setting value to empty when removing order by filters
Reece Benson [Fri, 16 Aug 2019 06:31:31 +0000 (07:31 +0100)]
Fix undefined index when setting value to empty when removing order by filters

4 years agoExtract metadata definition into a trait.
eileen [Sun, 11 Aug 2019 22:53:17 +0000 (10:53 +1200)]
Extract metadata definition into a trait.

This metadata needs to be shared between multiple import forms. They do not have a common parent.

Curently this is done via calculating once & passing via quickform. However, the formats
are convoluted & hard to read.

Information that is user generated should be calculated per form - not so much metadata

4 years ago[NFC] swap instances where double = is used but it should be triple =
eileen [Thu, 15 Aug 2019 23:00:00 +0000 (11:00 +1200)]
[NFC] swap instances where double = is used but it should be triple =

In all the changed cases this is a specific comparison with a string so the change is best practice but not functional.

One unused variable removed

4 years ago[NFC] code tidy ups
eileen [Thu, 15 Aug 2019 22:56:12 +0000 (10:56 +1200)]
[NFC] code tidy ups

4 years agoMerge pull request #15015 from eileenmcnaughton/import_message
Seamus Lee [Thu, 15 Aug 2019 22:46:51 +0000 (08:46 +1000)]
Merge pull request #15015 from eileenmcnaughton/import_message

[REF] [Import] Minor cleanup on status setting.

4 years agoMerge pull request #15017 from eileenmcnaughton/import_cont
Seamus Lee [Thu, 15 Aug 2019 22:46:07 +0000 (08:46 +1000)]
Merge pull request #15017 from eileenmcnaughton/import_cont

[REF] [Import] extract saved mapping code to parent class

4 years agoMerge pull request #14981 from eileenmcnaughton/load_extract
Seamus Lee [Thu, 15 Aug 2019 22:42:43 +0000 (08:42 +1000)]
Merge pull request #14981 from eileenmcnaughton/load_extract

[Import] [Cleanup] remove unused parameters

4 years agoMerge pull request #15028 from eileenmcnaughton/import_processor
Seamus Lee [Thu, 15 Aug 2019 22:41:27 +0000 (08:41 +1000)]
Merge pull request #15028 from eileenmcnaughton/import_processor

[Test] [Ref] [Import]Add wrapper class for importProcessor

4 years agodev/core#1190 Add pptx to safe file types
eileen [Thu, 15 Aug 2019 20:54:20 +0000 (08:54 +1200)]
dev/core#1190 Add pptx to safe file types

I feel like it would be better to store these as an array somewhere - maybe as the first step to
a metadata construct for Option groups...

4 years agoFix unreleased regression on import
eileen [Wed, 14 Aug 2019 03:26:56 +0000 (15:26 +1200)]
Fix unreleased regression on import

https://github.com/civicrm/civicrm-core/commit/2adc819d0e59d71ffcf14c6799a379f108b07d60
made the code a little more readable but changed the indexing from 0-based to column based.

See https://pear.php.net/manual/en/package.database.db.db-common.setfetchmode.php

THis can be replicated by trying to update an existing mapping

4 years agoMerge pull request #15032 from demeritcowboy/human-label-function
Eileen McNaughton [Thu, 15 Aug 2019 21:27:10 +0000 (09:27 +1200)]
Merge pull request #15032 from demeritcowboy/human-label-function

dev/core#1116 - towards fixing activity type name vs label

4 years agoMerge pull request #15045 from mattwire/detaillogging_viewdelete
Eileen McNaughton [Thu, 15 Aug 2019 21:25:35 +0000 (09:25 +1200)]
Merge pull request #15045 from mattwire/detaillogging_viewdelete

Enable view/revert delete action for detail logging