civicrm-core.git
5 years ago[NFC] array formatting tricksy tricksie file (another)
eileen [Fri, 5 Apr 2019 06:41:22 +0000 (19:41 +1300)]
[NFC] array formatting tricksy tricksie file (another)

5 years agoMerge pull request #13967 from eileenmcnaughton/activity_token
Eileen McNaughton [Fri, 5 Apr 2019 04:19:08 +0000 (17:19 +1300)]
Merge pull request #13967 from eileenmcnaughton/activity_token

[REF] extract token functions

5 years agoMerge pull request #13964 from eileenmcnaughton/test
Eileen McNaughton [Fri, 5 Apr 2019 04:18:07 +0000 (17:18 +1300)]
Merge pull request #13964 from eileenmcnaughton/test

Improve data when known time-dependent-failing test fails

5 years agoMerge pull request #13965 from eileenmcnaughton/member_test
Eileen McNaughton [Fri, 5 Apr 2019 04:17:05 +0000 (17:17 +1300)]
Merge pull request #13965 from eileenmcnaughton/member_test

Remove reference to non-iso date format from membership form tests

5 years ago[REF] extract token functions
eileen [Fri, 5 Apr 2019 03:13:51 +0000 (16:13 +1300)]
[REF] extract token functions

This is an reviewer's commit from https://github.com/civicrm/civicrm-core/pull/12012/files

We are about to merge array formatting changes that will make lots of PRs go stale.

I couldn't get this reviewed & merged before the change but I thought if I could do it
through a sub-commit it would be better than just making it go stale.

This is a simple extraction & I will add merge on pass as it is a reviewer's commit

5 years agoRemove reference to non-iso date format from membership form tests
eileen [Fri, 5 Apr 2019 02:51:37 +0000 (15:51 +1300)]
Remove reference to non-iso date format from membership form tests

The date format wrangling is not handled by datepicker on the js layer so the php
layer no longer needs to test for this

5 years agoMerge pull request #13961 from eileenmcnaughton/validate
colemanw [Fri, 5 Apr 2019 02:27:03 +0000 (22:27 -0400)]
Merge pull request #13961 from eileenmcnaughton/validate

Allow extensions to enable validate.tpl

5 years agoMerge pull request #13962 from eileenmcnaughton/test_fix_recur
Eileen McNaughton [Fri, 5 Apr 2019 02:15:00 +0000 (15:15 +1300)]
Merge pull request #13962 from eileenmcnaughton/test_fix_recur

Flush ContributionRecur static cache when flushing processors

5 years agoImprove data when known time-dependent-failing test fails
eileen [Fri, 5 Apr 2019 01:38:50 +0000 (14:38 +1300)]
Improve data when known time-dependent-failing test fails

5 years agoFlush ContributionRecur static cache when flushing processors
eileen [Fri, 5 Apr 2019 00:40:11 +0000 (13:40 +1300)]
Flush ContributionRecur static cache when flushing processors

When creating a processor in a unit test it may not be available to use when creating
a recurring in the same test without flushing the static cache here

5 years agoMerge pull request #13935 from eileenmcnaughton/recur_cancel_load
Matthew Wire [Thu, 4 Apr 2019 23:23:07 +0000 (00:23 +0100)]
Merge pull request #13935 from eileenmcnaughton/recur_cancel_load

dev/core#704 Fix loss of links for recurrings with no payment_processor_id

5 years agoAllow payment processors to enable validate.tpl
eileen [Thu, 4 Apr 2019 23:10:45 +0000 (12:10 +1300)]
Allow payment processors to enable validate.tpl

From https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/issues/106
I found that I couldn't enable our validation from the payment processor currently.

It's a bit immature in that our front end presentation is poor,but this allows us to
start improving that

5 years agoMerge pull request #13699 from mattwire/contributionrecur_report_by_payment_processor_id
Eileen McNaughton [Thu, 4 Apr 2019 22:55:10 +0000 (11:55 +1300)]
Merge pull request #13699 from mattwire/contributionrecur_report_by_payment_processor_id

Add payment_processor column/filter to recurring contribution report

5 years agoMerge pull request #13960 from eileenmcnaughton/master
Eileen McNaughton [Thu, 4 Apr 2019 22:43:59 +0000 (11:43 +1300)]
Merge pull request #13960 from eileenmcnaughton/master

Grammar fixes

5 years agoMerge pull request #13957 from mattwire/extract_assignpaymentfields
Eileen McNaughton [Thu, 4 Apr 2019 22:43:40 +0000 (11:43 +1300)]
Merge pull request #13957 from mattwire/extract_assignpaymentfields

Extract assignPaymentFields

5 years agoMerge pull request #13899 from eileenmcnaughton/line_item
Eileen McNaughton [Thu, 4 Apr 2019 22:38:08 +0000 (11:38 +1300)]
Merge pull request #13899 from eileenmcnaughton/line_item

Move code to assign tax information into shared parent

5 years agoMove code to assign tax information into shared parent
eileen [Wed, 27 Mar 2019 06:23:28 +0000 (19:23 +1300)]
Move code to assign tax information into shared parent

5 years agoGrammar fixes
eileen [Thu, 4 Apr 2019 21:28:12 +0000 (10:28 +1300)]
Grammar fixes

5 years agoMerge pull request #13944 from agileware/CIVICRM-1140
Eileen McNaughton [Thu, 4 Apr 2019 21:22:33 +0000 (10:22 +1300)]
Merge pull request #13944 from agileware/CIVICRM-1140

Added a DB check to prevent deleting exisiting CiviCRM data from database.

5 years agoMerge pull request #13950 from seamuslee001/convert_receive_renewal_date_membership
Eileen McNaughton [Thu, 4 Apr 2019 21:19:52 +0000 (10:19 +1300)]
Merge pull request #13950 from seamuslee001/convert_receive_renewal_date_membership

Convert receive_date and renewal_date on membership forms to use date…

5 years agoMerge pull request #13955 from colemanw/Promise
Eileen McNaughton [Thu, 4 Apr 2019 20:43:13 +0000 (09:43 +1300)]
Merge pull request #13955 from colemanw/Promise

Promise Polyfill for older browsers

5 years agoMerge pull request #13906 from agh1/whygroupcontribamt
Eileen McNaughton [Thu, 4 Apr 2019 19:29:29 +0000 (08:29 +1300)]
Merge pull request #13906 from agh1/whygroupcontribamt

dev/core#655 Don't sum on the contribution total_amount in contribution detail report

5 years agoMerge pull request #13762 from mattwire/event_register_thankyou_region
Eileen McNaughton [Thu, 4 Apr 2019 19:24:20 +0000 (08:24 +1300)]
Merge pull request #13762 from mattwire/event_register_thankyou_region

Add billingblock region to event registration thankyou to match contribution thankyou

5 years agoPromise Polyfill for older browsers
Coleman Watts [Thu, 4 Apr 2019 01:52:15 +0000 (21:52 -0400)]
Promise Polyfill for older browsers

5 years agoMerge pull request #13953 from eileenmcnaughton/pay_api
Matthew Wire [Thu, 4 Apr 2019 12:34:13 +0000 (13:34 +0100)]
Merge pull request #13953 from eileenmcnaughton/pay_api

Add minimal PaymentProcessor.pay api

5 years agoMerge pull request #13946 from agileware/CIVICRM-1163
Matthew Wire [Thu, 4 Apr 2019 10:34:38 +0000 (11:34 +0100)]
Merge pull request #13946 from agileware/CIVICRM-1163

Replaced get_headers functions call with Guzzle HTTP request.

5 years agoExtract assignPaymentFields
Matthew Wire (MJW Consulting) [Thu, 4 Apr 2019 10:05:21 +0000 (11:05 +0100)]
Extract assignPaymentFields

5 years agoUpdated the timeout to 500ms.
Alok Patel [Thu, 4 Apr 2019 08:28:09 +0000 (13:58 +0530)]
Updated the timeout to 500ms.

5 years agoFix tests and ensure that receive_date is always set
Seamus Lee [Thu, 4 Apr 2019 06:16:58 +0000 (17:16 +1100)]
Fix tests and ensure that receive_date is always set

5 years agoMerge pull request #13952 from eileenmcnaughton/refund
Eileen McNaughton [Thu, 4 Apr 2019 03:15:30 +0000 (16:15 +1300)]
Merge pull request #13952 from eileenmcnaughton/refund

dev/financial#38 : Support refund payment using payment processor

5 years agoMerge pull request #13954 from eileenmcnaughton/payment_processor_title
Eileen McNaughton [Thu, 4 Apr 2019 03:15:10 +0000 (16:15 +1300)]
Merge pull request #13954 from eileenmcnaughton/payment_processor_title

dev/financial#2 add PaymentProcessor.title field

5 years agoConvert recieve_date and renewal_date on membership forms to use datepicker rather...
Seamus Lee [Thu, 4 Apr 2019 00:07:29 +0000 (11:07 +1100)]
Convert recieve_date and renewal_date on membership forms to use datepicker rather than jcalendar

5 years agoCIVICRM-1163: Replaced get_headers functions call with Guzzle HTTP request.
Alok Patel [Thu, 4 Apr 2019 03:02:09 +0000 (08:32 +0530)]
CIVICRM-1163: Replaced get_headers functions call with Guzzle HTTP request.

5 years agoAdd basic Pay api
eileen [Thu, 4 Apr 2019 01:06:29 +0000 (14:06 +1300)]
Add basic Pay api

5 years agodev/financial#2 add PaymentProcessor.title field
eileen [Thu, 4 Apr 2019 01:39:17 +0000 (14:39 +1300)]
dev/financial#2 add PaymentProcessor.title field

There was a long discussion a while back about adding a label or title field to the
civicrm_payment_processor table. It kinda died but since 5.13 adds another field
(contribution_recur.cancel_reason) which is kinda rare I thought we should probably
add this field in the same release as we can better keep most releases to no
schema changes that way.

At this stage the field is not in use - but I figure getting it added will make the
next steps of exposing it easier & there is general agreement we need
something of this nature.

(the cancel reason field will also take further commits to expose in the UI)

5 years agodev/financial#38 : Support refund payment using payment processor
Monish Deb [Fri, 8 Mar 2019 12:48:33 +0000 (18:18 +0530)]
dev/financial#38 : Support refund payment using payment processor

5 years agoMerge pull request #13940 from eileenmcnaughton/recur_form
Seamus Lee [Thu, 4 Apr 2019 00:51:53 +0000 (11:51 +1100)]
Merge pull request #13940 from eileenmcnaughton/recur_form

Rationalise url variables onto shared parent for recurring contribution forms

5 years agoMerge pull request #13435 from agileware/GREENS-199
Eileen McNaughton [Thu, 4 Apr 2019 00:38:12 +0000 (13:38 +1300)]
Merge pull request #13435 from agileware/GREENS-199

Optimise the loading of the CiviCRM Deduplication Exception page

5 years agoMerge pull request #13934 from seamuslee001/unfork_zeta_components
Eileen McNaughton [Thu, 4 Apr 2019 00:16:03 +0000 (13:16 +1300)]
Merge pull request #13934 from seamuslee001/unfork_zeta_components

Unfork Zetacomponents mail and use patch to apply differences

5 years agoMerge pull request #12998 from agileware/CIVICRM-990
Eileen McNaughton [Thu, 4 Apr 2019 00:09:57 +0000 (13:09 +1300)]
Merge pull request #12998 from agileware/CIVICRM-990

Quote fee levels for regular expression in Participant search.

5 years agoMerge pull request #13947 from eileenmcnaughton/no_test
Seamus Lee [Wed, 3 Apr 2019 23:43:58 +0000 (10:43 +1100)]
Merge pull request #13947 from eileenmcnaughton/no_test

[unreleased regression] Add error handling for when no test procesor row exists.

5 years agoMerge pull request #13949 from eileenmcnaughton/sleep
Eileen McNaughton [Wed, 3 Apr 2019 23:17:19 +0000 (12:17 +1300)]
Merge pull request #13949 from eileenmcnaughton/sleep

Test fix

5 years agoMerge pull request #13948 from civicrm/5.12
Seamus Lee [Wed, 3 Apr 2019 22:29:23 +0000 (09:29 +1100)]
Merge pull request #13948 from civicrm/5.12

5.12

5 years agoTest fix
eileen [Wed, 3 Apr 2019 22:20:51 +0000 (11:20 +1300)]
Test fix

5 years agoMerge pull request #13853 from agh1/5.12.0-releasenotes
Tim Otten [Wed, 3 Apr 2019 22:12:27 +0000 (15:12 -0700)]
Merge pull request #13853 from agh1/5.12.0-releasenotes

5.12.0 release notes

5 years agoAdd error handling for when no test procesor row exists.
eileen [Wed, 3 Apr 2019 22:11:25 +0000 (11:11 +1300)]
Add error handling for when no test procesor row exists.

This is not really a valid config but for sites that have processors without test rows recent changes
will make that problematic. We can be nice

5 years agoUpdate 5.12.0.md
Tim Otten [Wed, 3 Apr 2019 21:53:26 +0000 (14:53 -0700)]
Update 5.12.0.md

5 years ago5.12.0 release notes: final edits
Andrew Hunt [Wed, 3 Apr 2019 21:42:56 +0000 (17:42 -0400)]
5.12.0 release notes: final edits

5 years ago5.12.0 release notes: late changes
Andrew Hunt [Wed, 3 Apr 2019 19:59:02 +0000 (15:59 -0400)]
5.12.0 release notes: late changes

5 years ago5.12.0 release notes: bulk of work
Alice Frumin [Tue, 19 Mar 2019 18:45:13 +0000 (14:45 -0400)]
5.12.0 release notes: bulk of work

5 years ago5.12.0 release notes: contributors
Alice Frumin [Tue, 19 Mar 2019 18:15:34 +0000 (14:15 -0400)]
5.12.0 release notes: contributors

5 years ago5.12.0 release notes: reorganizing
Alice Frumin [Tue, 19 Mar 2019 17:57:20 +0000 (13:57 -0400)]
5.12.0 release notes: reorganizing

5 years agoMerge pull request #13923 from seamuslee001/update_phpword_patches
Eileen McNaughton [Wed, 3 Apr 2019 18:56:31 +0000 (07:56 +1300)]
Merge pull request #13923 from seamuslee001/update_phpword_patches

Update PHPWord Patches to match the latest versions of their code

5 years agoMerge pull request #13945 from pradpnayak/subtypeDefaul
Eileen McNaughton [Wed, 3 Apr 2019 18:44:14 +0000 (07:44 +1300)]
Merge pull request #13945 from pradpnayak/subtypeDefaul

dev/core/issues/823, fixed code to set contact type correctly

5 years agoAdd payment_processor_id to recurring contribution report
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 14:42:33 +0000 (14:42 +0000)]
Add payment_processor_id to recurring contribution report

5 years agodev/core/issues/823, fixed code to set contact type correctly
Pradeep Nayak [Wed, 3 Apr 2019 16:41:16 +0000 (17:41 +0100)]
dev/core/issues/823, fixed code to set contact type correctly

5 years agoMerge pull request #13938 from jackrabbithanna/core-725
Seamus Lee [Wed, 3 Apr 2019 01:58:27 +0000 (12:58 +1100)]
Merge pull request #13938 from jackrabbithanna/core-725

Core/725 - Get state_province_id given non numeric country_id or country parameter

5 years agoMerge pull request #13943 from mlutfy/setMessageError
Eileen McNaughton [Wed, 3 Apr 2019 00:10:40 +0000 (13:10 +1300)]
Merge pull request #13943 from mlutfy/setMessageError

Fix status type (error, not fail) for CRM_Core_Session::setStatus

5 years agoget state_province_id given non numeric country_id or country parameter for APIv3...
Mark Hanna [Tue, 2 Apr 2019 15:19:47 +0000 (10:19 -0500)]
get state_province_id given non numeric country_id or country parameter for APIv3 Address

5 years agoMerge pull request #13927 from mlutfy/cart-php72
Eileen McNaughton [Tue, 2 Apr 2019 22:58:29 +0000 (11:58 +1300)]
Merge pull request #13927 from mlutfy/cart-php72

Event Cart: Fix PHP 7.2 fatal error (pass by ref)

5 years agoFix status type (error, not fail) for CRM_Core_Session::setStatus
Mathieu Lutfy [Tue, 2 Apr 2019 20:59:04 +0000 (16:59 -0400)]
Fix status type (error, not fail) for CRM_Core_Session::setStatus

5 years agoEvent Cart: Fix PHP 7.2 fatal error (pass by ref).
Mathieu Lutfy [Mon, 1 Apr 2019 14:39:57 +0000 (10:39 -0400)]
Event Cart: Fix PHP 7.2 fatal error (pass by ref).

5 years agoMerge pull request #13942 from civicrm/5.12
Eileen McNaughton [Tue, 2 Apr 2019 20:37:03 +0000 (09:37 +1300)]
Merge pull request #13942 from civicrm/5.12

5.12 to master

5 years agoMerge pull request #13939 from eileenmcnaughton/website
Eileen McNaughton [Tue, 2 Apr 2019 20:36:36 +0000 (09:36 +1300)]
Merge pull request #13939 from eileenmcnaughton/website

dev/core/issues/842, Fixed code to update website rather delete

5 years agoRationalise url variables onto shared parent for recurring contribution forms
eileen [Mon, 1 Apr 2019 23:37:36 +0000 (12:37 +1300)]
Rationalise url variables onto shared parent for recurring contribution forms

5 years agoMerge pull request #13051 from mlutfy/customvalue-checkbox-display
Eileen McNaughton [Tue, 2 Apr 2019 19:29:31 +0000 (08:29 +1300)]
Merge pull request #13051 from mlutfy/customvalue-checkbox-display

dev/core#499 Fix CustomField Checkbox display when values are non-sorted

5 years agodev/core/issues/842, Fixed code to update website rather delete
Pradeep Nayak [Mon, 1 Apr 2019 20:40:19 +0000 (21:40 +0100)]
dev/core/issues/842, Fixed code to update website rather delete

5 years agoMerge pull request #13936 from yashodha/dev-835
Eileen McNaughton [Tue, 2 Apr 2019 19:20:13 +0000 (08:20 +1300)]
Merge pull request #13936 from yashodha/dev-835

(dev/core#835) Expose Registered by Participant Name field to partici…

5 years agoMerge pull request #13931 from eileenmcnaughton/recur_cancel_reason
colemanw [Tue, 2 Apr 2019 14:25:48 +0000 (10:25 -0400)]
Merge pull request #13931 from eileenmcnaughton/recur_cancel_reason

Add shared parent for ContributionRecur forms

5 years agominor fix
yashodha [Tue, 2 Apr 2019 08:28:34 +0000 (13:58 +0530)]
minor fix

5 years ago(dev/core#835) Expose Registered by Participant Name field to participant report
yashodha [Tue, 2 Apr 2019 08:23:58 +0000 (13:53 +0530)]
(dev/core#835) Expose Registered by Participant Name field to participant report

5 years agodev/core#704 Fix loss of links for recurrings with no payment_processor_id
eileen [Tue, 2 Apr 2019 02:05:59 +0000 (15:05 +1300)]
dev/core#704 Fix loss of links for recurrings with no payment_processor_id

In 5.8 changes were made that remove the cancel links from recurring payments where the payment processor object
doesn't load. This is appropriate for cases where there IS a processor but it's disabled. However, it is not
unknown for sites to import contribution_recur records from elsewhere as data records rather than 'functional
records' & it is appropriate to be able to edit those.

We already have a relevant patter - loading payment processor 0 loads the manual processor
(class is CRM_Core_Manual) which has functionality appropriate to non-automated flows
(also known as the paylater processor).

This PR switches to the function CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorObject
which is a skinny wrapper on CRM_Contribute_BAO_ContributionRecur::getPaymentProcessor - which itself
was not actually called from core prior to this change (we didn't remove it as it was better than
functions in play & hence intended to start using it again). No processor is loaded
for an inactive processor so links do not appear there.

5 years agodev/core#499 Fix CustomField Checkbox display when values are non-sorted.
Mathieu Lutfy [Thu, 1 Nov 2018 18:40:47 +0000 (14:40 -0400)]
dev/core#499 Fix CustomField Checkbox display when values are non-sorted.

5 years agoMerge pull request #13933 from seamuslee001/master
Seamus Lee [Tue, 2 Apr 2019 01:06:46 +0000 (12:06 +1100)]
Merge pull request #13933 from seamuslee001/master

(NFC) Fix mode on files

5 years agoUnfork Zetacomponents mail and use patch to apply differences
Seamus Lee [Tue, 2 Apr 2019 00:15:36 +0000 (11:15 +1100)]
Unfork Zetacomponents mail and use patch to apply differences

5 years agoAdd shared parent for ContributionRecur forms
eileen [Mon, 1 Apr 2019 23:24:56 +0000 (12:24 +1300)]
Add shared parent for ContributionRecur forms

5 years agoMerge pull request #13930 from eileenmcnaughton/recur_cancel_reason
Eileen McNaughton [Mon, 1 Apr 2019 23:20:53 +0000 (12:20 +1300)]
Merge pull request #13930 from eileenmcnaughton/recur_cancel_reason

dev/core#830 Recur cancel reason

5 years agoAdd cancel_reason field
eileen [Mon, 1 Apr 2019 21:39:21 +0000 (10:39 +1300)]
Add cancel_reason field

5 years agoMerge pull request #12583 from omarabuhussein/dev/core#288
Eileen McNaughton [Mon, 1 Apr 2019 21:26:31 +0000 (10:26 +1300)]
Merge pull request #12583 from omarabuhussein/dev/core#288

dev/core#288 : Use the correct membership date for the notification that appear after completing the membership payment in case pre hook is used

5 years agoMerge pull request #13926 from pradpnayak/NoticeErrorProfile
Eileen McNaughton [Mon, 1 Apr 2019 20:36:10 +0000 (09:36 +1300)]
Merge pull request #13926 from pradpnayak/NoticeErrorProfile

dev/core/issues/840, fixed notice error

5 years agoMerge pull request #13854 from eileenmcnaughton/lock
Seamus Lee [Mon, 1 Apr 2019 20:27:43 +0000 (07:27 +1100)]
Merge pull request #13854 from eileenmcnaughton/lock

CRM-18011 improve lock handling for mysql 5.7.5+

5 years agoCIVICRM-990: Unit test to make sure regular expression in Participant search works.
Alok Patel [Mon, 1 Apr 2019 12:20:18 +0000 (17:50 +0530)]
CIVICRM-990: Unit test to make sure regular expression in Participant search works.

5 years agodev/core/issues/840, fixed notice error
Pradeep Nayak [Mon, 1 Apr 2019 11:33:58 +0000 (12:33 +0100)]
dev/core/issues/840, fixed notice error

5 years agoCIVICRM-1140: Added a DB check to prevent deleting exisiting CiviCRM data from datbase.
Alok Patel [Mon, 1 Apr 2019 09:44:30 +0000 (15:14 +0530)]
CIVICRM-1140: Added a DB check to prevent deleting exisiting CiviCRM data from datbase.

5 years agoMerge pull request #13924 from eileenmcnaughton/payment_test
Eileen McNaughton [Mon, 1 Apr 2019 06:06:06 +0000 (19:06 +1300)]
Merge pull request #13924 from eileenmcnaughton/payment_test

Payment test cleanup

5 years agoMerge pull request #13919 from seamuslee001/premium_fullfilled_date_conversion
Eileen McNaughton [Mon, 1 Apr 2019 06:05:37 +0000 (19:05 +1300)]
Merge pull request #13919 from seamuslee001/premium_fullfilled_date_conversion

Convert the Fullfilled Date field in preimum section on backoffice co…

5 years agoSimply test, checkPaymentResult adds no value
eileen [Mon, 1 Apr 2019 04:31:21 +0000 (17:31 +1300)]
Simply test, checkPaymentResult adds no value

calling the checkPaymentResult function is actually decreasing readability here as the
simple array comparison is being made to look complex

5 years agoConvert the Fullfilled Date field in preimum section on backoffice contribution from...
Seamus Lee [Fri, 29 Mar 2019 21:13:34 +0000 (08:13 +1100)]
Convert the Fullfilled Date field in preimum section on backoffice contribution from from jcalendar to datepicker

Fix up defaults

5 years agoFix mode on files
Seamus Lee [Mon, 1 Apr 2019 01:55:39 +0000 (12:55 +1100)]
Fix mode on files

5 years agoMerge pull request #13918 from seamuslee001/trxn_date_conversion
Eileen McNaughton [Mon, 1 Apr 2019 01:24:03 +0000 (14:24 +1300)]
Merge pull request #13918 from seamuslee001/trxn_date_conversion

Convert trxn_date field in the Update Pending Status task option from…

5 years agoUpdate PHPWord Patches to match the latest versions of their code
Seamus Lee [Sun, 31 Mar 2019 21:27:01 +0000 (08:27 +1100)]
Update PHPWord Patches to match the latest versions of their code

5 years agoMerge pull request #13921 from pradpnayak/noticeErrorFix
Eileen McNaughton [Sun, 31 Mar 2019 20:26:54 +0000 (09:26 +1300)]
Merge pull request #13921 from pradpnayak/noticeErrorFix

dev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.

5 years agoMerge pull request #13922 from colemanw/factory
Eileen McNaughton [Sun, 31 Mar 2019 20:25:34 +0000 (09:25 +1300)]
Merge pull request #13922 from colemanw/factory

[NFC] Cleanup DAO factory classes for code standards

5 years agoMerge pull request #13920 from seamuslee001/lab_core_836
Eileen McNaughton [Sun, 31 Mar 2019 19:14:55 +0000 (08:14 +1300)]
Merge pull request #13920 from seamuslee001/lab_core_836

dev/core#836 Do not track CSS urls when added as link urls

5 years agoMerge pull request #13867 from jitendrapurohit/paypalpro
Eileen McNaughton [Sun, 31 Mar 2019 19:13:16 +0000 (08:13 +1300)]
Merge pull request #13867 from jitendrapurohit/paypalpro

Possible paypal fix to avoid sending 500 errors from ipn triggerred b…

5 years agoFix unit test
Jitendra Purohit [Sun, 31 Mar 2019 16:01:45 +0000 (21:31 +0530)]
Fix unit test

5 years ago[NFC] Cleanup DAO factory classes for code standards
Coleman Watts [Sun, 31 Mar 2019 13:29:28 +0000 (09:29 -0400)]
[NFC] Cleanup DAO factory classes for code standards

5 years agodev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.
Pradeep Nayak [Sat, 30 Mar 2019 19:14:36 +0000 (19:14 +0000)]
dev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.

5 years agodev/core#836 Do not track CSS urls when added as link urls
Seamus Lee [Sat, 30 Mar 2019 04:17:27 +0000 (15:17 +1100)]
dev/core#836 Do not track CSS urls when added as link urls

5 years agoFix label of trxn_date field and also fix post processing of trxn_date
Seamus Lee [Sat, 30 Mar 2019 02:42:30 +0000 (13:42 +1100)]
Fix label of trxn_date field and also fix post processing of trxn_date