civicrm-core.git
5 years agodev/financial#72 Filter contribution status in create/update
Elliott Eggleston [Wed, 9 Oct 2019 13:45:55 +0000 (15:45 +0200)]
dev/financial#72 Filter contribution status in create/update

Replacing pseudoconstant calls in batch creation/update using
CRM_Contribute_BAO_Contribution_Utils::getContributionStatuses().

This actually changes the list of options offered, but all the
ones it removes should probably already have been gone.

5 years agodev/financial#72 Filter contrib status search selects
Elliott Eggleston [Wed, 9 Oct 2019 13:45:55 +0000 (15:45 +0200)]
dev/financial#72 Filter contrib status search selects

Replacing pseudoConstant calls with BAO buildOptions in 'search'
context.

This commit is only intended to touch places where we are building
a list of options to offer to the user, not places where we are
displaying results.

In practice this doesn't remove any currently available statuses,
but now we can filter our the proposed 'Template' status.

5 years agoMerge pull request #15407 from mattwire/membershippayment_2
Seamus Lee [Wed, 9 Oct 2019 14:31:37 +0000 (16:31 +0200)]
Merge pull request #15407 from mattwire/membershippayment_2

Further cleanup and clarification on MembershipPayment

5 years agoMerge pull request #15291 from mattwire/formatpaymentparams_addccip
Seamus Lee [Wed, 9 Oct 2019 14:31:09 +0000 (16:31 +0200)]
Merge pull request #15291 from mattwire/formatpaymentparams_addccip

REF Move ipAddress and CC expiry date to prepareParamsForPaymentProcessor

5 years agoMerge pull request #15469 from wmortada/patch-1
Seamus Lee [Wed, 9 Oct 2019 14:08:56 +0000 (16:08 +0200)]
Merge pull request #15469 from wmortada/patch-1

Update my organisation

5 years agoUpdate my organisation
William Mortada [Wed, 9 Oct 2019 14:01:45 +0000 (16:01 +0200)]
Update my organisation

5 years agoMerge pull request #15283 from christianwach/lab-1200-3
Seamus Lee [Wed, 9 Oct 2019 13:49:00 +0000 (15:49 +0200)]
Merge pull request #15283 from christianwach/lab-1200-3

Restrict inactive Dashlet query to Dashlets in the current domain

5 years agoMerge pull request #15465 from eileenmcnaughton/dep_fn
Seamus Lee [Wed, 9 Oct 2019 13:05:45 +0000 (15:05 +0200)]
Merge pull request #15465 from eileenmcnaughton/dep_fn

[REF] remove call to deprecated function

5 years agoMerge pull request #15462 from eileenmcnaughton/event_api
Seamus Lee [Wed, 9 Oct 2019 13:03:45 +0000 (15:03 +0200)]
Merge pull request #15462 from eileenmcnaughton/event_api

[REF] Fix typos and remove unused variables

5 years agoMerge pull request #15456 from aydun/change_getTemplateContrib
Eileen McNaughton [Wed, 9 Oct 2019 12:58:18 +0000 (14:58 +0200)]
Merge pull request #15456 from aydun/change_getTemplateContrib

dev/financial#72 Modify getTemplateContribution() to use is_template field

5 years agoMerge pull request #15463 from eileenmcnaughton/status_fix
Matthew Wire [Wed, 9 Oct 2019 11:41:40 +0000 (13:41 +0200)]
Merge pull request #15463 from eileenmcnaughton/status_fix

[REF] Improve signature on updateFinancialAccountsOnContributionStatusChange

5 years ago[REF] remove call to deprecated function
eileen [Wed, 9 Oct 2019 11:26:09 +0000 (13:26 +0200)]
[REF] remove call to deprecated function

getPartialPaymentType basically just calls CRM_Contribute_BAO_Contribution::getContributionBalance
& then returns the  balance in a different array key depending on the value.

This switches to calling it directly & completes the work of removing all calls to it & more heavily deprecating it

5 years agoMerge pull request #15461 from civicrm/5.19
Eileen McNaughton [Wed, 9 Oct 2019 11:29:57 +0000 (13:29 +0200)]
Merge pull request #15461 from civicrm/5.19

5.19

5 years agoMerge pull request #15464 from seamuslee001/5.19
Eileen McNaughton [Wed, 9 Oct 2019 11:29:38 +0000 (13:29 +0200)]
Merge pull request #15464 from seamuslee001/5.19

5.18.2 release notes

5 years agoFix typos and remove unused variables
Matthew Wire (MJW Consulting) [Tue, 8 Oct 2019 09:57:45 +0000 (11:57 +0200)]
Fix typos and remove unused variables

5 years agoMerge pull request #15448 from artfulrobot/replace-openflash-charts
Seamus Lee [Wed, 9 Oct 2019 10:30:18 +0000 (12:30 +0200)]
Merge pull request #15448 from artfulrobot/replace-openflash-charts

Replace openflash charts with charts that work

5 years agoUpdate release-notes.md
Tim Otten [Wed, 9 Oct 2019 10:24:10 +0000 (12:24 +0200)]
Update release-notes.md

5 years agoUpdate 5.18.2.md
Tim Otten [Wed, 9 Oct 2019 10:22:05 +0000 (12:22 +0200)]
Update 5.18.2.md

5 years agoUpdate release notes following recent merges
Seamus Lee [Wed, 9 Oct 2019 08:00:43 +0000 (19:00 +1100)]
Update release notes following recent merges

5 years agoUpdate release notes for fix for dev/core#1269
Seamus Lee [Tue, 8 Oct 2019 12:40:42 +0000 (23:40 +1100)]
Update release notes for fix for dev/core#1269

5 years agoAdd in release notes for 5.18.2
Seamus Lee [Tue, 8 Oct 2019 09:36:42 +0000 (20:36 +1100)]
Add in release notes for 5.18.2

5 years agoMerge pull request #15460 from eileenmcnaughton/event_transact
Seamus Lee [Wed, 9 Oct 2019 10:13:58 +0000 (12:13 +0200)]
Merge pull request #15460 from eileenmcnaughton/event_transact

[REF] Remove transaction as part of minor code cleanup

5 years agoChange getTemplateContribution to prefer is_template contrib
Aidan Saunders [Wed, 9 Oct 2019 08:49:13 +0000 (09:49 +0100)]
Change getTemplateContribution to prefer is_template contrib
Add test

5 years agoImprove signature on updateFinancialAccountsOnContributionStatusChange
eileen [Wed, 9 Oct 2019 09:27:52 +0000 (11:27 +0200)]
Improve signature on updateFinancialAccountsOnContributionStatusChange

5 years agoMerge pull request #15459 from eileenmcnaughton/event_clean
Eileen McNaughton [Wed, 9 Oct 2019 09:18:20 +0000 (11:18 +0200)]
Merge pull request #15459 from eileenmcnaughton/event_clean

[ref] Simplify function signature as parameter is not used

5 years agoPass contact ID as param to executeQuery()
Christian Wach [Wed, 9 Oct 2019 08:33:29 +0000 (09:33 +0100)]
Pass contact ID as param to executeQuery()

5 years agoTidy up charts code, including avoiding js error on tabular data view
Rich Lott / Artful Robot [Wed, 9 Oct 2019 08:31:36 +0000 (10:31 +0200)]
Tidy up charts code, including avoiding js error on tabular data view

5 years ago[REF] Remove transaction.
eileen [Wed, 9 Oct 2019 08:28:48 +0000 (10:28 +0200)]
[REF] Remove transaction.

@mattwire proposed moving this in
https://github.com/civicrm/civicrm-core/pull/15446/commits/8f76cfacf156cfbd11e280b9a86926e0a5082c27

However, I believe removing it is the correct action. The usefullness of transactions is to maintain integrity
by rolling back the creation of a bunch of related entities together if one fails.

However in this case it's not rolling back the contribution or participant record or non discount line items so
if it worked (which I doubt) it would reduce rather than increase db integrity

5 years agoMake getTemplateContribution match is_test
Aidan Saunders [Wed, 9 Oct 2019 08:28:16 +0000 (09:28 +0100)]
Make getTemplateContribution match is_test
- non-test recurs should only pick up non-test templates
- test recurs should only pick up test templates
Add test

5 years agoSimplify function signature as parameter is not used
Matthew Wire (MJW Consulting) [Tue, 8 Oct 2019 08:24:52 +0000 (10:24 +0200)]
Simplify function signature as parameter is not used

5 years agoMerge pull request #15453 from eileenmcnaughton/import_campaign
Seamus Lee [Wed, 9 Oct 2019 07:48:07 +0000 (09:48 +0200)]
Merge pull request #15453 from eileenmcnaughton/import_campaign

dev/core#1285 import support for campaign_id (& other fields where it could be an id, a name or a label.

5 years agoMerge pull request #15454 from demeritcowboy/custom-fieldspec-bao
Seamus Lee [Tue, 8 Oct 2019 22:56:50 +0000 (00:56 +0200)]
Merge pull request #15454 from demeritcowboy/custom-fieldspec-bao

dev/core#1305 - fieldspec bao not defined for custom fields

5 years agoMerge pull request #15444 from civicrm/5.19
Eileen McNaughton [Tue, 8 Oct 2019 17:21:15 +0000 (19:21 +0200)]
Merge pull request #15444 from civicrm/5.19

5.19

5 years agoConvert getTemplateContribution to api4
Aidan Saunders [Tue, 8 Oct 2019 17:05:48 +0000 (18:05 +0100)]
Convert getTemplateContribution to api4

5 years agodev/core#1305
DemeritCowboy [Tue, 8 Oct 2019 17:04:26 +0000 (13:04 -0400)]
dev/core#1305

5 years agodev/core#1285 import support for campaign_id (& other fields where it could be an...
eileen [Tue, 8 Oct 2019 16:51:13 +0000 (18:51 +0200)]
dev/core#1285 import support for campaign_id (& other fields where it could be an id, a name or a label.

After digging into https://lab.civicrm.org/dev/core/issues/1285 it feels a little arguable what we should support but issues in
gitlab indicate there is at least some demand for id & label so it now will
- accept id if input matches an id
- accept name if input matches a name
- accept label if input matches a label.

This means for payment instrument it would accept '1', 'Check' or 'Cheque' (in that order if name were renamed).

This should apply to a few fields - payment instrument, constribution status & per the issue campaign
(on contribution). There are 'some' on membership too I think

5 years agoWIP checkin
Rich Lott / Artful Robot [Mon, 7 Oct 2019 20:25:00 +0000 (21:25 +0100)]
WIP checkin

WIP: bar chart sort of working now

Pie and Bar charts working, with download in SVG and PNG links

oops remove accidental inclusion

remove accidentally included crap

remove 3d barchart as unnecessary (and unimplemented)

5 years agoMerge pull request #15321 from yashodha/dev_1065
Seamus Lee [Tue, 8 Oct 2019 15:55:26 +0000 (17:55 +0200)]
Merge pull request #15321 from yashodha/dev_1065

(dev/core#1065) Pledge in Edit mode needs to be shown consistently

5 years agoMerge pull request #15443 from eileenmcnaughton/ex_merge
Seamus Lee [Tue, 8 Oct 2019 15:50:11 +0000 (17:50 +0200)]
Merge pull request #15443 from eileenmcnaughton/ex_merge

dev/core#1302 fix regression on exported when merging addresses with specified fields

5 years agoMerge pull request #15433 from aydun/add_contribution_is_template
Eileen McNaughton [Tue, 8 Oct 2019 15:34:10 +0000 (17:34 +0200)]
Merge pull request #15433 from aydun/add_contribution_is_template

dev/financial#72 Add is_template field to contribution entity

5 years ago dev/core#1302 fix regression on merge export
eileen [Tue, 8 Oct 2019 14:18:23 +0000 (16:18 +0200)]
 dev/core#1302 fix regression on merge export

5 years agoFix example
Seamus Lee [Tue, 8 Oct 2019 13:03:59 +0000 (00:03 +1100)]
Fix example

5 years agoMerge pull request #15447 from seamuslee001/dev_core_1269
Seamus Lee [Tue, 8 Oct 2019 12:31:56 +0000 (14:31 +0200)]
Merge pull request #15447 from seamuslee001/dev_core_1269

dev/core#1269 Add in fix for undefined index bao in parsePseudoConst…

5 years agoMerge pull request #14891 from eileenmcnaughton/saved_search
Matthew Wire [Tue, 8 Oct 2019 10:22:48 +0000 (12:22 +0200)]
Merge pull request #14891 from eileenmcnaughton/saved_search

[Code-quality] remove references to where_tables, where_clause

5 years agoMerge pull request #15439 from eileenmcnaughton/ex_bug
Seamus Lee [Tue, 8 Oct 2019 10:20:59 +0000 (12:20 +0200)]
Merge pull request #15439 from eileenmcnaughton/ex_bug

dev/core#1293 Fix regression on  export filtering for postal address only

5 years agodev/core#1269 Add in fix for underfined index bao in parsePseudoConstantField for...
Seamus Lee [Tue, 8 Oct 2019 10:04:10 +0000 (21:04 +1100)]
dev/core#1269 Add in fix for underfined index bao in parsePseudoConstantField for Import Parser

5 years agoAdd ipAddress and creditcard expiry date to prepareParamsForPaymentProcessor
Matthew Wire (MJW Consulting) [Thu, 12 Sep 2019 08:51:28 +0000 (09:51 +0100)]
Add ipAddress and creditcard expiry date to prepareParamsForPaymentProcessor

5 years agoAdd is_template field to contribution entity
Aidan Saunders [Mon, 7 Oct 2019 13:27:53 +0000 (14:27 +0100)]
Add is_template field to contribution entity
Update tests and examples

5 years agoMerge pull request #15440 from eileenmcnaughton/ex_zero
Seamus Lee [Tue, 8 Oct 2019 09:10:47 +0000 (11:10 +0200)]
Merge pull request #15440 from eileenmcnaughton/ex_zero

dev/core#1293 Still output csv file on export, even if no rows are in it

5 years agoMerge pull request #15438 from demeritcowboy/emailprocessor-still-hungry-alt
Seamus Lee [Tue, 8 Oct 2019 08:25:32 +0000 (10:25 +0200)]
Merge pull request #15438 from demeritcowboy/emailprocessor-still-hungry-alt

dev/core#1270 - fix email processor dropping attachments - ALTERNATE

5 years agoMerge pull request #15281 from mattwire/formatpaymentparams_useprepare
Seamus Lee [Tue, 8 Oct 2019 08:01:54 +0000 (10:01 +0200)]
Merge pull request #15281 from mattwire/formatpaymentparams_useprepare

REF Use the new prepareParamsForPaymentProcessor function in more places

5 years agodev/core#1293 Fix regression on export filtering for postal address only
eileen [Tue, 8 Oct 2019 06:21:21 +0000 (08:21 +0200)]
dev/core#1293 Fix regression on  export filtering for postal address only

5 years agoStill output csv file, even if no rows are in it
eileen [Tue, 8 Oct 2019 07:33:26 +0000 (09:33 +0200)]
Still output csv file, even if no rows are in it

5 years agoMerge pull request #15425 from eileenmcnaughton/loc_clean
Seamus Lee [Tue, 8 Oct 2019 06:51:49 +0000 (08:51 +0200)]
Merge pull request #15425 from eileenmcnaughton/loc_clean

[NFC] minor simplification

5 years agoMerge pull request #15418 from seamuslee001/frontend_contribution_page_title
Seamus Lee [Tue, 8 Oct 2019 06:50:00 +0000 (08:50 +0200)]
Merge pull request #15418 from seamuslee001/frontend_contribution_page_title

Add in frontend_title field for Contribution Pages to allow site mana…

5 years agofix email processor dropping attachments
DemeritCowboy [Tue, 8 Oct 2019 02:33:55 +0000 (22:33 -0400)]
fix email processor dropping attachments

5 years ago[NFC] minor simplification
eileen [Mon, 7 Oct 2019 15:50:12 +0000 (17:50 +0200)]
[NFC] minor simplification

This just changes how return vars are handled to make it clearer that ONLY contact::Create
cares about location_block::create return values

5 years agoMerge pull request #15434 from civicrm/5.19
Eileen McNaughton [Mon, 7 Oct 2019 23:02:25 +0000 (01:02 +0200)]
Merge pull request #15434 from civicrm/5.19

5.19 to master

5 years agoMerge pull request #15428 from greenpeace-cee/fix-status-check
Eileen McNaughton [Mon, 7 Oct 2019 22:55:50 +0000 (00:55 +0200)]
Merge pull request #15428 from greenpeace-cee/fix-status-check

Fix status check not rendering before 5.19 migrations

5 years agoMerge pull request #15411 from systopia/dev_l10nx
Seamus Lee [Mon, 7 Oct 2019 21:09:27 +0000 (23:09 +0200)]
Merge pull request #15411 from systopia/dev_l10nx

Allow custom ts functions in extensions; defer custom ts calls until booted

5 years agoMerge pull request #15430 from civicrm/5.19
Seamus Lee [Mon, 7 Oct 2019 19:47:22 +0000 (21:47 +0200)]
Merge pull request #15430 from civicrm/5.19

5.19

5 years agoMerge pull request #15412 from demeritcowboy/fly-backwards
Seamus Lee [Mon, 7 Oct 2019 17:46:30 +0000 (19:46 +0200)]
Merge pull request #15412 from demeritcowboy/fly-backwards

Minor a_b/b_a mixup on case type edit screen

5 years agoMerge pull request #15420 from eileenmcnaughton/live_notice
Seamus Lee [Mon, 7 Oct 2019 17:42:13 +0000 (19:42 +0200)]
Merge pull request #15420 from eileenmcnaughton/live_notice

dev/core#1281 fix e-notice on isLiveMode

5 years agoMerge pull request #15359 from fkohrt/master
Seamus Lee [Mon, 7 Oct 2019 17:19:16 +0000 (19:19 +0200)]
Merge pull request #15359 from fkohrt/master

Improve item order inside Online Contributions section of configuration checklist; see lab issue dev/core#1278

5 years agoFix status check not rendering before 5.19 migrations
Patrick Figel [Mon, 7 Oct 2019 17:05:59 +0000 (19:05 +0200)]
Fix status check not rendering before 5.19 migrations

This fixes an issue where the status check page does not render when
migrations to 5.19 are pending because the is_active column hasn't been
added yet.

The rationale for this change is to avoid scenarios where users forget
to run upgrades because there's no status check warning.

5 years agoMerge pull request #15424 from eileenmcnaughton/email_form
Seamus Lee [Mon, 7 Oct 2019 16:49:39 +0000 (18:49 +0200)]
Merge pull request #15424 from eileenmcnaughton/email_form

[NFC] code formatting

5 years agoMerge pull request #15423 from greenpeace-cee/fix-is-required-address-field
Eileen McNaughton [Mon, 7 Oct 2019 16:27:36 +0000 (18:27 +0200)]
Merge pull request #15423 from greenpeace-cee/fix-is-required-address-field

Fix E_NOTICE for is_required in address form

5 years agoAdd in frontend_title field for Contribution Pages to allow site managers to specify...
Seamus Lee [Mon, 7 Oct 2019 12:05:48 +0000 (23:05 +1100)]
Add in frontend_title field for Contribution Pages to allow site managers to specify a title for a page different to that for use from the backend

5 years ago[NFC] code formatting
eileen [Mon, 7 Oct 2019 15:12:23 +0000 (17:12 +0200)]
[NFC] code formatting

5 years agoMerge pull request #15419 from eileenmcnaughton/event_filter
Eileen McNaughton [Mon, 7 Oct 2019 15:09:06 +0000 (17:09 +0200)]
Merge pull request #15419 from eileenmcnaughton/event_filter

dev/financial#72 Make is_template=0 the default for api get requests.

5 years agoSet version to 5.20.alpha1
CiviCRM [Mon, 7 Oct 2019 15:07:03 +0000 (15:07 +0000)]
Set version to 5.20.alpha1

5 years agoSet version to 5.19.beta1
CiviCRM [Mon, 7 Oct 2019 15:01:46 +0000 (15:01 +0000)]
Set version to 5.19.beta1

5 years agoFix E_NOTICE for is_required in address form
Patrick Figel [Mon, 7 Oct 2019 14:48:51 +0000 (16:48 +0200)]
Fix E_NOTICE for is_required in address form

This fixes an E_NOTICE that's triggered for optional address custom
fields in CRM_Contact_Form_Edit_Address.

5 years agodev/core#1281 fix e-notice on isLiveMode
eileen [Mon, 7 Oct 2019 13:49:28 +0000 (15:49 +0200)]
dev/core#1281 fix e-notice on isLiveMode

Looks like a regression from https://github.com/civicrm/civicrm-core/commit/752cee47213094c29b8e6ae5d0b20f0800520d80
which hit in 5.15 - seems good to merge to rc / about to cut to rc

5 years agodev/financial#72 Make is_template=0 the default for api get requests.
eileen [Mon, 7 Oct 2019 13:09:50 +0000 (15:09 +0200)]
dev/financial#72 Make is_template=0 the default for api get requests.

We are planning on adding is_template to the civicrm_contribution table - following the precedent from event.

By default it is NOT desirable to get template entities returned in a get request - this fixes that at the generic
apiv4 level and means that it will be a default filter when present

5 years agoMerge pull request #15417 from eileenmcnaughton/matt
Matthew Wire [Mon, 7 Oct 2019 12:43:02 +0000 (14:43 +0200)]
Merge pull request #15417 from eileenmcnaughton/matt

Add trxn_id as a parameter on Payment.get

5 years agoMerge pull request #15414 from eileenmcnaughton/fix_log_text
Seamus Lee [Mon, 7 Oct 2019 11:44:02 +0000 (13:44 +0200)]
Merge pull request #15414 from eileenmcnaughton/fix_log_text

dev/core#1283 fix inability to export more than 255 chars

5 years agoMerge pull request #15416 from civicrm/eileenmcnaughton-patch-1
Seamus Lee [Mon, 7 Oct 2019 11:43:32 +0000 (13:43 +0200)]
Merge pull request #15416 from civicrm/eileenmcnaughton-patch-1

Update fix - should not be localisable

5 years agoAccept trxn_id to Payment.get
eileen [Mon, 7 Oct 2019 11:22:42 +0000 (13:22 +0200)]
Accept trxn_id to Payment.get

Alternative to #15166 (incorporates #15229 )

5 years agoUnit test for #15166 fix
Jitendra Purohit [Fri, 6 Sep 2019 12:09:28 +0000 (17:39 +0530)]
Unit test for #15166 fix

5 years agoMerge pull request #15381 from eileenmcnaughton/w_test
Matthew Wire [Mon, 7 Oct 2019 11:00:55 +0000 (13:00 +0200)]
Merge pull request #15381 from eileenmcnaughton/w_test

Add test for uF group one bug

5 years agoUpdate fix - should not be localisable
Eileen McNaughton [Mon, 7 Oct 2019 10:54:05 +0000 (12:54 +0200)]
Update fix - should not be localisable

5 years agodev/core#1283 fix inability to export more than 255 chars
eileen [Mon, 7 Oct 2019 08:34:21 +0000 (10:34 +0200)]
dev/core#1283 fix inability to export more than 255 chars

5 years agodon't prevent I18n init, @totten says it's not too costly...
B. Endres [Mon, 7 Oct 2019 10:48:22 +0000 (12:48 +0200)]
don't prevent I18n init, @totten says it's not too costly...

5 years agofixed style error
B. Endres [Mon, 7 Oct 2019 10:07:18 +0000 (12:07 +0200)]
fixed style error

5 years agoMerge pull request #15409 from eileenmcnaughton/status
Seamus Lee [Mon, 7 Oct 2019 10:01:59 +0000 (12:01 +0200)]
Merge pull request #15409 from eileenmcnaughton/status

dev/core#1295 Add is_active field to civicrm_status_preference

5 years agorun strings through ts(), but skip actual translation
B. Endres [Mon, 7 Oct 2019 09:28:58 +0000 (11:28 +0200)]
run strings through ts(), but skip actual translation

5 years agoMerge pull request #15413 from eileenmcnaughton/default_sub_type
Seamus Lee [Mon, 7 Oct 2019 08:44:05 +0000 (10:44 +0200)]
Merge pull request #15413 from eileenmcnaughton/default_sub_type

[REF] don't handle non-array, pass by reference

5 years agoHeed is_active value if set to zero
eileen [Sun, 6 Oct 2019 18:13:54 +0000 (20:13 +0200)]
Heed is_active value if set to zero

Note this is done BEFORE doing checks in case it is for performance reasons

5 years agoAdd test for uF group one bug
eileen [Thu, 3 Oct 2019 07:26:16 +0000 (09:26 +0200)]
Add test for uF group one bug

5 years ago[REF] don't handle non-array, pass by reference
eileen [Mon, 7 Oct 2019 04:57:29 +0000 (06:57 +0200)]
[REF] don't handle non-array, pass by reference

This is only called from one place & it is definitely coming in as an array & using the return values.

5 years agominor a_b/b_a mixup
DemeritCowboy [Mon, 7 Oct 2019 03:35:01 +0000 (23:35 -0400)]
minor a_b/b_a mixup

5 years agoMerge pull request #15352 from colemanw/extCompat
Tim Otten [Sun, 6 Oct 2019 23:48:13 +0000 (00:48 +0100)]
Merge pull request #15352 from colemanw/extCompat

Improve obsolete extension management

5 years agoimplemented @totten's approach to fix custom ts functions in extensions
B. Endres [Sun, 6 Oct 2019 21:46:35 +0000 (23:46 +0200)]
implemented @totten's approach to fix custom ts functions in extensions

5 years agoEnsure contribution_id is always set and clarify what functions do
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:23:14 +0000 (19:23 +0200)]
Ensure contribution_id is always set and clarify what functions do

5 years agoMerge pull request #15404 from seamuslee001/dev_core_861
Seamus Lee [Sun, 6 Oct 2019 18:59:34 +0000 (20:59 +0200)]
Merge pull request #15404 from seamuslee001/dev_core_861

dev/core#861 Ensure that when processing mailings that no emails are …

5 years agoMerge pull request #15384 from mattwire/membership_updaterecur
Seamus Lee [Sun, 6 Oct 2019 18:59:08 +0000 (20:59 +0200)]
Merge pull request #15384 from mattwire/membership_updaterecur

Remove call to updateRecurMembership which is handled by Membership::create BAO

5 years agoMerge pull request #15406 from mattwire/morecontributionstatuslabel
Seamus Lee [Sun, 6 Oct 2019 18:58:17 +0000 (20:58 +0200)]
Merge pull request #15406 from mattwire/morecontributionstatuslabel

Fix checking of isSubscriptionCancelled when label is changed

5 years agoMerge pull request #15405 from MikeyMJCO/nomoreyahoo
Matthew Wire [Sun, 6 Oct 2019 18:20:22 +0000 (20:20 +0200)]
Merge pull request #15405 from MikeyMJCO/nomoreyahoo

Remove legacy Yahoo references from the Mapping/Geocoding settings/code.

5 years agoFix check for isSubscriptionCancelled in contribute
Matthew Wire (MJW Consulting) [Sun, 6 Oct 2019 17:22:20 +0000 (19:22 +0200)]
Fix check for isSubscriptionCancelled in contribute