civicrm-core.git
4 years agoMinimal fix for new enotice on case.subject
eileen [Sat, 26 Oct 2019 03:09:53 +0000 (16:09 +1300)]
Minimal fix for new enotice on case.subject

The new enotice is caused by treating it as a LIKE string rather than a strict match (which is generally
a good thing)

4 years agoMerge pull request #15370 from JMAConsulting/core-692-2
Eileen McNaughton [Sat, 26 Oct 2019 00:35:28 +0000 (13:35 +1300)]
Merge pull request #15370 from JMAConsulting/core-692-2

Core/dev#692 : Support search arguments to Case Search form

4 years agoMerge pull request #15611 from seamuslee001/ref_deleteentry_ussage
Seamus Lee [Sat, 26 Oct 2019 00:31:00 +0000 (11:31 +1100)]
Merge pull request #15611 from seamuslee001/ref_deleteentry_ussage

[REF] Remove usage of CRM_ACL_BAO_Cache::deleteEntry in favour of usi…

4 years agoMerge pull request #15608 from seamuslee001/more_fatal_exception
Seamus Lee [Sat, 26 Oct 2019 00:10:16 +0000 (11:10 +1100)]
Merge pull request #15608 from seamuslee001/more_fatal_exception

dev/core#560 Convert some more CRM_Core_Error::fatal to exception

4 years agoMerge pull request #15610 from seamuslee001/remove_crm_exception
Seamus Lee [Sat, 26 Oct 2019 00:07:01 +0000 (11:07 +1100)]
Merge pull request #15610 from seamuslee001/remove_crm_exception

[REF] Remove CRM_Exception in favour of CRM_Core_Exception

4 years ago[REF] Remove usage of CRM_ACL_BAO_Cache::deleteEntry in favour of using functions...
Seamus Lee [Fri, 25 Oct 2019 23:30:23 +0000 (10:30 +1100)]
[REF] Remove usage of CRM_ACL_BAO_Cache::deleteEntry in favour of using functions that just delete from the ACL caches

4 years agoMerge pull request #15578 from mattwire/redundant_format
Eileen McNaughton [Fri, 25 Oct 2019 22:58:41 +0000 (11:58 +1300)]
Merge pull request #15578 from mattwire/redundant_format

Remove a redundant call to formatParamsForPaymentProcessor in AdditionalPayment form

4 years agodev/core#560 Convert some more CRM_Core_Error::fatal to exception
Seamus Lee [Fri, 25 Oct 2019 20:53:52 +0000 (07:53 +1100)]
dev/core#560 Convert some more CRM_Core_Error::fatal to exception

Switch from statusBounce to Exception in CRM_Mailing_BAO_Mailing::checkPermission as not on form layer

4 years agoMerge pull request #15599 from MiyaNoctem/dev-core-1093-fix-issue-when-updating-custo...
Eileen McNaughton [Fri, 25 Oct 2019 22:28:50 +0000 (11:28 +1300)]
Merge pull request #15599 from MiyaNoctem/dev-core-1093-fix-issue-when-updating-custom-fields-with.logging

dev/core#1093: Fix Issue When Updating Custom Fields With Logging Enabled

4 years ago[REF] Remove CRM_Exception in favor of CRM_Core_Exception
Seamus Lee [Fri, 25 Oct 2019 22:26:27 +0000 (09:26 +1100)]
[REF] Remove CRM_Exception in favor of CRM_Core_Exception

4 years agoMerge pull request #15607 from eileenmcnaughton/matt_tidy
Eileen McNaughton [Fri, 25 Oct 2019 22:15:56 +0000 (11:15 +1300)]
Merge pull request #15607 from eileenmcnaughton/matt_tidy

[NFC] comments tidy up …

4 years ago[NFC] comments tidy up per https://github.com/civicrm/civicrm-core/pull/15479
eileen [Fri, 25 Oct 2019 20:49:07 +0000 (09:49 +1300)]
[NFC] comments tidy up per https://github.com/civicrm/civicrm-core/pull/15479

4 years agoMerge pull request #15604 from mattwire/multiplelocks
Eileen McNaughton [Fri, 25 Oct 2019 20:29:42 +0000 (09:29 +1300)]
Merge pull request #15604 from mattwire/multiplelocks

Remove CIVICRM_SUPPORT_MULTIPLE_LOCKS and make it always enabled if available

4 years agodev/core#1093: Add Custom Fields to Logging Tables
Camilo Rodríguez [Thu, 24 Oct 2019 18:34:54 +0000 (13:34 -0500)]
dev/core#1093: Add Custom Fields to Logging Tables

BulkSave method was adding fields to custom group table, but not to custom
group logging table. If these tables were updated on installation, before all
the schema is synced bewtween main and logging tables, fatal errors would be
thrown, as triggers tried to insert info into log tables missing required
fields.

Fixed by building log table after all fields are added to main table, and
before rebuilding triggers.

4 years agoMerge pull request #15594 from eileenmcnaughton/dedupe2
Matthew Wire [Fri, 25 Oct 2019 09:51:22 +0000 (10:51 +0100)]
Merge pull request #15594 from eileenmcnaughton/dedupe2

[REF] minor refactor towards removing complexity.

4 years agoMerge pull request #15590 from alifrumin/subjecthelp
Matthew Wire [Fri, 25 Oct 2019 09:46:37 +0000 (10:46 +0100)]
Merge pull request #15590 from alifrumin/subjecthelp

Add help text to payment processor subject field

4 years agoRemove CIVICRM_SUPPORT_MULTIPLE_LOCKS and make it always enabled if available
Matthew Wire (MJW Consulting) [Fri, 25 Oct 2019 09:36:54 +0000 (10:36 +0100)]
Remove CIVICRM_SUPPORT_MULTIPLE_LOCKS and make it always enabled if available

4 years agoMerge pull request #15603 from seamuslee001/nfc_acl_doc_block_update
Eileen McNaughton [Fri, 25 Oct 2019 03:00:50 +0000 (16:00 +1300)]
Merge pull request #15603 from seamuslee001/nfc_acl_doc_block_update

[NFC] dev/core#1336 Update doc blocks for various ACL related functions

4 years agoMerge pull request #15602 from eileenmcnaughton/item_2
Seamus Lee [Fri, 25 Oct 2019 01:01:24 +0000 (12:01 +1100)]
Merge pull request #15602 from eileenmcnaughton/item_2

[REF] minor extraction - Extract code to update line items to paid

4 years ago[NFC] dev/core#1336 Update doc blocks for various ACL related functions
Seamus Lee [Fri, 25 Oct 2019 00:38:43 +0000 (11:38 +1100)]
[NFC] dev/core#1336 Update doc blocks for various ACL related functions

4 years agoMerge pull request #15509 from eileenmcnaughton/setter
Seamus Lee [Fri, 25 Oct 2019 00:31:51 +0000 (11:31 +1100)]
Merge pull request #15509 from eileenmcnaughton/setter

dev/financial#82 Add getters & setters for contributionID on CRM_Core_Payment.

4 years agoExtract code to update line items to paid
eileen [Thu, 24 Oct 2019 23:33:45 +0000 (12:33 +1300)]
Extract code to update line items to paid

4 years agoAdd a bunch of additional getters & setters
eileen [Mon, 21 Oct 2019 02:13:52 +0000 (15:13 +1300)]
Add a bunch of additional getters & setters

4 years agoMerge pull request #15576 from mattwire/settingtraitfilter
Seamus Lee [Thu, 24 Oct 2019 22:16:19 +0000 (09:16 +1100)]
Merge pull request #15576 from mattwire/settingtraitfilter

Generic Settings Pages: Make getSettingPageFilter() public so we can use it in hooks

4 years agoMerge pull request #15503 from magnolia61/Generalize_Thank_You_in_Message_Templates
Seamus Lee [Thu, 24 Oct 2019 21:21:00 +0000 (08:21 +1100)]
Merge pull request #15503 from magnolia61/Generalize_Thank_You_in_Message_Templates

dev/core#1316 Update 'Thank You' & other corrections

4 years agoMerge pull request #15600 from civicrm/5.19
Seamus Lee [Thu, 24 Oct 2019 21:13:37 +0000 (08:13 +1100)]
Merge pull request #15600 from civicrm/5.19

5.19

4 years agoAdd getters & setters for contributionID on CRM_Core_Payment.
eileen [Tue, 15 Oct 2019 00:17:30 +0000 (13:17 +1300)]
Add getters & setters for contributionID on CRM_Core_Payment.

This will enable PaymentProcessor.pay to do ->setContributionID(['contribution_id'])
and set a pattern for definining other standardised parameters.

4 years agoMerge pull request #15597 from colemanw/apiPath
Seamus Lee [Thu, 24 Oct 2019 20:43:47 +0000 (07:43 +1100)]
Merge pull request #15597 from colemanw/apiPath

Update api3 explorer url path for consistency

4 years agoMake getSettingPageFilter() public so we can conditionally load resources in hooks
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:27:36 +0000 (15:27 +0100)]
Make getSettingPageFilter() public so we can conditionally load resources in hooks

4 years agoMerge pull request #15598 from alifrumin/rn5.19
Seamus Lee [Thu, 24 Oct 2019 19:35:46 +0000 (06:35 +1100)]
Merge pull request #15598 from alifrumin/rn5.19

5.19 Release Notes - first pass of sorting, annotating and editing

4 years ago5.19 Release Notes - first pass
Alice Frumin [Fri, 18 Oct 2019 00:14:02 +0000 (20:14 -0400)]
5.19 Release Notes - first pass

4 years agoMerge pull request #1 from civicrm/master
Camilo Rodríguez [Thu, 24 Oct 2019 16:38:51 +0000 (11:38 -0500)]
Merge pull request #1 from civicrm/master

Updating Fork with Commits on Base

4 years agoUpdate api3 explorer url path for consistency
Coleman Watts [Thu, 24 Oct 2019 15:04:30 +0000 (11:04 -0400)]
Update api3 explorer url path for consistency

4 years agoRemove for-each as silly
eileen [Thu, 24 Oct 2019 02:42:37 +0000 (15:42 +1300)]
Remove for-each as silly

4 years agoRemove IF as always true
eileen [Thu, 24 Oct 2019 02:40:06 +0000 (15:40 +1300)]
Remove IF as always true

4 years ago[REF] minor refactor towards removing complexity.
eileen [Thu, 24 Oct 2019 02:37:19 +0000 (15:37 +1300)]
[REF] minor refactor towards removing complexity.

This change actually makes the foreach & if following it redundant. I left them out for legibility
but basically all the wrangling is on the 'other' contact. We do just one thing with the 'main'
contact so the whole foreach & if is silly. Will follow up with removal of those

4 years agoMerge pull request #15546 from eileenmcnaughton/group_type
Seamus Lee [Thu, 24 Oct 2019 02:25:10 +0000 (13:25 +1100)]
Merge pull request #15546 from eileenmcnaughton/group_type

dev/core#1321 [test] add unit test to demonstrate behaviour

4 years agoMerge pull request #15564 from eileenmcnaughton/deprectate
Seamus Lee [Wed, 23 Oct 2019 21:30:25 +0000 (08:30 +1100)]
Merge pull request #15564 from eileenmcnaughton/deprectate

dev/financial#79 minimal deprecation of Contribution.transact.

4 years agoMerge pull request #15591 from eileenmcnaughton/noisy_deprecate_transact
Seamus Lee [Wed, 23 Oct 2019 21:29:08 +0000 (08:29 +1100)]
Merge pull request #15591 from eileenmcnaughton/noisy_deprecate_transact

Add noisy deprecation warning to Contribution.transact

4 years agodev/financial#79 minimal deprecation of Contribution.transact.
eileen [Mon, 21 Oct 2019 03:35:09 +0000 (16:35 +1300)]
dev/financial#79 minimal deprecation of Contribution.transact.

It seems urgent that we so some deprecation of this api - this is the absolute minimum.

More would involve creating some noise when people use it but there
is a separate issue for that. This is just to geet it out of being 'promoted'
by the api explorer

4 years agoMerge pull request #15589 from mfb/obsolete-method
colemanw [Wed, 23 Oct 2019 19:46:16 +0000 (15:46 -0400)]
Merge pull request #15589 from mfb/obsolete-method

Remove obsolete supportStorageOfAccents() method.

4 years agoAdd noisy deprecation warning to Contribution.transact
eileen [Wed, 23 Oct 2019 19:27:45 +0000 (08:27 +1300)]
Add noisy deprecation warning to Contribution.transact

Note that the Order api has been an adequate replacement for over a year - per efforts by wordpress integration

4 years agoadd help text to payment processor subject field
Alice Frumin [Wed, 23 Oct 2019 17:38:40 +0000 (13:38 -0400)]
add help text to payment processor subject field

4 years agoRemove obsolete method.
mark burdett [Wed, 23 Oct 2019 17:13:09 +0000 (10:13 -0700)]
Remove obsolete method.

4 years agoMerge pull request #15504 from mattwire/transact
colemanw [Wed, 23 Oct 2019 13:44:48 +0000 (09:44 -0400)]
Merge pull request #15504 from mattwire/transact

Extract deprecated Contribution.transact API into it's own file

4 years agoMerge pull request #15587 from eileenmcnaughton/dedupe
Matthew Wire [Wed, 23 Oct 2019 11:48:53 +0000 (12:48 +0100)]
Merge pull request #15587 from eileenmcnaughton/dedupe

[REF] minor extraction in dedupe code

4 years agoMerge pull request #15581 from mountev/street-address-sorting-contact-detail-report
Yashodha Chaku [Wed, 23 Oct 2019 06:04:51 +0000 (11:34 +0530)]
Merge pull request #15581 from mountev/street-address-sorting-contact-detail-report

Support street address sorting for contact detail report

4 years ago[REF] extract part of the function to build the location blocks
eileen [Wed, 23 Oct 2019 01:25:01 +0000 (14:25 +1300)]
[REF] extract part of the function to build the location blocks

Who hates the variable 'moniker'?

4 years agoMerge pull request #15584 from civicrm/5.19
Seamus Lee [Wed, 23 Oct 2019 00:20:29 +0000 (11:20 +1100)]
Merge pull request #15584 from civicrm/5.19

5.19

4 years agoMerge pull request #15583 from seamuslee001/5.19
Tim Otten [Wed, 23 Oct 2019 00:08:02 +0000 (17:08 -0700)]
Merge pull request #15583 from seamuslee001/5.19

5.18.4 Release notes

4 years agoMerge pull request #15579 from mattwire/additionalpayment_fixstatusbounce
Eileen McNaughton [Wed, 23 Oct 2019 00:06:19 +0000 (13:06 +1300)]
Merge pull request #15579 from mattwire/additionalpayment_fixstatusbounce

Fix parameters for statusBounce in AdditionalPayment

4 years agoUpdate 5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:53:11 +0000 (16:53 -0700)]
Update 5.18.4.md

4 years ago5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:48:52 +0000 (16:48 -0700)]
5.18.4.md

There was some ambiguity between original problem-report and PR-description.
Update per MM.

4 years agorelease-notes/5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:38:47 +0000 (16:38 -0700)]
release-notes/5.18.4.md

4 years agoMerge pull request #15548 from eileenmcnaughton/order
Seamus Lee [Tue, 22 Oct 2019 23:05:58 +0000 (10:05 +1100)]
Merge pull request #15548 from eileenmcnaughton/order

Support chaining Payment.create from Order api

4 years agostreet address sorting for contact detail report
Mountev [Sun, 20 Oct 2019 21:43:32 +0000 (22:43 +0100)]
street address sorting for contact detail report

4 years agoMerge pull request #15577 from mattwire/translate_additionalpayment
Seamus Lee [Tue, 22 Oct 2019 21:04:17 +0000 (08:04 +1100)]
Merge pull request #15577 from mattwire/translate_additionalpayment

Translate two string in AdditionalPayment form

4 years agoTranslate two string in AdditionalPayment form
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:33:27 +0000 (15:33 +0100)]
Translate two string in AdditionalPayment form

4 years agoFix parameters for statusBounce in AdditionalPayment
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:41:51 +0000 (15:41 +0100)]
Fix parameters for statusBounce in AdditionalPayment

4 years agoRemove a redundant call to formatParamsForPaymentProcessor in AdditionalPayment form
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:35:28 +0000 (15:35 +0100)]
Remove a redundant call to formatParamsForPaymentProcessor in AdditionalPayment form

4 years agoMerge pull request #15520 from compucorp/fix-date-format-values
Matthew Wire [Tue, 22 Oct 2019 14:24:49 +0000 (15:24 +0100)]
Merge pull request #15520 from compucorp/fix-date-format-values

Make sure labels match the actual date input format

4 years agoMerge pull request #15572 from civicrm/5.19
Eileen McNaughton [Tue, 22 Oct 2019 00:00:46 +0000 (13:00 +1300)]
Merge pull request #15572 from civicrm/5.19

5.19 to master

4 years agoMerge pull request #15569 from eileenmcnaughton/pay_notice
Seamus Lee [Mon, 21 Oct 2019 23:52:51 +0000 (10:52 +1100)]
Merge pull request #15569 from eileenmcnaughton/pay_notice

Enotice fix (unreleased enotice)

4 years agoMerge pull request #15537 from eileenmcnaughton/pay_check
Seamus Lee [Mon, 21 Oct 2019 23:47:54 +0000 (10:47 +1100)]
Merge pull request #15537 from eileenmcnaughton/pay_check

Fix a regression whereby payment details are not saved from the AdditionalPayment form

4 years agoEnotice fix
eileen [Mon, 21 Oct 2019 21:56:59 +0000 (10:56 +1300)]
Enotice fix

per https://github.com/civicrm/civicrm-core/pull/15545#issuecomment-544531438

4 years agoSupport payment related fields on Payment.Create
eileen [Fri, 18 Oct 2019 04:20:40 +0000 (17:20 +1300)]
Support payment related fields on Payment.Create

On some digging I found that various payment related fields like pan_truncation & card_type_id were
being quietly ignored rather than saved by Payment.create

The additional payment form now uses this api so it is a regression on that form.

This fixes the metadata, tests & support for payment-related trxn fields

4 years agoMerge pull request #15567 from yashodha/report_cleanup
Eileen McNaughton [Mon, 21 Oct 2019 20:15:17 +0000 (09:15 +1300)]
Merge pull request #15567 from yashodha/report_cleanup

CRM-21677 - report clean up for case demographic report

4 years agoMerge pull request #15568 from eileenmcnaughton/test_pp
Eileen McNaughton [Mon, 21 Oct 2019 19:18:00 +0000 (08:18 +1300)]
Merge pull request #15568 from eileenmcnaughton/test_pp

Combine IF clause for readability.

4 years agoMerge pull request #15565 from eileenmcnaughton/payment_processor_label
Eileen McNaughton [Mon, 21 Oct 2019 19:17:24 +0000 (08:17 +1300)]
Merge pull request #15565 from eileenmcnaughton/payment_processor_label

Fix  bug whereby cidZero does not prepopulate billing details for selected contact for pay later.

4 years agoUpdate 'Thank You' & other corrections in message templates
Elliott Eggleston [Mon, 7 Oct 2019 14:24:37 +0000 (16:24 +0200)]
Update 'Thank You' & other corrections in message templates

4 years agoMerge pull request #14894 from eileenmcnaughton/date_fisc
Eileen McNaughton [Mon, 21 Oct 2019 11:39:09 +0000 (00:39 +1300)]
Merge pull request #14894 from eileenmcnaughton/date_fisc

Add freeform relative date for 'This Fiscal Year'

4 years agoCombine IF clause for readability.
eileen [Mon, 21 Oct 2019 10:59:41 +0000 (23:59 +1300)]
Combine IF clause for readability.

I'm still making sense of https://github.com/civicrm/civicrm-core/pull/15330 but these
lines are simply a readability change & 'hiving them off' into a separate PR & getting that
merged should make the actual changes in that PR more parsable.

4 years agoCRM-21677 - report clean up for case demographic report
yashodha [Mon, 21 Oct 2019 10:52:29 +0000 (16:22 +0530)]
CRM-21677 - report clean up for case demographic report

4 years agoMerge pull request #15550 from eileenmcnaughton/api3_template
Matthew Wire [Mon, 21 Oct 2019 10:16:22 +0000 (11:16 +0100)]
Merge pull request #15550 from eileenmcnaughton/api3_template

Filter out is_template contributions by default

4 years agoMerge pull request #15566 from civicrm/5.19
Eileen McNaughton [Mon, 21 Oct 2019 07:23:50 +0000 (20:23 +1300)]
Merge pull request #15566 from civicrm/5.19

5.19

4 years agoMerge pull request #15561 from eileenmcnaughton/payment_amount
Seamus Lee [Mon, 21 Oct 2019 06:59:09 +0000 (17:59 +1100)]
Merge pull request #15561 from eileenmcnaughton/payment_amount

dev/core#1333 Fix incorrect balance amount on fully paid payment

4 years agoFix bug whereby cidZero does not prepopulate billing details for selected contact...
eileen [Mon, 21 Oct 2019 04:43:40 +0000 (17:43 +1300)]
Fix  bug whereby cidZero does not prepopulate billing details for selected contact for pay later.

To replicate
1) create a contribution page  & select  pay later   (and no other processor)  with 'billing  address required'
2) access the contribution page with cid=0 in the url
3) select a contact - witness  the contacts  detaisl have NOT loaded  into the billing block
4) follow the same steps  on event

I was trying to reduce complexity on  this form for another  change when  I realised  that  the variable
to determine  whether to show the block  was  wrong  when  billing details  were  required  for
pay later and  on testing  there  seemed now downside (other than a very minor performance
hit in  obscure  circumstances) in just always loading the billing profile  details.

I saw no js error  when the billing block was  NOT present  and we are already checking
the person has access  to see the contact so that is not an issue here (Profile.get
does a permission check

4 years agoMerge pull request #15563 from civicrm/5.19
Eileen McNaughton [Mon, 21 Oct 2019 03:36:50 +0000 (16:36 +1300)]
Merge pull request #15563 from civicrm/5.19

5.19  to master

4 years agoMerge pull request #15558 from eileenmcnaughton/report_page519
Eileen McNaughton [Mon, 21 Oct 2019 03:35:59 +0000 (16:35 +1300)]
Merge pull request #15558 from eileenmcnaughton/report_page519

(dev/core#1252) Fix paging on contact summary

4 years agodev/core#1333 Fix incorrect balance amount on fully paid payment
eileen [Mon, 21 Oct 2019 00:46:55 +0000 (13:46 +1300)]
dev/core#1333 Fix incorrect balance amount on fully paid payment

Per https://lab.civicrm.org/dev/core/issues/1333 this is resulting in an incorrect balance.

The code was previously marked as highly dubious

4 years agodev/core#1321 [test] add unit test to demonstrate behaviour
eileen [Sat, 19 Oct 2019 00:49:17 +0000 (13:49 +1300)]
dev/core#1321 [test] add unit test to demonstrate behaviour

4 years agoSupport chaining Payment.create from Order api
eileen [Sat, 19 Oct 2019 02:30:51 +0000 (15:30 +1300)]
Support chaining Payment.create from Order api

4 years agoAttempt to fix paging on contact summary
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary

4 years agoMerge pull request #15539 from eileenmcnaughton/pay_back
Matthew Wire [Sun, 20 Oct 2019 18:04:44 +0000 (19:04 +0100)]
Merge pull request #15539 from eileenmcnaughton/pay_back

Rename balanceTrxnParams to paymentTrxnParams [REF]

4 years agoMerge pull request #15528 from eileenmcnaughton/report_page
Matthew Wire [Sun, 20 Oct 2019 18:02:16 +0000 (19:02 +0100)]
Merge pull request #15528 from eileenmcnaughton/report_page

dev/core#1252 Attempt to fix paging on contribution summary

4 years agoMerge pull request #15554 from demeritcowboy/casetype-xml-array
Matthew Wire [Sun, 20 Oct 2019 17:53:14 +0000 (18:53 +0100)]
Merge pull request #15554 from demeritcowboy/casetype-xml-array

dev/core#1335 - Prevent php warning when saving case type

4 years agoprevent php warning
DemeritCowboy [Sun, 20 Oct 2019 04:45:34 +0000 (00:45 -0400)]
prevent php warning

4 years agoMerge pull request #15551 from civicrm/5.19
Eileen McNaughton [Sat, 19 Oct 2019 23:21:52 +0000 (12:21 +1300)]
Merge pull request #15551 from civicrm/5.19

5.19  to master

4 years agoMerge pull request #15545 from eileenmcnaughton/pay_email_p
Eileen McNaughton [Sat, 19 Oct 2019 23:20:57 +0000 (12:20 +1300)]
Merge pull request #15545 from eileenmcnaughton/pay_email_p

dev/core#1322 Fix regression whereby Additional Payment Form not setting from when sending email confirmations

4 years agoFilter out is_template contributions by default
eileen [Sat, 19 Oct 2019 22:47:18 +0000 (11:47 +1300)]
Filter out is_template contributions by default

4 years agoMerge pull request #15431 from ejegg/templateContrib
Eileen McNaughton [Sat, 19 Oct 2019 01:19:50 +0000 (14:19 +1300)]
Merge pull request #15431 from ejegg/templateContrib

dev/financial#72 add 'Template' contribution status

4 years agoAttempt to fix paging on contact summary
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary

4 years agoEnsure a default FROM address is used when sending email confirmations
eileen [Fri, 18 Oct 2019 22:27:23 +0000 (11:27 +1300)]
Ensure a default FROM address is used when sending email confirmations

4 years agoMerge pull request #15542 from demeritcowboy/upgrade-convert-autoassignee-2
Eileen McNaughton [Fri, 18 Oct 2019 23:23:21 +0000 (12:23 +1300)]
Merge pull request #15542 from demeritcowboy/upgrade-convert-autoassignee-2

Upgrade script to flip autoassignees using bidirectional relationship in older civicase configs

4 years agoMerge pull request #15483 from demeritcowboy/say-my-name-2
Eileen McNaughton [Fri, 18 Oct 2019 21:48:16 +0000 (10:48 +1300)]
Merge pull request #15483 from demeritcowboy/say-my-name-2

dev/core#1046 - Fix name vs label for case roles - alternate with case type edit screen code cleanup

4 years agoMerge pull request #15491 from magnolia61/Additional_Email_Greetings_in_workflow_mess...
Eileen McNaughton [Fri, 18 Oct 2019 21:47:31 +0000 (10:47 +1300)]
Merge pull request #15491 from magnolia61/Additional_Email_Greetings_in_workflow_message_templates

dev/core#781 Additional email greetings in message templates

4 years agoMerge pull request #15540 from wmortada/unfreeze_membership_end_date
Eileen McNaughton [Fri, 18 Oct 2019 21:25:56 +0000 (10:25 +1300)]
Merge pull request #15540 from wmortada/unfreeze_membership_end_date

dev/core#1126 - Don't freeze the end date if the membership is linked to a recurring payment

4 years agoMerge pull request #15544 from civicrm/5.19
Eileen McNaughton [Fri, 18 Oct 2019 21:13:17 +0000 (10:13 +1300)]
Merge pull request #15544 from civicrm/5.19

5.19 to master

4 years agoMerge pull request #15538 from eileenmcnaughton/ppal_std
Eileen McNaughton [Fri, 18 Oct 2019 21:08:29 +0000 (10:08 +1300)]
Merge pull request #15538 from eileenmcnaughton/ppal_std

Regression fix on Paypal Std with memberships not being finalised correctly.

4 years agoMerge pull request #15543 from MegaphoneJon/reporting-22
Eileen McNaughton [Fri, 18 Oct 2019 21:08:01 +0000 (10:08 +1300)]
Merge pull request #15543 from MegaphoneJon/reporting-22

fix 'balance due' on Pledge Detail for non-US installs