civicrm-core.git
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 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 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 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 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

4 years agowrong linebreaks when activity type label is changed
demeritcowboy [Tue, 21 Jan 2020 22:37:41 +0000 (17:37 -0500)]
wrong linebreaks when activity type label is changed

4 years agoMerge pull request #16344 from eileenmcnaughton/ev_test
Eileen McNaughton [Tue, 21 Jan 2020 18:54:48 +0000 (07:54 +1300)]
Merge pull request #16344 from eileenmcnaughton/ev_test

Fix unit test so price set params are valid

4 years agoMerge pull request #16340 from jitendrapurohit/dev-1540
Eileen McNaughton [Tue, 21 Jan 2020 05:13:43 +0000 (18:13 +1300)]
Merge pull request #16340 from jitendrapurohit/dev-1540

Add user friendly error message on merge error

4 years agoFix unit test so price set params are valid
eileen [Mon, 20 Jan 2020 21:15:49 +0000 (10:15 +1300)]
Fix unit test so price set params are valid

4 years agoAdd user friendly error message on merge error
Jitendra Purohit [Mon, 20 Jan 2020 05:56:47 +0000 (11:26 +0530)]
Add user friendly error message on merge error

4 years agoMerge pull request #16345 from eileenmcnaughton/ev_title
Seamus Lee [Tue, 21 Jan 2020 01:42:38 +0000 (12:42 +1100)]
Merge pull request #16345 from eileenmcnaughton/ev_title

Simplify event title retrieval, use cache, add test

4 years agoMerge pull request #16342 from JKingsnorth/patch-13
Seamus Lee [Tue, 21 Jan 2020 01:40:18 +0000 (12:40 +1100)]
Merge pull request #16342 from JKingsnorth/patch-13

[NFC] Remove unused local variables from CRM_Contribute_Form_AdditionalPayment::processCreditCard

4 years agoApi4 - Improve Entity::get
Coleman Watts [Mon, 20 Jan 2020 23:26:58 +0000 (18:26 -0500)]
Api4 - Improve Entity::get

Ensure that every php file found by the scanner is_a class inheriting from AbstractEntity.
Remove the CustomValue class by virtue of its class type instead of manually remove it.
Improve performance when fetching entities by name.

4 years agoSimplify event title retrieval, use cache, add test
eileen [Mon, 20 Jan 2020 21:33:52 +0000 (10:33 +1300)]
Simplify event title retrieval, use cache, add test

4 years agoMerge pull request #16341 from mattwire/membership_overridden
Eileen McNaughton [Mon, 20 Jan 2020 20:00:29 +0000 (09:00 +1300)]
Merge pull request #16341 from mattwire/membership_overridden

When viewing a membership show if the status is overridden

4 years agoApi4 - Make abstract function abstract
Coleman Watts [Mon, 20 Jan 2020 19:58:07 +0000 (14:58 -0500)]
Api4 - Make abstract function abstract

4 years agoRemove unused variable $now
John Kingsnorth [Mon, 20 Jan 2020 17:10:45 +0000 (17:10 +0000)]
Remove unused variable $now

4 years agoWhen viewing a membership show if the status is overridden
Matthew Wire [Mon, 20 Jan 2020 15:18:15 +0000 (15:18 +0000)]
When viewing a membership show if the status is overridden

4 years agoRemove unused local variable $fields
John Kingsnorth [Mon, 20 Jan 2020 16:53:32 +0000 (16:53 +0000)]
Remove unused local variable $fields

4 years agoMerge pull request #14591 from JKingsnorth/dev/core#1064
colemanw [Mon, 20 Jan 2020 15:13:30 +0000 (10:13 -0500)]
Merge pull request #14591 from JKingsnorth/dev/core#1064

dev/core#1064 Allow personalised 'view in browser' links for mass emails

4 years agoChangee buildEventFeeForm to non-static
eileen [Sun, 19 Jan 2020 17:46:28 +0000 (06:46 +1300)]
Changee buildEventFeeForm to non-static

I searched on thee full function name & also 'buildEvent' & 'feeForm' and I don't believe this is called
from outside this function. I want  to call it from tests to  fix some test set up issues butt
there are a bunch of undefined properties so I concluded I should set this up first.

4 years agoMerge pull request #16315 from eileenmcnaughton/var
colemanw [Sun, 19 Jan 2020 02:38:34 +0000 (21:38 -0500)]
Merge pull request #16315 from eileenmcnaughton/var

[REF] Remove setting of unused function.

4 years agoUpdate help to reflect new Export UI
Coleman Watts [Sun, 19 Jan 2020 01:26:34 +0000 (20:26 -0500)]
Update help to reflect new Export UI

4 years agoMerge pull request #16331 from eileenmcnaughton/cont_soft
Seamus Lee [Sun, 19 Jan 2020 00:36:07 +0000 (11:36 +1100)]
Merge pull request #16331 from eileenmcnaughton/cont_soft

[NFC] Code formatting

4 years agoClean up buildMappingForm which is no longer used by Export
Coleman Watts [Sat, 18 Jan 2020 23:41:02 +0000 (18:41 -0500)]
Clean up buildMappingForm which is no longer used by Export

buildMappingForm is now only used by Search Builder

4 years agoMerge pull request #16329 from eileenmcnaughton/ev_one
Eileen McNaughton [Sat, 18 Jan 2020 23:25:20 +0000 (12:25 +1300)]
Merge pull request #16329 from eileenmcnaughton/ev_one

Start to use function rather than multiple queries for event details add test

4 years agoMerge pull request #16333 from eileenmcnaughton/bounce
Eileen McNaughton [Sat, 18 Jan 2020 23:25:03 +0000 (12:25 +1300)]
Merge pull request #16333 from eileenmcnaughton/bounce

[REF] Move the bounce to the start of the form submit

4 years agoMerge pull request #16332 from seamuslee001/event_confirm_text_extend
Eileen McNaughton [Sat, 18 Jan 2020 22:32:07 +0000 (11:32 +1300)]
Merge pull request #16332 from seamuslee001/event_confirm_text_extend

[NFC] Extend unit test to cover for recent refactor by eileen to ensure sup…

4 years ago[REF] Move assignment of BalanceAmount
eileen [Sat, 18 Jan 2020 22:24:07 +0000 (11:24 +1300)]
[REF] Move assignment of BalanceAmount

This moves the assignment of balanceAmount to where the partial_payment_total is  determined.

Template assignments happen all over the place so it makes more sense to group this
which where the values are determined

4 years agoMove the bounce to the start of the form submit
eileen [Sat, 18 Jan 2020 07:30:01 +0000 (20:30 +1300)]
Move the bounce to the start of the form submit

4 years agoStart to use function rather than multiple queries for event details, add test
eileen [Fri, 17 Jan 2020 22:15:21 +0000 (11:15 +1300)]
Start to use function rather than multiple queries for event details, add test

4 years ago[NFC] Code formatting
eileen [Sat, 18 Jan 2020 07:04:52 +0000 (20:04 +1300)]
[NFC] Code formatting

4 years agoExtend unit test to cover for recent refactor by eileen to ensure support for CRM...
Seamus Lee [Sat, 18 Jan 2020 20:48:06 +0000 (07:48 +1100)]
Extend unit test to cover for recent refactor by eileen to ensure support for CRM-4196 remains

4 years agoMerge pull request #16330 from eileenmcnaughton/process_event
Seamus Lee [Sat, 18 Jan 2020 20:46:26 +0000 (07:46 +1100)]
Merge pull request #16330 from eileenmcnaughton/process_event

[REF] Eliminate silly parameter from function signature.

4 years agoMerge pull request #16018 from mattwire/manualcontributionstatus
Seamus Lee [Sat, 18 Jan 2020 20:33:25 +0000 (07:33 +1100)]
Merge pull request #16018 from mattwire/manualcontributionstatus

Fix retrieving contribution_status_id for manual payment processor

4 years agoMove exportui extension into core
Coleman Watts [Sat, 18 Jan 2020 19:50:25 +0000 (14:50 -0500)]
Move exportui extension into core

4 years agoAdd code docs to Api4/CustomValue
Coleman Watts [Sat, 18 Jan 2020 18:46:29 +0000 (13:46 -0500)]
Add code docs to Api4/CustomValue

4 years agoFix retrieving contribution_status_id for manual payment processor
Matthew Wire (MJW Consulting) [Wed, 13 Nov 2019 05:47:58 +0000 (18:47 +1300)]
Fix retrieving contribution_status_id for manual payment processor

4 years agoEliminate silly parameter from function signature.
eileen [Sat, 18 Jan 2020 06:46:23 +0000 (19:46 +1300)]
Eliminate silly parameter from function signature.

Removes the isAdditionalAmount parameter which is only used to adjust the amount key on the value variable.

Value is reset each participant so we don't need to worry about it being 'cumulative'

4 years agoMerge pull request #16316 from eileenmcnaughton/parent
Seamus Lee [Sat, 18 Jan 2020 05:27:23 +0000 (16:27 +1100)]
Merge pull request #16316 from eileenmcnaughton/parent

Remove function that exactly matches parent class.

4 years agoMerge pull request #16327 from eileenmcnaughton/pp
Seamus Lee [Sat, 18 Jan 2020 02:56:04 +0000 (13:56 +1100)]
Merge pull request #16327 from eileenmcnaughton/pp

Extract code for isPaymentOnExistingContribution.

4 years agoExtract code for isPaymentOnExistingContribution.
eileen [Fri, 17 Jan 2020 21:37:01 +0000 (10:37 +1300)]
Extract code for isPaymentOnExistingContribution.

This allows us to make the meaning of the IF clause clearer

4 years agoMerge pull request #16325 from eileenmcnaughton/ev
Eileen McNaughton [Sat, 18 Jan 2020 00:42:58 +0000 (13:42 +1300)]
Merge pull request #16325 from eileenmcnaughton/ev

[REF] Extract code that assigns event variables to the tpl

4 years agoMerge pull request #16314 from eileenmcnaughton/nfc
Seamus Lee [Fri, 17 Jan 2020 21:41:25 +0000 (08:41 +1100)]
Merge pull request #16314 from eileenmcnaughton/nfc

[NFC] Code cleanup

4 years agoExtract code that assigns event variables to the tpl
eileen [Fri, 17 Jan 2020 21:14:44 +0000 (10:14 +1300)]
Extract code that assigns event variables to the tpl

4 years agoDon't append multiple copies of the eligible related contacts text
William Mortada [Fri, 17 Jan 2020 21:19:56 +0000 (21:19 +0000)]
Don't append multiple copies of the eligible related contacts text

4 years agoMerge pull request #15992 from eileenmcnaughton/utf_temp
Matthew Wire [Fri, 17 Jan 2020 21:04:02 +0000 (21:04 +0000)]
Merge pull request #15992 from eileenmcnaughton/utf_temp

Update temp table handler to support utf8mb4 if that is the db collation

4 years agodev/mailing#59 Add in provider option IMAP_XOAUTH2 to assist with google's changes...
Seamus Lee [Thu, 16 Jan 2020 23:16:53 +0000 (10:16 +1100)]
dev/mailing#59 Add in provider option IMAP_XOAUTH2 to assist with google's changes to imap access

Apply PHP Syntax fix patch and update tests

Bump up to 1.9.1 of zetacomponents/mail to fix syntax issue

4 years ago[REF] Fix CRM_Core_BAO_UFGroup::createUFJoin to not receive by reference.
eileen [Thu, 9 Jan 2020 20:57:10 +0000 (09:57 +1300)]
[REF] Fix CRM_Core_BAO_UFGroup::createUFJoin to not receive by reference.

This function is called from one place. It gets passed a params variable that is 're-used' so this
change makes it clear what actually needs to be passed on. We have an anti-pattern in our code whereby params get
passed all sorts of places with it being confusing which ones actually need to receive what

4 years agoRemove function that exactly matches parent class.
eileen [Fri, 17 Jan 2020 01:29:18 +0000 (14:29 +1300)]
Remove function that exactly matches parent class.

I copied it over the parent class fn & apart from minor comment block differences it matches

4 years agoMerge pull request #15383 from michaelmcandrew/lab-1286
Seamus Lee [Fri, 17 Jan 2020 19:34:43 +0000 (06:34 +1100)]
Merge pull request #15383 from michaelmcandrew/lab-1286

also skip report instance header and footer (lab-1286)

4 years agoMerge pull request #16320 from mattwire/pcp_pagecleanup
Seamus Lee [Fri, 17 Jan 2020 19:06:48 +0000 (06:06 +1100)]
Merge pull request #16320 from mattwire/pcp_pagecleanup

NFC Convert Manage PCP page to short array syntax

4 years ago[NFC] Fix some missing exceptions etc
eileen [Fri, 17 Jan 2020 03:47:34 +0000 (16:47 +1300)]
[NFC] Fix some missing exceptions etc

4 years ago[NFC] Minor code tidy up
eileen [Fri, 17 Jan 2020 00:45:34 +0000 (13:45 +1300)]
[NFC] Minor code tidy up

Declare Exceptions, use strict comparison

4 years agoMerge pull request #16321 from colemanw/CheckBox
Seamus Lee [Fri, 17 Jan 2020 19:03:01 +0000 (06:03 +1100)]
Merge pull request #16321 from colemanw/CheckBox

dev/core#1535 - Fix missing address is_primary field

4 years agodev/core#1535 - Fix missing address is_primary field
Coleman Watts [Fri, 17 Jan 2020 14:05:44 +0000 (09:05 -0500)]
dev/core#1535 - Fix missing address is_primary field

4 years agoMerge pull request #16317 from eileenmcnaughton/duplicate
colemanw [Fri, 17 Jan 2020 12:44:52 +0000 (07:44 -0500)]
Merge pull request #16317 from eileenmcnaughton/duplicate

Remove duplicate line of code