civicrm-core.git
4 years agoAllow most values of $civicrm_paths['XXX']['url'] to be relative
Tim Otten [Thu, 16 Jan 2020 08:42:55 +0000 (00:42 -0800)]
Allow most values of $civicrm_paths['XXX']['url'] to be relative

Overview
--------

The `$civicrm_paths` variable allows a sysadmin to override various path and
URL computations.

```php
$civicrm_paths['civicrm.packages']['url'] = 'https://example.com/libraries/civicrm/packages';
```

The variable was originally tested with absolute URLs, and the subsequent
examples/docs use absolute URLs (https://docs.civicrm.org/dev/en/latest/framework/filesystem/).

These values are used to generate addresses, as in:

```php
$abs = Civi::paths()->getUrl('[civicrm.packages]/foo.js', 'absolute');
$rel = Civi::paths()->getUrl('[civicrm.packages]/foo.js', 'relative');
```

The patch allows more values in `$civicrm_paths` while ensuring that
`getUrl()` works as expected.

Before
------

The `getUrl()` requests only behave correctly if the override is an absolute URL - not if it's relative.

After
-----

The `getUrl()` requests behave correctly if the override is either an absolute URL or a relative URL.

```php
$civicrm_paths['civicrm.packages']['url'] = 'https://example.com/libraries/civicrm/packages';
$civicrm_paths['civicrm.packages']['url'] = '/libraries/civicrm/packages';
```

Comments
--------

* `toAbsoluteUrl()` needs a base to prepend. I initially used `HTTP_HOST`
  but switched to `cms.root`, but correctly inferring scheme and host and port
  and httpd prefixes would be more complex - esp for background/CLI jobs.
  Using `cms.root` as the base is simpler.
* It's tempting to allow recursive variables. But it's not actually needed for
  my purposes, and it would add complexity/maintenance. If it's really needed,
  one could update `toAbsoluteUrl()` to quickly check for variables
  (`$url[0] === '['`) and then evaluate them. But for now... I think the
  simpler format is fine.

4 years agoMerge pull request #16388 from eileenmcnaughton/event_ref
Eileen McNaughton [Tue, 28 Jan 2020 20:10:06 +0000 (09:10 +1300)]
Merge pull request #16388 from eileenmcnaughton/event_ref

[REF] Extract & share code to determine revenue recognition date.

4 years agoMerge pull request #16390 from artfulrobot/tame-propbag-deprecation-logs
Matthew Wire [Tue, 28 Jan 2020 18:17:00 +0000 (18:17 +0000)]
Merge pull request #16390 from artfulrobot/tame-propbag-deprecation-logs

Prevent PropertBag from being so noisy about deprecation warnings

4 years ago[REF] Extract & share code to determine revenue recognition date.
eileen [Sun, 26 Jan 2020 22:05:22 +0000 (11:05 +1300)]
[REF] Extract & share code to determine revenue recognition date.

This also starts the process of consolidating building the 'contribution params' array

4 years agoMerge pull request #16395 from eileenmcnaughton/cont_setting
Seamus Lee [Tue, 28 Jan 2020 06:14:38 +0000 (17:14 +1100)]
Merge pull request #16395 from eileenmcnaughton/cont_setting

Finish removal of deferred_revenue_enabled from non-standard setting

4 years agoMerge pull request #16271 from mattwire/pcp_extractsupportertext
Eileen McNaughton [Tue, 28 Jan 2020 04:37:47 +0000 (17:37 +1300)]
Merge pull request #16271 from mattwire/pcp_extractsupportertext

REF Extract code to build pcp_supporter_text and enable translation

4 years agoMerge pull request #16396 from eileenmcnaughton/cont_setting2
Seamus Lee [Tue, 28 Jan 2020 04:13:22 +0000 (15:13 +1100)]
Merge pull request #16396 from eileenmcnaughton/cont_setting2

[REF] Remove unused variables

4 years agoMerge pull request #16394 from demeritcowboy/extdir-links
Eileen McNaughton [Tue, 28 Jan 2020 03:15:36 +0000 (16:15 +1300)]
Merge pull request #16394 from demeritcowboy/extdir-links

dev/core#1550 Invalid links to extension directory in popup help text

4 years ago[REF] Remove unused variables
eileen [Tue, 28 Jan 2020 01:03:47 +0000 (14:03 +1300)]
[REF] Remove unused variables

4 years agoFinish removal of deferred_revenue_enabled from non-standard setting
eileen [Tue, 28 Jan 2020 00:54:24 +0000 (13:54 +1300)]
Finish removal of deferred_revenue_enabled from non-standard setting

4 years agoMerge pull request #16372 from colemanw/api4Magic
Eileen McNaughton [Mon, 27 Jan 2020 23:17:20 +0000 (12:17 +1300)]
Merge pull request #16372 from colemanw/api4Magic

Api4 - Use explicit adder functions rather than magicMethod

4 years agoinvalid links
demeritcowboy [Mon, 27 Jan 2020 22:14:53 +0000 (17:14 -0500)]
invalid links

4 years agoPrevent PropertBag from being so noisy about deprecation warnings for #16390
Rich Lott / Artful Robot [Mon, 27 Jan 2020 12:06:34 +0000 (12:06 +0000)]
Prevent PropertBag from being so noisy about deprecation warnings for #16390

4 years agoMerge pull request #16389 from eileenmcnaughton/ev_static
Seamus Lee [Mon, 27 Jan 2020 06:28:32 +0000 (17:28 +1100)]
Merge pull request #16389 from eileenmcnaughton/ev_static

Fix tests to use buildFeeFn

4 years agoMerge pull request #15408 from ejegg/l10n
Seamus Lee [Mon, 27 Jan 2020 06:28:06 +0000 (17:28 +1100)]
Merge pull request #15408 from ejegg/l10n

dev/translation#30 Move l10n resource dir under private files

4 years ago(dev/translation#30) Undo new MagicMerge::$l10nDir property
Tim Otten [Mon, 27 Jan 2020 03:15:03 +0000 (19:15 -0800)]
(dev/translation#30) Undo new MagicMerge::$l10nDir property

The previous commit added a new property `l10nDir` to `MagicMerge`.

The property doesn't seem to be needed, so omit it.

4 years agoMerge pull request #16352 from mlutfy/translation34
Eileen McNaughton [Mon, 27 Jan 2020 01:19:35 +0000 (14:19 +1300)]
Merge pull request #16352 from mlutfy/translation34

dev/translation#34 Fix Contact Reference option for Postal Code

4 years agoMerge pull request #16367 from MegaphoneJon/event-32
Seamus Lee [Mon, 27 Jan 2020 00:46:46 +0000 (11:46 +1100)]
Merge pull request #16367 from MegaphoneJon/event-32

event#32: Fix bad variable in message template

4 years agodev/translation#30 Move l10n resource dir under private files
Elliott Eggleston [Sun, 6 Oct 2019 16:24:18 +0000 (18:24 +0200)]
dev/translation#30 Move l10n resource dir under private files

Looks under [civicrm.private]/l10n if that exists, falling back to
[civicrm.root]/l10n.

Since I18n::getResourceDirectory needs to be called from GenCode,
where we don't have the base directory defined, we make the l10n
path factory function consult new #define CIVICRM_L10N_BASEDIR first.

In GenCode itself, keep using the old location for now, but make
it possible to change the location with an env var as soon as we
update buildkit.

4 years agoAssert on fail
eileen [Mon, 20 Jan 2020 21:17:05 +0000 (10:17 +1300)]
Assert on fail

4 years agoFix tests to use buildFeeFn
eileen [Mon, 20 Jan 2020 21:16:39 +0000 (10:16 +1300)]
Fix tests to use buildFeeFn

4 years agoMerge pull request #16348 from eileenmcnaughton/ev_online
Eileen McNaughton [Mon, 27 Jan 2020 00:33:10 +0000 (13:33 +1300)]
Merge pull request #16348 from eileenmcnaughton/ev_online

Remove irrelevant code.

4 years agoMerge pull request #16375 from seamuslee001/dev_core_1538
Eileen McNaughton [Sun, 26 Jan 2020 21:31:51 +0000 (10:31 +1300)]
Merge pull request #16375 from seamuslee001/dev_core_1538

Update Export unit test to pass on MySQL 8

4 years agoMerge pull request #16387 from demeritcowboy/blank-google-recaptcha
Mathieu Lu [Sun, 26 Jan 2020 17:49:10 +0000 (12:49 -0500)]
Merge pull request #16387 from demeritcowboy/blank-google-recaptcha

dev/translation#33 Fix incorrect quoting in a link and an incorrect link

4 years agoMerge pull request #15912 from mydropwizard/d8-language-empty-prefix
Mathieu Lu [Sun, 26 Jan 2020 17:00:08 +0000 (12:00 -0500)]
Merge pull request #15912 from mydropwizard/d8-language-empty-prefix

dev/drupal#85 Drupal8: Fix bug with empty language prefix mangling https:// to http:/

4 years agofix invalid quoting and incorrect link
demeritcowboy [Sun, 26 Jan 2020 05:45:41 +0000 (00:45 -0500)]
fix invalid quoting and incorrect link

4 years agoMerge pull request #16386 from civicrm/5.22
Seamus Lee [Sun, 26 Jan 2020 04:58:56 +0000 (15:58 +1100)]
Merge pull request #16386 from civicrm/5.22

5.22

4 years agoMerge pull request #16377 from ejegg/serviceFileFinder-5.22
Seamus Lee [Sun, 26 Jan 2020 03:24:15 +0000 (14:24 +1100)]
Merge pull request #16377 from ejegg/serviceFileFinder-5.22

loadServices: tighten up file match regex

4 years agoMerge pull request #16385 from civicrm/5.22
Seamus Lee [Sun, 26 Jan 2020 02:54:35 +0000 (13:54 +1100)]
Merge pull request #16385 from civicrm/5.22

5.22

4 years agoMerge pull request #16384 from totten/5.22-nfc
Seamus Lee [Sun, 26 Jan 2020 02:53:40 +0000 (13:53 +1100)]
Merge pull request #16384 from totten/5.22-nfc

(NFC) Civi, CRM, tests - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago[NFC] Fix var declarations in the test folder
Seamus Lee [Sun, 26 Jan 2020 00:13:38 +0000 (11:13 +1100)]
[NFC] Fix var declarations in the test folder

4 years agoUpdate Var delcartion to be standard in CRM folder
Seamus Lee [Sat, 25 Jan 2020 20:39:27 +0000 (07:39 +1100)]
Update Var delcartion to be standard in CRM folder

4 years ago(NFC) Civi/API - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:30 +0000 (16:17 -0800)]
(NFC) Civi/API - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/CCase - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:21 +0000 (16:17 -0800)]
(NFC) Civi/CCase - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/Core - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:14 +0000 (16:17 -0800)]
(NFC) Civi/Core - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/Payment - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:04 +0000 (16:17 -0800)]
(NFC) Civi/Payment - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/Test - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:16:56 +0000 (16:16 -0800)]
(NFC) Civi/Test - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years agoMerge pull request #16382 from seamuslee001/crm_var_update
Tim Otten [Sun, 26 Jan 2020 00:12:08 +0000 (16:12 -0800)]
Merge pull request #16382 from seamuslee001/crm_var_update

(NFC) Update Var declaration to be standard in CRM folder

4 years agoUpdate Var delcartion to be standard in CRM folder
Seamus Lee [Sat, 25 Jan 2020 20:39:27 +0000 (07:39 +1100)]
Update Var delcartion to be standard in CRM folder

4 years agoMerge pull request #16355 from eileenmcnaughton/ev_part
colemanw [Sat, 25 Jan 2020 16:12:39 +0000 (11:12 -0500)]
Merge pull request #16355 from eileenmcnaughton/ev_part

Add helper for getting participantValues

4 years agoMerge pull request #16379 from totten/master-coder-ivt
colemanw [Sat, 25 Jan 2020 16:10:35 +0000 (11:10 -0500)]
Merge pull request #16379 from totten/master-coder-ivt

(NFC) Civi/*.php - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/API - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:30 +0000 (16:17 -0800)]
(NFC) Civi/API - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/CCase - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:21 +0000 (16:17 -0800)]
(NFC) Civi/CCase - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/Core - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:14 +0000 (16:17 -0800)]
(NFC) Civi/Core - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/Payment - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:17:04 +0000 (16:17 -0800)]
(NFC) Civi/Payment - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years ago(NFC) Civi/Test - Update for Drupal.Commenting.VariableComment.IncorrectVarType
Tim Otten [Sat, 25 Jan 2020 00:16:56 +0000 (16:16 -0800)]
(NFC) Civi/Test - Update for Drupal.Commenting.VariableComment.IncorrectVarType

4 years agoMerge pull request #16373 from colemanw/api4Stuff
Seamus Lee [Fri, 24 Jan 2020 22:46:01 +0000 (09:46 +1100)]
Merge pull request #16373 from colemanw/api4Stuff

Api4 - improve docblocks & display links in explorer

4 years agoloadServices: tighten up file match regex
Elliott Eggleston [Fri, 24 Jan 2020 21:28:57 +0000 (16:28 -0500)]
loadServices: tighten up file match regex

Before: Civi code living under a path containing the characters php
(such as ~/src/php/civicrm) will crash trying to load services with
a message like the following:
   ReflectionException: Class Civi\Api4\Service\Spec\Provider\src
   does not exist in ReflectionClass->__construct()

After: Civi loads services normally no matter what the enclosing path

4 years agoUpdate Export unit test to pass on MySQL 8
Seamus Lee [Fri, 24 Jan 2020 21:32:43 +0000 (08:32 +1100)]
Update Export unit test to pass on MySQL 8

4 years agoMerge remote-tracking branch 'origin/5.22' into 5.22-master-2020-01-24-13-18-00
Tim Otten [Fri, 24 Jan 2020 21:18:07 +0000 (13:18 -0800)]
Merge remote-tracking branch 'origin/5.22' into 5.22-master-2020-01-24-13-18-00

4 years agoMerge pull request #16370 from mattwire/membershipstatuscalc_params
colemanw [Fri, 24 Jan 2020 21:08:32 +0000 (16:08 -0500)]
Merge pull request #16370 from mattwire/membershipstatuscalc_params

NFC Add parameter definition to membershipstatus.calc

4 years agoMerge pull request #16335 from colemanw/exportui
Mathieu Lu [Fri, 24 Jan 2020 18:56:47 +0000 (13:56 -0500)]
Merge pull request #16335 from colemanw/exportui

Move exportui extension into core

4 years agoMerge pull request #16371 from yashodha/typo
Mathieu Lu [Fri, 24 Jan 2020 18:38:38 +0000 (13:38 -0500)]
Merge pull request #16371 from yashodha/typo

Remove unused code

4 years agodev/translation#34 Fix Contact Reference option for Postal Code
Mathieu Lutfy [Wed, 22 Jan 2020 20:31:05 +0000 (15:31 -0500)]
dev/translation#34 Fix Contact Reference option for Postal Code

4 years agoAdd @see annoations to api4 docblocks and show as links in api explorer
Coleman Watts [Fri, 24 Jan 2020 18:09:41 +0000 (13:09 -0500)]
Add @see annoations to api4 docblocks and show as links in api explorer

4 years agoevent#32: Fix bad URL in message template
Jon Goldberg [Fri, 24 Jan 2020 01:34:17 +0000 (20:34 -0500)]
event#32: Fix bad URL in message template

4 years agoApi4 - Use explicit adder functions rather than magicMethod
Coleman Watts [Fri, 24 Jan 2020 14:16:08 +0000 (09:16 -0500)]
Api4 - Use explicit adder functions rather than magicMethod

Api Actions had been relying on a magic method to provide getter/setter functions for params.
That works fine for simple get/set operations but it was also attempting to provide adder functions.
Those are more nuanced and the magic method didn't do a good job of understanding whether the param
was an indexed or unindexed array, and didn't do strict type checking.
Making our own adder functions gives better documentation, stricter checking of inputs and also
the convenience of variadic functions for adding several values at once.

4 years agoBetter looking checkboxes in api explorer
Coleman Watts [Wed, 22 Jan 2020 16:11:37 +0000 (11:11 -0500)]
Better looking checkboxes in api explorer

4 years agoMerge pull request #16363 from eileenmcnaughton/deextract
colemanw [Fri, 24 Jan 2020 13:40:53 +0000 (08:40 -0500)]
Merge pull request #16363 from eileenmcnaughton/deextract

Duplicate code (for real)

4 years agoremove unused code
yashodha [Fri, 24 Jan 2020 13:20:33 +0000 (18:50 +0530)]
remove unused code

4 years agoAdd parameter definition to membershipstatus.calc
Matthew Wire [Wed, 15 Jan 2020 14:42:38 +0000 (14:42 +0000)]
Add parameter definition to membershipstatus.calc

4 years agoMerge pull request #16369 from eileenmcnaughton/export_house
Monish Deb [Fri, 24 Jan 2020 09:26:55 +0000 (14:56 +0530)]
Merge pull request #16369 from eileenmcnaughton/export_house

dev/core#1364 Merge all addresses on export should INCLUDE merging households

4 years agoMerge pull request #16129 from mattwire/gettotalamount_0
Seamus Lee [Fri, 24 Jan 2020 07:54:03 +0000 (18:54 +1100)]
Merge pull request #16129 from mattwire/gettotalamount_0

Make getTotalPayments return 0 instead of NULL

4 years agoMerge pull request #16364 from eileenmcnaughton/export
Seamus Lee [Fri, 24 Jan 2020 07:51:12 +0000 (18:51 +1100)]
Merge pull request #16364 from eileenmcnaughton/export

[REF] Extract function to export header row

4 years agoMerge pull request #16368 from yashodha/typo
Eileen McNaughton [Fri, 24 Jan 2020 07:14:34 +0000 (20:14 +1300)]
Merge pull request #16368 from yashodha/typo

fix more typo's in the text

4 years agodev/core#1364 Merge all addresses on export should INCLUDE merging households
eileen [Fri, 24 Jan 2020 05:25:14 +0000 (18:25 +1300)]
dev/core#1364 Merge all addresses on export should INCLUDE merging households

This is an alternate to https://github.com/civicrm/civicrm-core/pull/15725 that still achieves the goal in
https://github.com/civicrm/civicrm-core/pull/15725#issuecomment-572408173 of making is so that the
mergeSharedAddress option mergesHouseholds first & then merges sharedAddresses.

In #15725 @monishdeb was fixing the code that differentiated between how master_id was treated
versus otherwise merged addresses. However that code 'broke' a long time ago and the arguably
broken behaviour is locked in by unit tests. Fixing it has not been requested - in this
issue or any other in the past year or 2 when it has been broken so I opted to remove the broken
code entirely & to open up the next query such that it does not exclude household addresses.
This didn't break any tests (woot) and also allowed me to enable the test rows @monishdeb wrote
to test this issue

4 years agofix more typo's in the text
yashodha [Fri, 24 Jan 2020 04:28:41 +0000 (09:58 +0530)]
fix more typo's in the text

4 years agoMerge pull request #16358 from MegaphoneJon/event-30
Yashodha Chaku [Fri, 24 Jan 2020 04:27:15 +0000 (09:57 +0530)]
Merge pull request #16358 from MegaphoneJon/event-30

event#30 - don't allow multiple waitlist registrations

4 years agoevent#30 - don't allow multiple waitlist registrations
Jon Goldberg [Wed, 22 Jan 2020 23:13:21 +0000 (18:13 -0500)]
event#30 - don't allow multiple waitlist registrations

4 years agoExtract function to export header row
eileen [Mon, 25 Nov 2019 04:46:21 +0000 (17:46 +1300)]
Extract function to export header row

4 years agoMerge pull request #16356 from totten/5.22-gencode-ts
Tim Otten [Thu, 23 Jan 2020 23:05:11 +0000 (15:05 -0800)]
Merge pull request #16356 from totten/5.22-gencode-ts

(dev/core#1546) Fix translation of seed data

4 years agoDuplicate code (for real)
eileen [Thu, 23 Jan 2020 21:33:54 +0000 (10:33 +1300)]
Duplicate code (for real)

This is going to seem unintuitive but I'm sure the path to cleaning up the participant form starts with
increasing code duplication.

Currently the code is sharing 2 functions with the front end form. The functions don't do a lot of actual processing
but they do do a lot of preparing parameters. The calling functions do a lot of pre-work to call them - so
we are not getting much benefit from the sharing. On the other hand having this code tied up with another form makes
it hard for us to do the 'right' sharing - ie. currently the code to create a contribution paid by credit card & participant record is totally different to another payment method & we should work to share these bits of functionality

4 years agoReturn 0 if total amount is 0 instead of NULL.
Matthew Wire (MJW Consulting) [Fri, 20 Dec 2019 19:20:28 +0000 (19:20 +0000)]
Return 0 if total amount is 0 instead of NULL.

4 years agoMerge pull request #16353 from pradpnayak/functionFix
Eileen McNaughton [Thu, 23 Jan 2020 21:15:22 +0000 (10:15 +1300)]
Merge pull request #16353 from pradpnayak/functionFix

Wrong parameter passed to executeQuery function

4 years agoMerge pull request #16311 from MegaphoneJon/event-template-reminders
Eileen McNaughton [Thu, 23 Jan 2020 21:11:39 +0000 (10:11 +1300)]
Merge pull request #16311 from MegaphoneJon/event-template-reminders

event#28: Don't send scheduled reminders for event templates

4 years agoDon't send scheduled reminders for event templates
Jon Goldberg [Fri, 17 Jan 2020 00:50:24 +0000 (19:50 -0500)]
Don't send scheduled reminders for event templates

4 years agoMerge pull request #16361 from yashodha/typo
Eileen McNaughton [Thu, 23 Jan 2020 19:42:28 +0000 (08:42 +1300)]
Merge pull request #16361 from yashodha/typo

fix typo's in the text

4 years agoMerge pull request #16189 from eileenmcnaughton/acl
Eileen McNaughton [Thu, 23 Jan 2020 19:32:48 +0000 (08:32 +1300)]
Merge pull request #16189 from eileenmcnaughton/acl

Update BAO_Acl internal functions to protected & unused to deprecated

4 years agofix typo's in the text
yashodha [Thu, 23 Jan 2020 12:56:30 +0000 (18:26 +0530)]
fix typo's in the text

4 years ago(NFC) LocalizedDataTest - Add tips on running
Tim Otten [Thu, 23 Jan 2020 05:36:14 +0000 (21:36 -0800)]
(NFC) LocalizedDataTest - Add tips on running

4 years agoMerge pull request #16017 from mattwire/setentitysubtype
Eileen McNaughton [Thu, 23 Jan 2020 04:55:13 +0000 (17:55 +1300)]
Merge pull request #16017 from mattwire/setentitysubtype

Add function to set entitySubType for entity forms

4 years agoMerge pull request #16354 from mlutfy/translation35
Eileen McNaughton [Thu, 23 Jan 2020 04:19:44 +0000 (17:19 +1300)]
Merge pull request #16354 from mlutfy/translation35

dev/translation#35 Display the CiviCRM Resources dashlet in the user's language

4 years ago(dev/core#1546) Fix translation of seed data
Tim Otten [Thu, 23 Jan 2020 03:31:17 +0000 (19:31 -0800)]
(dev/core#1546) Fix translation of seed data

Overview
--------

This fixes a regression in which seed data is not translated.

Before
------

The `civicrm_data.*.mysql` files are not translated.

After
-----

The `civicrm_data.*.mysql` files are translated.

There's a unit-test to check this.

Comments
--------

This regression stems from #15411, which aimed to allow extensions to define
custom variants of `ts()`.  The crux of the issue is "What happens if you
try to translate a string before the system is bootstrapped - before the
extension is loaded?  What's your fallback behavior?"

In #15411, it used a fallback behavior of "do no translation".  In theory,
you shouldn't really get into this scenario since UIs are pretty much always
generated post-boot.

However, it turns out that there is a situation where you have an un-booted
system and need to translate strings -- i.e. when generating the localized
`civicrm_data.*.mysql` data.  Hence the bug.

This patch preserves most of the changes from #15411, but it changes the
fallback behavior from "do no translation" to "use the built-in/default
translator".

4 years agoAdd helper for getting participantValues
eileen [Fri, 17 Jan 2020 22:31:02 +0000 (11:31 +1300)]
Add helper for getting participantValues

4 years agoMerge pull request #16334 from eileenmcnaughton/ev_tpl
Seamus Lee [Thu, 23 Jan 2020 02:59:01 +0000 (13:59 +1100)]
Merge pull request #16334 from eileenmcnaughton/ev_tpl

[REF] Move assignment of BalanceAmount

4 years agoWrong parameter passed to executeQuery function
Pradeep Nayak [Thu, 23 Jan 2020 01:41:36 +0000 (01:41 +0000)]
Wrong parameter passed to executeQuery function

4 years agodev/translation#35 Display the CiviCRM Resources dashlet in the user's language
Mathieu Lutfy [Wed, 22 Jan 2020 22:38:32 +0000 (17:38 -0500)]
dev/translation#35 Display the CiviCRM Resources dashlet in the user's language

4 years agoMerge pull request #16351 from colemanw/debug
Eileen McNaughton [Wed, 22 Jan 2020 18:52:10 +0000 (07:52 +1300)]
Merge pull request #16351 from colemanw/debug

Add debug info to api4 output

4 years agoMerge pull request #16260 from eileenmcnaughton/ids_2
Eileen McNaughton [Wed, 22 Jan 2020 18:48:31 +0000 (07:48 +1300)]
Merge pull request #16260 from eileenmcnaughton/ids_2

[REF] Fix CRM_Core_BAO_UFGroup::createUFJoin to not receive by reference.

4 years agoAdd debug info to api4 output
Coleman Watts [Wed, 22 Jan 2020 11:46:30 +0000 (06:46 -0500)]
Add debug info to api4 output

4 years agoRemove irrelevant code.
eileen [Mon, 20 Jan 2020 20:05:16 +0000 (09:05 +1300)]
Remove irrelevant code.

In making this fn non-static we established it is only called from this  function  so
this cannot be true

4 years agoMerge pull request #16349 from eileenmcnaughton/credit
Yashodha Chaku [Wed, 22 Jan 2020 05:31:59 +0000 (11:01 +0530)]
Merge pull request #16349 from eileenmcnaughton/credit

Remove unreachable code lines.

4 years agoMerge pull request #16307 from seamuslee001/dev_mail_59
Eileen McNaughton [Wed, 22 Jan 2020 03:20:09 +0000 (16:20 +1300)]
Merge pull request #16307 from seamuslee001/dev_mail_59

dev/mailing#59 Add in provider option IMAP_XOAUTH2 to assist with goo…

4 years agoRemove unreachable code lines.
eileen [Wed, 22 Jan 2020 02:50:50 +0000 (15:50 +1300)]
Remove unreachable code lines.

We were very precautionary in Barcelona & deprecated rather than removing these line. However, we've had
several releases including a security release & an ESR since then with no one reporting hitting these so
they can go now

4 years agoMerge pull request #16326 from wmortada/core#1537
Eileen McNaughton [Wed, 22 Jan 2020 02:45:08 +0000 (15:45 +1300)]
Merge pull request #16326 from wmortada/core#1537

dev/core#1537 Don't append multiple copies of the eligible related contacts text

4 years agoMerge pull request #16286 from alifrumin/offlineContributor
Eileen McNaughton [Wed, 22 Jan 2020 01:32:52 +0000 (14:32 +1300)]
Merge pull request #16286 from alifrumin/offlineContributor

Add "Contributor Name" to Offline Contribution Receipts

4 years agoMerge pull request #16343 from colemanw/abstract
Eileen McNaughton [Wed, 22 Jan 2020 01:31:52 +0000 (14:31 +1300)]
Merge pull request #16343 from colemanw/abstract

Api4 - Make abstract function abstract

4 years agoMerge pull request #16346 from colemanw/entityGet
Eileen McNaughton [Wed, 22 Jan 2020 01:31:26 +0000 (14:31 +1300)]
Merge pull request #16346 from colemanw/entityGet

Api4 - Improve Entity::get

4 years agoMerge pull request #16347 from demeritcowboy/name-label-yet-again
Eileen McNaughton [Wed, 22 Jan 2020 01:29:14 +0000 (14:29 +1300)]
Merge pull request #16347 from demeritcowboy/name-label-yet-again

dev/core#1116 Wrong linebreaks viewing Inbound Emails when activity type label is changed

4 years agoMerge pull request #16337 from eileenmcnaughton/ev_static
Seamus Lee [Wed, 22 Jan 2020 00:23:38 +0000 (11:23 +1100)]
Merge pull request #16337 from eileenmcnaughton/ev_static

Change function buildEventFeeForm to non-static