civicrm-core.git
4 years agoMerge pull request #17628 from colemanw/customOptionsFallback
Tim Otten [Tue, 16 Jun 2020 04:14:39 +0000 (21:14 -0700)]
Merge pull request #17628 from colemanw/customOptionsFallback

dev/core#1816 - Legacy support for matching custom field options by label

4 years agodev/core#1816 - Legacy support for matching custom field options by label
Coleman Watts [Tue, 16 Jun 2020 00:15:02 +0000 (20:15 -0400)]
dev/core#1816 - Legacy support for matching custom field options by label

4 years agoMerge pull request #17625 from demeritcowboy/missing-activitytype-5.27
Seamus Lee [Tue, 16 Jun 2020 00:58:31 +0000 (10:58 +1000)]
Merge pull request #17625 from demeritcowboy/missing-activitytype-5.27

dev/core#1822 - Fix missing newly created activity types from the dropdown on the new activity form

4 years agoMerge pull request #17622 from seamuslee001/smart_group_error
Seamus Lee [Tue, 16 Jun 2020 00:07:14 +0000 (10:07 +1000)]
Merge pull request #17622 from seamuslee001/smart_group_error

Fix issue with building smart groups when  is empty

4 years agofix missing newly created activity types
demeritcowboy [Mon, 15 Jun 2020 23:32:47 +0000 (19:32 -0400)]
fix missing newly created activity types

4 years agoMerge pull request #17619 from seamuslee001/dev_core_1823_alt
Seamus Lee [Mon, 15 Jun 2020 23:33:02 +0000 (09:33 +1000)]
Merge pull request #17619 from seamuslee001/dev_core_1823_alt

dev/core#1823 Fix building the Price Field visibility options

4 years agoFix issue with building smart groups when is empty
Seamus Lee [Mon, 15 Jun 2020 23:01:59 +0000 (09:01 +1000)]
Fix issue with building smart groups when  is empty

4 years agodev/core#1823 Fix building the Price Field visibility options
Seamus Lee [Mon, 15 Jun 2020 22:00:54 +0000 (08:00 +1000)]
dev/core#1823 Fix building the Price Field visibility options

4 years agoMerge pull request #17607 from eileenmcnaughton/pi
Matthew Wire [Sun, 14 Jun 2020 20:32:57 +0000 (21:32 +0100)]
Merge pull request #17607 from eileenmcnaughton/pi

Fix payment instrument bug by using correct payment instrument

4 years agoFix payment instrument bug by using correct payment instrument
eileen [Sun, 14 Jun 2020 02:36:46 +0000 (14:36 +1200)]
Fix payment instrument bug by using correct payment instrument

Per https://github.com/civicrm/civicrm-core/pull/17589 it is necessary that we do NOT pass the wrong payment_instrument_id
to the payment processor. BUT we have to provide accurate defaults for manual payments. This is a narrower fix than

- back office membership form
- back office participant form
- back office contribution form

and in all cases the Manual processor still loaded correctly. I don't feel I can say this is the last fix in this
area but it stands alone as a sensible fix to do and also one that should address the immediate issue.

Note there is some weirdness in a second function in EventFees - that function should GO IMHO - but I have not yet reached it in
UI testing to confirm if other changes need to be made.

4 years agoMerge pull request #17586 from seamuslee001/wip_56_test_fixes
Seamus Lee [Fri, 12 Jun 2020 05:08:53 +0000 (15:08 +1000)]
Merge pull request #17586 from seamuslee001/wip_56_test_fixes

[REF] Fix unit test failures on MySQL 5.6 due to Custom Field table being created without Dynamic Row Format

4 years agoFix unit test failures on MySQL 5.6 due to Custom Field table being created without...
Seamus Lee [Fri, 12 Jun 2020 03:17:48 +0000 (13:17 +1000)]
Fix unit test failures on MySQL 5.6 due to Custom Field table being created without Dynamic Row Format

4 years agoMerge pull request #17577 from seamuslee001/deprecated_checks_money_value_format
Seamus Lee [Thu, 11 Jun 2020 22:45:03 +0000 (08:45 +1000)]
Merge pull request #17577 from seamuslee001/deprecated_checks_money_value_format

Add in deprecation notice and status check for a money value format co…

4 years agoMerge pull request #17567 from eileenmcnaughton/dupe_speed
Seamus Lee [Thu, 11 Jun 2020 22:06:43 +0000 (08:06 +1000)]
Merge pull request #17567 from eileenmcnaughton/dupe_speed

Dedupe performance - hard-remove financial_item from list of dymnamic  refs to contact table

4 years agoAdd in depreation notice and status check for a money value format configuration...
Seamus Lee [Thu, 11 Jun 2020 02:59:31 +0000 (12:59 +1000)]
Add in depreation notice and status check for a money value format configuration other than the default

Update to include issue link

Update to use CRM_Core_Error::deprecated function and mention deprecation notice on settings page

4 years agoDedupe performance - hard-remove financial_item from list of dymnamic refs to contact...
eileen [Wed, 10 Jun 2020 02:30:36 +0000 (14:30 +1200)]
Dedupe performance - hard-remove financial_item from list of dymnamic refs to contact tablge

4 years agoMerge pull request #17532 from totten/5.27-queue-test
Seamus Lee [Sun, 7 Jun 2020 06:12:20 +0000 (16:12 +1000)]
Merge pull request #17532 from totten/5.27-queue-test

QueueTest - Be more forgiving about slow execution

4 years agoQueueTest - Be more forgiving about slow execution
Tim Otten [Sun, 7 Jun 2020 04:29:17 +0000 (21:29 -0700)]
QueueTest - Be more forgiving about slow execution

The `CRM_Queue_QueueTest` is producing failures with the
[TIME_FUNC](https://github.com/civicrm/civicrm-core/pull/17414) option of
`linear:500` (the value currently used in PR test runs) -- which is to say,
it fails when the system runs very slowly (with some 500ms stalling during
execution).

This gets it working under some very slow scenarios:

```
for TIME_FUNC in natural frozen linear:500 linear:1250 prng:500 prng:666 prng:1000 prng:1500 ; do
  export TIME_FUNC;
  echo;
  echo "TIME_FUNC=$TIME_FUNC" ;
  env CIVICRM_UF=UnitTests phpunit6 tests/phpunit/CRM/Queue/QueueTest.php ;
done
```

4 years agoMerge pull request #17360 from totten/master-wp-var
Seamus Lee [Sun, 7 Jun 2020 02:01:55 +0000 (12:01 +1000)]
Merge pull request #17360 from totten/master-wp-var

WP - Change definitions of `cms.root`, `civicrm.root`

4 years agoMerge pull request #17529 from totten/5.27-comm-msg
Seamus Lee [Sun, 7 Jun 2020 01:01:04 +0000 (11:01 +1000)]
Merge pull request #17529 from totten/5.27-comm-msg

CommunityMessages - Define more consistent behavior in the face of slow execution

4 years agoCommunityMessages - Define more consistent behavior in the face of slow execution
Tim Otten [Sat, 6 Jun 2020 22:21:01 +0000 (15:21 -0700)]
CommunityMessages - Define more consistent behavior in the face of slow execution

This passes under some brutally slow scenarios:

```
for TIME_FUNC in natural frozen linear:500 linear:1250 prng:500 prng:666 prng:1000 prng:1500 ; do
  export TIME_FUNC;
  echo;
  echo "TIME_FUNC=$TIME_FUNC" ;
  env CIVICRM_UF=UnitTests phpunit6 tests/phpunit/CRM/Core/CommunityMessagesTest.php ;
done
```

4 years agoSet version to 5.27.beta1
CiviCRM [Sat, 6 Jun 2020 07:40:15 +0000 (07:40 +0000)]
Set version to 5.27.beta1

4 years agoMerge pull request #17521 from seamuslee001/master
Tim Otten [Sat, 6 Jun 2020 07:39:32 +0000 (00:39 -0700)]
Merge pull request #17521 from seamuslee001/master

Add release-notes/5.26.1.md

4 years agoUpdate release-notes.md
Tim Otten [Sat, 6 Jun 2020 07:04:55 +0000 (00:04 -0700)]
Update release-notes.md

4 years agoAdd release-notes/5.26.1.md
Tim Otten [Sat, 6 Jun 2020 00:54:38 +0000 (17:54 -0700)]
Add release-notes/5.26.1.md

4 years agoMerge pull request #17518 from totten/master-mysql-notice
Seamus Lee [Sat, 6 Jun 2020 04:03:31 +0000 (14:03 +1000)]
Merge pull request #17518 from totten/master-mysql-notice

dev/core#1681 - Copy-edits on MySQL version notices

4 years agodev/core#1681 - Copy-edits on MySQL version notices
Tim Otten [Sat, 6 Jun 2020 02:01:22 +0000 (19:01 -0700)]
dev/core#1681 - Copy-edits on MySQL version notices

* The titles for PHP+MySQL notices should use the same
  capitalization/hyphenation ("Out-of-Date" vs "Out of date").
* Extract some more "%n" variables. Fix one errant variable.
* Reduce floweriness of the "version" / "at least" / "or later" text.
* Make it possible to add/remove the "+" notation without changing
  the ts() message.

4 years agoMerge pull request #17452 from eileenmcnaughton/dummy_bag
Tim Otten [Sat, 6 Jun 2020 00:22:55 +0000 (17:22 -0700)]
Merge pull request #17452 from eileenmcnaughton/dummy_bag

[REF] Start to convert Dummy processor to use PropertyBag

4 years agoMerge pull request #17505 from mattwire/propertybagfixsetamount
Seamus Lee [Fri, 5 Jun 2020 10:51:12 +0000 (20:51 +1000)]
Merge pull request #17505 from mattwire/propertybagfixsetamount

Payment PropertyBag - Fix setAmount

4 years agoFix setAmount to set the right amount on payment propertybag
Matthew Wire [Fri, 5 Jun 2020 09:19:44 +0000 (10:19 +0100)]
Fix setAmount to set the right amount on payment propertybag

4 years agoMerge pull request #17496 from seamuslee001/mysql_upgrade_notice
Seamus Lee [Fri, 5 Jun 2020 09:05:34 +0000 (19:05 +1000)]
Merge pull request #17496 from seamuslee001/mysql_upgrade_notice

dev/core#1681 Add in notice about 5.28 Dropping MySQL 5.5 Support

4 years agoMerge pull request #17489 from eileenmcnaughton/mod
Seamus Lee [Fri, 5 Jun 2020 05:22:10 +0000 (15:22 +1000)]
Merge pull request #17489 from eileenmcnaughton/mod

[REF] Remove always NULL param modified_id

4 years agodev/core#1681 Add in notice about 5.28 Dropping MySQL 5.5 Support
Seamus Lee [Thu, 4 Jun 2020 23:19:01 +0000 (09:19 +1000)]
dev/core#1681 Add in notice about 5.28 Dropping MySQL 5.5 Support

4 years agoMerge pull request #17497 from seamuslee001/dev_core_1797
Eileen McNaughton [Fri, 5 Jun 2020 04:58:51 +0000 (16:58 +1200)]
Merge pull request #17497 from seamuslee001/dev_core_1797

dev/core#1797 Fix jquery Credit card validation on front end contribu…

4 years agoMerge pull request #17448 from mattwire/api4membershiptype
Eileen McNaughton [Thu, 4 Jun 2020 23:55:50 +0000 (11:55 +1200)]
Merge pull request #17448 from mattwire/api4membershiptype

Add MembershipType to Api4

4 years agoMerge pull request #17473 from eileenmcnaughton/anet
Seamus Lee [Thu, 4 Jun 2020 23:46:18 +0000 (09:46 +1000)]
Merge pull request #17473 from eileenmcnaughton/anet

Convert remaining Authorize.net test to use guzzle

4 years agodev/core#1797 Fix jquery Credit card validation on front end contribution forms
Seamus Lee [Thu, 4 Jun 2020 23:41:10 +0000 (09:41 +1000)]
dev/core#1797 Fix jquery Credit card validation on front end contribution forms

4 years agoMerge pull request #17494 from pradpnayak/reminderSetdefault
Seamus Lee [Thu, 4 Jun 2020 23:23:24 +0000 (09:23 +1000)]
Merge pull request #17494 from pradpnayak/reminderSetdefault

set boolean fields to false if not set.

4 years agoMerge pull request #17490 from eileenmcnaughton/pending
Seamus Lee [Thu, 4 Jun 2020 22:52:11 +0000 (08:52 +1000)]
Merge pull request #17490 from eileenmcnaughton/pending

[Ref] remove calls to, and deprecate, pending function

4 years agoMerge pull request #17426 from mattwire/recaptcha
Eileen McNaughton [Thu, 4 Jun 2020 21:46:45 +0000 (09:46 +1200)]
Merge pull request #17426 from mattwire/recaptcha

Make reCAPTCHA settings clearer

4 years agoMerge pull request #17492 from eileenmcnaughton/search
Seamus Lee [Thu, 4 Jun 2020 21:14:30 +0000 (07:14 +1000)]
Merge pull request #17492 from eileenmcnaughton/search

[NFC] Fix use of single quotes, strict operator

4 years agoMerge pull request #17488 from eileenmcnaughton/memtype
Seamus Lee [Thu, 4 Jun 2020 21:14:04 +0000 (07:14 +1000)]
Merge pull request #17488 from eileenmcnaughton/memtype

Test fixes to support apiv4 add of MembershipType

4 years agoMerge pull request #17493 from pradpnayak/tinyintFixes
colemanw [Thu, 4 Jun 2020 11:59:28 +0000 (07:59 -0400)]
Merge pull request #17493 from pradpnayak/tinyintFixes

dev/core/-/issues/1794, changed int to tinyint for boolean fields

4 years agoset boolean fields to false if not set.
Pradeep Nayak [Thu, 4 Jun 2020 10:15:15 +0000 (11:15 +0100)]
set boolean fields to false if not set.

4 years agodev/core/-/issues/1794, changed int to tinyint for boolean fields
Pradeep Nayak [Thu, 4 Jun 2020 09:47:34 +0000 (10:47 +0100)]
dev/core/-/issues/1794, changed int to tinyint for boolean fields

4 years ago[Ref] remove calls to, and deprecate, pending function
eileen [Thu, 4 Jun 2020 07:00:54 +0000 (19:00 +1200)]
[Ref] remove calls to, and deprecate, pending function

4 years ago[REF] Remove always NULL param modified_id
eileen [Tue, 2 Jun 2020 08:48:10 +0000 (20:48 +1200)]
[REF] Remove always NULL param modified_id

This funnction is not now shared with any other forms

4 years agoTest fixes to support apiv4 add of MembershipType
eileen [Thu, 4 Jun 2020 06:41:45 +0000 (18:41 +1200)]
Test fixes to support apiv4 add of MembershipType

4 years agoConvert remaining Authorize.net test to use guzzle
eileen [Tue, 2 Jun 2020 21:37:28 +0000 (09:37 +1200)]
Convert remaining Authorize.net test to use guzzle

This allows us to remove the handling for when a.net doesn't reply

4 years agoMerge pull request #17486 from seamuslee001/master
Seamus Lee [Thu, 4 Jun 2020 05:01:15 +0000 (15:01 +1000)]
Merge pull request #17486 from seamuslee001/master

5.26

4 years agoMerge in 5.26
Seamus Lee [Thu, 4 Jun 2020 05:00:16 +0000 (15:00 +1000)]
Merge in 5.26

4 years agoMerge pull request #17485 from totten/5.26-misc
Tim Otten [Thu, 4 Jun 2020 04:58:04 +0000 (21:58 -0700)]
Merge pull request #17485 from totten/5.26-misc

5.26.0 - Small edits

4 years agoSet version to 5.26.0
Tim Otten [Thu, 4 Jun 2020 04:47:13 +0000 (21:47 -0700)]
Set version to 5.26.0

4 years agorelease-notes/5.26.0 - Copy-edits
Tim Otten [Thu, 4 Jun 2020 04:46:48 +0000 (21:46 -0700)]
release-notes/5.26.0 - Copy-edits

4 years agoMerge pull request #17484 from civicrm/5.26
Seamus Lee [Thu, 4 Jun 2020 04:06:04 +0000 (14:06 +1000)]
Merge pull request #17484 from civicrm/5.26

5.26

4 years agoMerge pull request #17483 from agh1/5.26.0-release-notes-final
Seamus Lee [Thu, 4 Jun 2020 02:26:15 +0000 (12:26 +1000)]
Merge pull request #17483 from agh1/5.26.0-release-notes-final

5.26.0 release notes final

4 years agoMerge pull request #17482 from colemanw/orderBySuffix
Eileen McNaughton [Thu, 4 Jun 2020 01:02:16 +0000 (13:02 +1200)]
Merge pull request #17482 from colemanw/orderBySuffix

APIv4 - Support pseudoconstant suffixes in orderBy clause

4 years agoMerge pull request #17481 from eileenmcnaughton/email
Seamus Lee [Thu, 4 Jun 2020 00:39:32 +0000 (10:39 +1000)]
Merge pull request #17481 from eileenmcnaughton/email

[REF] Extract createFollowUpActivities

4 years ago5.26.0 release notes: some final edits
Andrew Hunt [Wed, 3 Jun 2020 23:51:13 +0000 (19:51 -0400)]
5.26.0 release notes: some final edits

4 years agoAPIv4 - Support pseudoconstant suffixes in orderBy clause
Coleman Watts [Wed, 3 Jun 2020 23:09:34 +0000 (19:09 -0400)]
APIv4 - Support pseudoconstant suffixes in orderBy clause

4 years agoMerge pull request #17476 from civicrm/5.26
Seamus Lee [Wed, 3 Jun 2020 23:00:26 +0000 (09:00 +1000)]
Merge pull request #17476 from civicrm/5.26

5.26

4 years ago5.26.0 release notes: added late changes
Andrew Hunt [Wed, 3 Jun 2020 00:29:30 +0000 (20:29 -0400)]
5.26.0 release notes: added late changes

4 years agoMerge pull request #17478 from seamuslee001/document_recent_merge_wordpress_notice
Seamus Lee [Wed, 3 Jun 2020 21:18:24 +0000 (07:18 +1000)]
Merge pull request #17478 from seamuslee001/document_recent_merge_wordpress_notice

Document recent merge in regards to select fields for export screen a…

4 years agoMerge pull request #17470 from colemanw/array
Eileen McNaughton [Wed, 3 Jun 2020 21:16:07 +0000 (09:16 +1200)]
Merge pull request #17470 from colemanw/array

NFC - Change array() to short syntax []

4 years ago[REF] Extract createFollowUpActivities
eileen [Tue, 26 May 2020 03:48:30 +0000 (15:48 +1200)]
[REF] Extract createFollowUpActivities

4 years agoUpdate 5.26.0.md
Tim Otten [Wed, 3 Jun 2020 19:21:40 +0000 (12:21 -0700)]
Update 5.26.0.md

4 years agoMerge pull request #17474 from eileenmcnaughton/processor_name
Matthew Wire [Wed, 3 Jun 2020 09:02:03 +0000 (10:02 +0100)]
Merge pull request #17474 from eileenmcnaughton/processor_name

Remove last reference to Payment->_processorName in core & remove from processors

4 years agoMerge pull request #17468 from mattwire/removesingleton
Matthew Wire [Wed, 3 Jun 2020 09:00:39 +0000 (10:00 +0100)]
Merge pull request #17468 from mattwire/removesingleton

Remove unused singleton from core payment processors

4 years agoUpdate 5.26.0.md
Tim Otten [Wed, 3 Jun 2020 07:05:24 +0000 (00:05 -0700)]
Update 5.26.0.md

4 years agoUpdate 5.26.0.md
Tim Otten [Wed, 3 Jun 2020 07:01:30 +0000 (00:01 -0700)]
Update 5.26.0.md

4 years agoDocument recent merge in regards to select fields for export screen and add in the...
Seamus Lee [Wed, 3 Jun 2020 04:27:01 +0000 (14:27 +1000)]
Document recent merge in regards to select fields for export screen and add in the notice about WordPress compatability issue

4 years agoMerge pull request #17444 from seamuslee001/deb_core_1725
Seamus Lee [Wed, 3 Jun 2020 04:19:34 +0000 (14:19 +1000)]
Merge pull request #17444 from seamuslee001/deb_core_1725

dev/core#1725 Remove groups, tags and notes from the returned data fo…

4 years agoMerge pull request #17442 from eileenmcnaughton/email3
colemanw [Wed, 3 Jun 2020 00:57:35 +0000 (20:57 -0400)]
Merge pull request #17442 from eileenmcnaughton/email3

[REF] Switch to an api call to get the contact details.

4 years agoMerge pull request #17446 from Edzelopez/fix-hideshow-receivedate
Seamus Lee [Wed, 3 Jun 2020 00:51:06 +0000 (10:51 +1000)]
Merge pull request #17446 from Edzelopez/fix-hideshow-receivedate

Fixed hide show of start date

4 years agoMerge pull request #17464 from eileenmcnaughton/renew
Seamus Lee [Wed, 3 Jun 2020 00:50:44 +0000 (10:50 +1000)]
Merge pull request #17464 from eileenmcnaughton/renew

[REF] Remove never-passed params from function signature

4 years agoMerge pull request #17447 from mattwire/repeattransactiondisablerecur
Eileen McNaughton [Tue, 2 Jun 2020 23:58:19 +0000 (11:58 +1200)]
Merge pull request #17447 from mattwire/repeattransactiondisablerecur

Don't allow Contribution.repeattransaction to be used without a recurring contribution

4 years agoMerge pull request #17471 from colemanw/customSpec
Eileen McNaughton [Tue, 2 Jun 2020 23:49:04 +0000 (11:49 +1200)]
Merge pull request #17471 from colemanw/customSpec

APIv4 - Improve custom field spec gathering

4 years agodev/core#1725 Remove groups, tags and notes from the returned data for the usage...
Seamus Lee [Mon, 1 Jun 2020 08:39:43 +0000 (18:39 +1000)]
dev/core#1725 Remove groups, tags and notes from the returned data for the usage in preview data to speed up loading of the select fields screen

4 years agoMerge pull request #17472 from alifrumin/rn-5.26
Seamus Lee [Tue, 2 Jun 2020 22:48:48 +0000 (08:48 +1000)]
Merge pull request #17472 from alifrumin/rn-5.26

Annotated 5.26 release notes

4 years agoRemove last reference to Payment->_processorName in core & remove from processors
eileen [Tue, 2 Jun 2020 21:47:47 +0000 (09:47 +1200)]
Remove last reference to Payment->_processorName in core & remove from processors

I left it on Core_Payment to keep the deprecation notice visible

4 years agorelease-notes 5.26: annotating release notes
Alice Frumin [Tue, 2 Jun 2020 02:16:34 +0000 (22:16 -0400)]
release-notes 5.26: annotating release notes

4 years agoMerge pull request #17469 from colemanw/memberTypeTest
Eileen McNaughton [Tue, 2 Jun 2020 20:43:11 +0000 (08:43 +1200)]
Merge pull request #17469 from colemanw/memberTypeTest

[REF] Fix serialized membership field handling in RelationshipTest

4 years agoAPIv4 - Improve custom field spec gathering
Coleman Watts [Tue, 2 Jun 2020 15:13:56 +0000 (11:13 -0400)]
APIv4 - Improve custom field spec gathering

Uses the basicTypes() function instead of hard-coding contact types,
Includes all the weird variants of Participant.

4 years agoAdd Api4 MembershipType
Matthew Wire [Mon, 1 Jun 2020 12:03:34 +0000 (13:03 +0100)]
Add Api4 MembershipType

4 years agoNFC - Change array() to short syntax []
Coleman Watts [Tue, 2 Jun 2020 14:42:55 +0000 (10:42 -0400)]
NFC - Change array() to short syntax []

4 years agoFix serialized membership field handling in RelationshipTest
Coleman Watts [Tue, 2 Jun 2020 14:16:03 +0000 (10:16 -0400)]
Fix serialized membership field handling in RelationshipTest

These fields were being unnecessarily and incorrectly serialized by the test.
Passing an array is preferred and it will handle the serialization correctly.

4 years agoMerge pull request #17372 from eileenmcnaughton/opts
colemanw [Tue, 2 Jun 2020 14:06:55 +0000 (10:06 -0400)]
Merge pull request #17372 from eileenmcnaughton/opts

Add more search options

4 years agoMerge pull request #17413 from scoobird/assign_relationship_1287
colemanw [Tue, 2 Jun 2020 14:05:10 +0000 (10:05 -0400)]
Merge pull request #17413 from scoobird/assign_relationship_1287

Allow bidirectional assignment of relationships from search results

4 years agoRemove unused singleton from core payment processors
Matthew Wire [Tue, 2 Jun 2020 13:55:35 +0000 (14:55 +0100)]
Remove unused singleton from core payment processors

4 years agoMerge pull request #17467 from civicrm/5.26
Seamus Lee [Tue, 2 Jun 2020 13:38:00 +0000 (23:38 +1000)]
Merge pull request #17467 from civicrm/5.26

5.26

4 years agoMerge pull request #17466 from mattwire/subscriptiondetail
Seamus Lee [Tue, 2 Jun 2020 13:28:06 +0000 (23:28 +1000)]
Merge pull request #17466 from mattwire/subscriptiondetail

Add actual field name for processor_id to getSubscriptionDetails

4 years agoMerge pull request #17465 from seamuslee001/upgrde_required_fields
Seamus Lee [Tue, 2 Jun 2020 13:26:10 +0000 (23:26 +1000)]
Merge pull request #17465 from seamuslee001/upgrde_required_fields

[REF] Implement required fields database changes that have occured du…

4 years agoMerge pull request #17462 from eileenmcnaughton/526ex
Yashodha Chaku [Tue, 2 Jun 2020 11:46:37 +0000 (17:16 +0530)]
Merge pull request #17462 from eileenmcnaughton/526ex

dev/core#1780 Fix bug where non-household merge contacts were being skipped

4 years agoMerge pull request #17424 from kcristiano/5.26.upgrade-message
Seamus Lee [Tue, 2 Jun 2020 11:08:23 +0000 (21:08 +1000)]
Merge pull request #17424 from kcristiano/5.26.upgrade-message

Add Upgrade Warning.  Limit to WP Only.

4 years ago[REF] Implement required fields database changes that have occured during 5.27.alpha1...
Seamus Lee [Tue, 2 Jun 2020 09:31:56 +0000 (19:31 +1000)]
[REF] Implement required fields database changes that have occured during 5.27.alpha1 development cycle

4 years agoAdd actual field name for processor_id to getSubscriptionDetails
Matthew Wire [Tue, 2 Jun 2020 09:45:44 +0000 (10:45 +0100)]
Add actual field name for processor_id to getSubscriptionDetails

4 years agoget link to Blog Post
Kevin Cristiano [Mon, 1 Jun 2020 17:44:38 +0000 (13:44 -0400)]
get link to Blog Post

4 years agoAdd PostUpgrade Message
Kevin Cristiano [Fri, 29 May 2020 18:31:32 +0000 (14:31 -0400)]
Add PostUpgrade Message

Signed-off-by: Kevin Cristiano <kcristiano@kcristiano.com>
4 years agoAdd Upgrade Warning. Limit to WP Only.
Kevin Cristiano [Fri, 29 May 2020 14:26:39 +0000 (10:26 -0400)]
Add Upgrade Warning. Limit to WP Only.

Signed-off-by: Kevin Cristiano <kcristiano@kcristiano.com>
4 years ago[REF] Remove never-passed params from function signature
eileen [Tue, 2 Jun 2020 07:53:40 +0000 (19:53 +1200)]
[REF] Remove never-passed params from function signature

These params were used when the code was shared with other forms, but not now it is been
separated onto this form