civicrm-core.git
4 years agoMerge pull request #15213 from agh1/5.17.0-releasenotes-final
Seamus Lee [Wed, 4 Sep 2019 20:38:49 +0000 (06:38 +1000)]
Merge pull request #15213 from agh1/5.17.0-releasenotes-final

5.17.0 release notes: late changes and tidy-up

4 years ago5.17.0 release notes: late changes and tidy-up
Andrew Hunt [Wed, 4 Sep 2019 14:50:41 +0000 (10:50 -0400)]
5.17.0 release notes: late changes and tidy-up

4 years agoMerge pull request #15207 from seamuslee001/5_16_4_5_17_release_notes
Eileen McNaughton [Wed, 4 Sep 2019 01:59:53 +0000 (13:59 +1200)]
Merge pull request #15207 from seamuslee001/5_16_4_5_17_release_notes

[NFC] Bring up 5.16.4 release notes into 5.17

4 years agoUpdate 5.16.4.md
Tim Otten [Tue, 3 Sep 2019 06:35:02 +0000 (23:35 -0700)]
Update 5.16.4.md

4 years agorelease-notes - Add 5.16.4
Tim Otten [Tue, 3 Sep 2019 06:31:19 +0000 (23:31 -0700)]
release-notes - Add 5.16.4

4 years agoMerge pull request #15197 from eileenmcnaughton/5.17
Eileen McNaughton [Tue, 3 Sep 2019 05:24:51 +0000 (17:24 +1200)]
Merge pull request #15197 from eileenmcnaughton/5.17

[NFC] comment fixes

4 years agoMerge pull request #15194 from eileenmcnaughton/517_dates
Eileen McNaughton [Tue, 3 Sep 2019 05:24:11 +0000 (17:24 +1200)]
Merge pull request #15194 from eileenmcnaughton/517_dates

Fix failure to save relative dates on legacy fields

4 years ago[NFC] comment fixes
eileen [Tue, 3 Sep 2019 01:47:36 +0000 (13:47 +1200)]
[NFC] comment fixes

4 years agoFix failure to save relative dates on legacy fields
eileen [Mon, 2 Sep 2019 22:50:37 +0000 (10:50 +1200)]
Fix failure to save relative dates on legacy fields

4 years agoMerge pull request #15169 from pradpnayak/relDateFixes
Seamus Lee [Sat, 31 Aug 2019 20:24:26 +0000 (06:24 +1000)]
Merge pull request #15169 from pradpnayak/relDateFixes

1226, fixed Change log relative date search for creating smart group

4 years ago1226, fixed Change log relative date search for creating smart group
Pradeep Nayak [Fri, 30 Aug 2019 20:31:01 +0000 (21:31 +0100)]
1226, fixed Change log relative date search for creating smart group

4 years agoMerge pull request #15111 from seamuslee001/5_16_3_release_notes
Eileen McNaughton [Fri, 23 Aug 2019 00:40:10 +0000 (12:40 +1200)]
Merge pull request #15111 from seamuslee001/5_16_3_release_notes

Add in release notes for 5.16.3 drop

4 years agoMerge pull request #15105 from greenpeace-cee/fix-id-additionalinfo
Tim Otten [Fri, 23 Aug 2019 00:39:10 +0000 (17:39 -0700)]
Merge pull request #15105 from greenpeace-cee/fix-id-additionalinfo

dev/financial#66 - Fix missing contribution ID for AdditionalInfo

4 years agoUpdate release-notes.md
Tim Otten [Thu, 22 Aug 2019 23:07:44 +0000 (16:07 -0700)]
Update release-notes.md

4 years agoUpdate 5.16.3.md
Tim Otten [Thu, 22 Aug 2019 23:05:09 +0000 (16:05 -0700)]
Update 5.16.3.md

4 years agoAdd in release notes for 5.16.3 drop
Seamus Lee [Thu, 22 Aug 2019 22:39:34 +0000 (08:39 +1000)]
Add in release notes for 5.16.3 drop

4 years agoMerge pull request #15106 from alifrumin/5.17.0-rn
Seamus Lee [Thu, 22 Aug 2019 22:18:59 +0000 (08:18 +1000)]
Merge pull request #15106 from alifrumin/5.17.0-rn

5.17.0 release notes: first pass at sorting and annotating

4 years agodev/financial#66 - Fix missing contribution ID for AdditionalInfo
Patrick Figel [Thu, 22 Aug 2019 20:27:52 +0000 (22:27 +0200)]
dev/financial#66 - Fix missing contribution ID for AdditionalInfo

This fixes an issues where the contribution ID is not being passed
when the AdditionalInfo form block is retrieved in the contribution
form. This causes existing values of fields in this block to not be
loaded, leading to data loss when the form is saved.

4 years ago5.17.0 release notes: first pass at sorting and annotating
Alice Frumin [Wed, 21 Aug 2019 15:16:21 +0000 (11:16 -0400)]
5.17.0 release notes: first pass at sorting and annotating

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 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 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 #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 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 #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 #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 #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 #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 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 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 #15041 from seamuslee001/5.17
Seamus Lee [Thu, 15 Aug 2019 04:43:04 +0000 (14:43 +1000)]
Merge pull request #15041 from seamuslee001/5.17

Add release-notes/5.16.2.md

4 years agoAdd release-notes/5.16.2.md
Tim Otten [Thu, 15 Aug 2019 03:10:55 +0000 (20:10 -0700)]
Add release-notes/5.16.2.md

4 years agoMerge pull request #15037 from demeritcowboy/fin-account-limbo
Eileen McNaughton [Wed, 14 Aug 2019 22:29:58 +0000 (10:29 +1200)]
Merge pull request #15037 from demeritcowboy/fin-account-limbo

dev/financial#65 - Revert recent changes that cause financial account edit form to be blank

4 years agodev/financial#65
DemeritCowboy [Wed, 14 Aug 2019 21:07:31 +0000 (17:07 -0400)]
dev/financial#65

4 years agoMerge pull request #15025 from seamuslee001/5_16_1_release_notes
Eileen McNaughton [Mon, 12 Aug 2019 23:21:18 +0000 (11:21 +1200)]
Merge pull request #15025 from seamuslee001/5_16_1_release_notes

5.16.1 release notes

4 years agoUpdate 5.16.1.md
Tim Otten [Mon, 12 Aug 2019 22:55:38 +0000 (15:55 -0700)]
Update 5.16.1.md

4 years agoAdd in release notes for 5.16.1
Seamus Lee [Mon, 12 Aug 2019 22:17:36 +0000 (08:17 +1000)]
Add in release notes for 5.16.1

4 years agoMerge pull request #15021 from seamuslee001/5.17
Seamus Lee [Mon, 12 Aug 2019 22:51:13 +0000 (08:51 +1000)]
Merge pull request #15021 from seamuslee001/5.17

core#1182 - revert crm.menubar.js changes

4 years agocore#1182 - revert crm.menubar.js changes
Jon Goldberg [Mon, 12 Aug 2019 16:38:28 +0000 (12:38 -0400)]
core#1182 - revert crm.menubar.js changes

4 years agoMerge pull request #15007 from MegaphoneJon/core-1175-517
Seamus Lee [Fri, 9 Aug 2019 23:36:40 +0000 (09:36 +1000)]
Merge pull request #15007 from MegaphoneJon/core-1175-517

core#1175 - fix custom searches

4 years agocore#1175 - fix custom searches
Jon Goldberg [Fri, 9 Aug 2019 18:43:36 +0000 (14:43 -0400)]
core#1175 - fix custom searches

4 years agoMerge pull request #14996 from mfb/revert-14222
Eileen McNaughton [Thu, 8 Aug 2019 21:35:31 +0000 (09:35 +1200)]
Merge pull request #14996 from mfb/revert-14222

Revert #14222 on RC branch

4 years agoRevert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods...
mark burdett [Thu, 8 Aug 2019 21:28:13 +0000 (14:28 -0700)]
Revert "CRM_Core_Error::debug_var() should have a level arg; CRM_Core_Error methods could use Civi::log() internally; prefix param support for Civi::log()."

Due to regression https://lab.civicrm.org/dev/core/issues/1174

This reverts commit 3ac984a463d71d796096d5c78c4abd2de0d0a27d.

4 years agoSet version to 5.17.beta1
CiviCRM [Thu, 8 Aug 2019 05:13:15 +0000 (05:13 +0000)]
Set version to 5.17.beta1

4 years agoMerge pull request #14991 from eileenmcnaughton/enotice_regress
Tim Otten [Thu, 8 Aug 2019 05:09:34 +0000 (22:09 -0700)]
Merge pull request #14991 from eileenmcnaughton/enotice_regress

Further e-notice regression fix

4 years agoMerge pull request #14222 from mfb/debug-var
Eileen McNaughton [Thu, 8 Aug 2019 03:22:54 +0000 (15:22 +1200)]
Merge pull request #14222 from mfb/debug-var

Error log improvements: Provide severity level and use Civi::log()

4 years agoMerge pull request #14985 from herbdool/issue-1170
Eileen McNaughton [Thu, 8 Aug 2019 03:15:56 +0000 (15:15 +1200)]
Merge pull request #14985 from herbdool/issue-1170

Issue 1170

4 years agoMerge pull request #14983 from greenpeace-cee/fix-contact-reference-merge
Eileen McNaughton [Thu, 8 Aug 2019 03:13:45 +0000 (15:13 +1200)]
Merge pull request #14983 from greenpeace-cee/fix-contact-reference-merge

dev/core#1109 - Fix merge not updating ContactReference fields

4 years agoAnd this was the pre-existing enotice
eileen [Thu, 8 Aug 2019 03:04:39 +0000 (15:04 +1200)]
And this was the pre-existing enotice

4 years agoFurther e-notice regression fix
eileen [Thu, 8 Aug 2019 02:56:00 +0000 (14:56 +1200)]
Further e-notice regression fix

4 years agoMerge pull request #14978 from eileenmcnaughton/map_field
Tim Otten [Thu, 8 Aug 2019 00:59:44 +0000 (17:59 -0700)]
Merge pull request #14978 from eileenmcnaughton/map_field

 Fix (unreleased regression) e-notices on import form

4 years agoMerge pull request #14987 from civicrm/5.16
Eileen McNaughton [Thu, 8 Aug 2019 00:49:05 +0000 (12:49 +1200)]
Merge pull request #14987 from civicrm/5.16

5.16 to master

4 years agoMerge pull request #14986 from eileenmcnaughton/luciano
Eileen McNaughton [Thu, 8 Aug 2019 00:40:15 +0000 (12:40 +1200)]
Merge pull request #14986 from eileenmcnaughton/luciano

[REF][Import] add formatted parameter to formatInput

4 years ago[REF][Import] add formatted parameter to formatInput
Luciano Spiegel [Wed, 7 Aug 2019 16:51:03 +0000 (18:51 +0200)]
[REF][Import] add formatted parameter to formatInput

4 years agoMerge pull request #14960 from eileenmcnaughton/event_test
Eileen McNaughton [Wed, 7 Aug 2019 17:49:54 +0000 (05:49 +1200)]
Merge pull request #14960 from eileenmcnaughton/event_test

dev/drupal#72 Ensure front end profile title is used in event confirmation emails

4 years agoIssue 1170: Fix URL in CRM_Utils_System_Backdrop::getLoginURL
Herb [Wed, 7 Aug 2019 17:40:49 +0000 (13:40 -0400)]
Issue 1170: Fix URL in CRM_Utils_System_Backdrop::getLoginURL

4 years agodev/core#1109 - Fix merge not updating ContactReference fields
Patrick Figel [Wed, 7 Aug 2019 14:38:59 +0000 (16:38 +0200)]
dev/core#1109 - Fix merge not updating ContactReference fields

This fixes an issue that causes ContactReference custom fields pointing
to a duplicated contact that's being merged to not be updated to the
main (surviving) contact.

4 years agoSwitch to helper function
eileen [Wed, 7 Aug 2019 07:20:22 +0000 (19:20 +1200)]
Switch to helper function

4 years agoMerge pull request #14979 from eileenmcnaughton/map_field_zip
Eileen McNaughton [Wed, 7 Aug 2019 07:22:58 +0000 (19:22 +1200)]
Merge pull request #14979 from eileenmcnaughton/map_field_zip

[REF] [Import] extract function that sets field metadata

4 years agodev/core#224 Ensure front end profile title is used in confirmation emails
eileen [Sun, 4 Aug 2019 23:04:22 +0000 (11:04 +1200)]
dev/core#224 Ensure front end profile title is used in confirmation emails

4 years agoExtract loadMessageParams for events
eileen [Sun, 4 Aug 2019 23:02:50 +0000 (11:02 +1200)]
Extract loadMessageParams for events

4 years agodev/drupal#72 fix display of profiles on events to use front end titles
eileen [Sun, 4 Aug 2019 20:04:57 +0000 (08:04 +1200)]
dev/drupal#72 fix display of profiles on events to use front end titles

4 years agoPreliminary cleanup - use CRM_Core_Exception, fix comments
eileen [Sun, 4 Aug 2019 20:02:21 +0000 (08:02 +1200)]
Preliminary cleanup - use CRM_Core_Exception, fix comments

4 years agoMerge pull request #14976 from eileenmcnaughton/import
Seamus Lee [Wed, 7 Aug 2019 06:21:00 +0000 (16:21 +1000)]
Merge pull request #14976 from eileenmcnaughton/import

[REF][Import]   very minor cleanup - 3 lines of code to one

4 years agoMerge pull request #14956 from eileenmcnaughton/mem_auto
Seamus Lee [Wed, 7 Aug 2019 06:11:13 +0000 (16:11 +1000)]
Merge pull request #14956 from eileenmcnaughton/mem_auto

[Test] Add test cover for Member_BAO_Query auto_renew field

4 years ago[REF] [Import] extract function that sets field metadata
eileen [Wed, 7 Aug 2019 05:39:35 +0000 (17:39 +1200)]
[REF] [Import] extract function that sets field metadata

My thinking is that we want to migrate over to a new class (similar to export processor) that does a lot a metadata functions
- perhaps it might be importMetadata. A big part of the reason it's all so crazy appears to be that the functions to
wrangle the metadata are on the first class in the sequence (DataSource) and because they are not shared & do not have a shared
parent they are passed around instead via the form set &  get methods. In fact the metadata & array wrangling functions just
need to be available - hmm sounding like a trait - ok next commit....

4 years ago[REF][Import] very minor cleanup - 3 lines of code to one
eileen [Wed, 7 Aug 2019 02:15:44 +0000 (14:15 +1200)]
[REF][Import]   very minor cleanup - 3 lines of code to one

4 years agoFix (unreleased regression) e-notices on import form
eileen [Wed, 7 Aug 2019 03:43:43 +0000 (15:43 +1200)]
Fix (unreleased regression) e-notices on import form

When doing this extraction
https://github.com/civicrm/civicrm-core/commit/0e3fc0224be2e0db48691ca96cc10dec4ab801db

The function pass-by-reference calls hid the fact that the  &  needed to be passed in

causing e-notices.

In fact there are still some enotices after this which I'm still investigating but this partially fixes
& is mergeable in itself - the other can be follow up

4 years agoMerge pull request #14975 from eileenmcnaughton/mapping_field
Eileen McNaughton [Wed, 7 Aug 2019 03:21:30 +0000 (15:21 +1200)]
Merge pull request #14975 from eileenmcnaughton/mapping_field

Add pseudoconstant metadata to mapping_field.location_type_id

4 years agoReduce php4 support
eileen [Wed, 7 Aug 2019 03:20:45 +0000 (15:20 +1200)]
Reduce php4 support

4 years agoMerge pull request #14977 from eileenmcnaughton/map_field
Eileen McNaughton [Wed, 7 Aug 2019 03:15:47 +0000 (15:15 +1200)]
Merge pull request #14977 from eileenmcnaughton/map_field

[NFC] code formatting only

4 years ago[NFC] code formatting only
eileen [Wed, 7 Aug 2019 02:19:03 +0000 (14:19 +1200)]
[NFC] code formatting only

4 years agoMerge pull request #14969 from colemanw/abbr
Eileen McNaughton [Wed, 7 Aug 2019 01:41:41 +0000 (13:41 +1200)]
Merge pull request #14969 from colemanw/abbr

Use metadata for getOptions abbreviation & include currency symbol

4 years agoMerge pull request #14965 from seamuslee001/ref_use_shared_function
Eileen McNaughton [Wed, 7 Aug 2019 01:38:45 +0000 (13:38 +1200)]
Merge pull request #14965 from seamuslee001/ref_use_shared_function

[REF] Update selfService in updateBilling to use shared function

4 years agoAdd pseudoconstant metadata to mapping_field.location_type_id
eileen [Wed, 7 Aug 2019 01:26:37 +0000 (13:26 +1200)]
Add pseudoconstant metadata to mapping_field.location_type_id

4 years agoMerge pull request #14964 from seamuslee001/dev_core_1061
Eileen McNaughton [Wed, 7 Aug 2019 00:53:15 +0000 (12:53 +1200)]
Merge pull request #14964 from seamuslee001/dev_core_1061

dev/core#1061 Ensure that custom data is not loaded on update subscription form when in self service mode and re-use shared function

4 years agodev/core#1061 Ensure that custom data is not loaded on update subscription form when...
Seamus Lee [Mon, 5 Aug 2019 02:39:36 +0000 (12:39 +1000)]
dev/core#1061 Ensure that custom data is not loaded on update subscription form when in self service mode and re-use shared function

Update to call function rather than variable as function does early return if variable aready set as per EIleen's comment

4 years ago[REF] Update selfService in updateBilling to use shared function
Seamus Lee [Mon, 5 Aug 2019 05:19:34 +0000 (15:19 +1000)]
[REF] Update selfService in updateBilling to use shared function

Minor spelling fix

Update as per Eileen's comment

4 years agoMerge pull request #14971 from mlutfy/ts-fixes-20190806
Eileen McNaughton [Tue, 6 Aug 2019 22:53:34 +0000 (10:53 +1200)]
Merge pull request #14971 from mlutfy/ts-fixes-20190806

Translation 'ts' usage fixes.

4 years agoMerge pull request #14974 from civicrm/5.16
Eileen McNaughton [Tue, 6 Aug 2019 22:53:10 +0000 (10:53 +1200)]
Merge pull request #14974 from civicrm/5.16

5.16.0 to master

4 years ago5.16.0 release notes - late changes (#14973)
Andrew Hunt [Tue, 6 Aug 2019 22:52:06 +0000 (18:52 -0400)]
5.16.0 release notes - late changes (#14973)

* Add release-notes/5.15.1.md

* Add release-notes/5.15.2.md

* Update 5.15.2.md

* 5.15.2 release notes: added missing bug fix

* 5.16.0 release notes: late changes

* 5.16.0 release notes: contributors for late changes

4 years agoTranslation 'ts' usage fixes.
Mathieu Lutfy [Tue, 6 Aug 2019 14:40:25 +0000 (10:40 -0400)]
Translation 'ts' usage fixes.

4 years agoMerge pull request #14959 from eileenmcnaughton/event_inv
colemanw [Tue, 6 Aug 2019 14:02:58 +0000 (10:02 -0400)]
Merge pull request #14959 from eileenmcnaughton/event_inv

Minor cleanup around invoicing on event code

4 years agoUse metadata for getOptions abbreviation & include currency symbol
Coleman Watts [Mon, 5 Aug 2019 14:56:00 +0000 (10:56 -0400)]
Use metadata for getOptions abbreviation & include currency symbol

4 years agoMerge pull request #14957 from eileenmcnaughton/event_nfc
colemanw [Tue, 6 Aug 2019 13:06:21 +0000 (09:06 -0400)]
Merge pull request #14957 from eileenmcnaughton/event_nfc

[NFC] minor cleanup

4 years agoMerge pull request #14970 from demeritcowboy/document-activityTypeName-3
Eileen McNaughton [Tue, 6 Aug 2019 09:42:28 +0000 (21:42 +1200)]
Merge pull request #14970 from demeritcowboy/document-activityTypeName-3

[NFC] dev/core#1116 - seek and document where activityTypeName is name and where it's label

4 years agoseek and document activityTypeName
DemeritCowboy [Mon, 5 Aug 2019 23:52:05 +0000 (19:52 -0400)]
seek and document activityTypeName

4 years agoMerge pull request #14962 from eileenmcnaughton/import_map
colemanw [Mon, 5 Aug 2019 20:59:22 +0000 (16:59 -0400)]
Merge pull request #14962 from eileenmcnaughton/import_map

[REF] minor code cleanup on import mapping

4 years agoMerge pull request #14943 from JKingsnorth/patch-12
Eileen McNaughton [Mon, 5 Aug 2019 20:44:13 +0000 (08:44 +1200)]
Merge pull request #14943 from JKingsnorth/patch-12

Fix removeNullContactTokens compatibility with custom tokens

4 years agoMerge pull request #14844 from chamilwijesooriya/issue-1135
Eileen McNaughton [Mon, 5 Aug 2019 19:42:49 +0000 (07:42 +1200)]
Merge pull request #14844 from chamilwijesooriya/issue-1135

dev/core#1135 Participants having multiple roles affects maximum event registration count

4 years agoAdd test for custom token compatibility
JKingsnorth [Mon, 5 Aug 2019 11:30:08 +0000 (12:30 +0100)]
Add test for custom token compatibility

4 years agoMerge pull request #14951 from eileenmcnaughton/rel_dis
Seamus Lee [Mon, 5 Aug 2019 06:59:24 +0000 (16:59 +1000)]
Merge pull request #14951 from eileenmcnaughton/rel_dis

dev/core#470: Current employer disapears when disabling expired relationships