civicrm-core.git
3 years agoMerge pull request #18589 from eileenmcnaughton/ex_class
Monish Deb [Mon, 12 Oct 2020 16:04:30 +0000 (21:34 +0530)]
Merge pull request #18589 from eileenmcnaughton/ex_class

[REF]  Separate export form classes out & simplify task handling

3 years agoMerge pull request #18555 from eileenmcnaughton/del_primary
Monish Deb [Mon, 12 Oct 2020 14:39:12 +0000 (20:09 +0530)]
Merge pull request #18555 from eileenmcnaughton/del_primary

dev/core#2047 Fix merge code so that deleted contacts are not left without a primary address

3 years agodev/core#2039 Fix merge code so that deleted contacts are not left without a primary...
eileen [Tue, 22 Sep 2020 02:43:29 +0000 (14:43 +1200)]
dev/core#2039 Fix merge code so that deleted contacts are not left without a primary address

This was picked up in tests to ensure that removing a line of code creating excessing queries
would not cause regressions.

https://lab.civicrm.org/dev/core/-/issues/2039

I considered altering the test to exclude deleted contacts but we run the risk that if a contact
is undeleted they will have no primary address so I figured the integrity makes sense.

Note there are a couple of queries in this code that can go (retrieving stuff
we already have) - depending how I go on getting review on this & related tidy up I'll remove them
in a later PR

3 years agoMerge pull request #18737 from eileenmcnaughton/ppp
Eileen McNaughton [Sun, 11 Oct 2020 23:03:34 +0000 (12:03 +1300)]
Merge pull request #18737 from eileenmcnaughton/ppp

dev/financial#152 remove unused parameter

3 years agodev/financial#152 remove unused parameter
eileen [Sun, 11 Oct 2020 21:15:28 +0000 (10:15 +1300)]
dev/financial#152 remove unused parameter

3 years agoMerge pull request #18651 from eileenmcnaughton/cf
Matthew Wire [Sun, 11 Oct 2020 09:31:18 +0000 (10:31 +0100)]
Merge pull request #18651 from eileenmcnaughton/cf

[REF] Minor simplification - don't use a variable for table name

3 years agoMerge pull request #18728 from eileenmcnaughton/aip
Matthew Wire [Sun, 11 Oct 2020 09:30:08 +0000 (10:30 +0100)]
Merge pull request #18728 from eileenmcnaughton/aip

dev/financial#152 Pass contribution directly to completeOrder

3 years agoMerge pull request #18733 from eileenmcnaughton/aipn
Matthew Wire [Sun, 11 Oct 2020 09:28:50 +0000 (10:28 +0100)]
Merge pull request #18733 from eileenmcnaughton/aipn

dev/financial#152 [REF] Extract getMembershipID

3 years agoMerge pull request #18734 from eileenmcnaughton/ppp
Matthew Wire [Sun, 11 Oct 2020 09:28:01 +0000 (10:28 +0100)]
Merge pull request #18734 from eileenmcnaughton/ppp

dev/financial#152 Remove unreachable code

3 years agoMerge pull request #18727 from colemanw/entityTest
Seamus Lee [Sun, 11 Oct 2020 02:37:10 +0000 (13:37 +1100)]
Merge pull request #18727 from colemanw/entityTest

[Test] Ensure all APIv4 entities have basic info

3 years agodev/financial#152 Remove unreachable code
eileen [Sun, 11 Oct 2020 00:36:19 +0000 (13:36 +1300)]
dev/financial#152 Remove unreachable code

This code cann only be reached if txnType is recurring_payment. Given that we can look
at the earlier switch and see that in that case first must be TRUE or it would have
already returned. Ergo this code is unreachable - and would have been
since the earlier code switched to using the api to handle non-firsts

3 years agoMerge pull request #18732 from eileenmcnaughton/fail
Seamus Lee [Sun, 11 Oct 2020 00:07:23 +0000 (11:07 +1100)]
Merge pull request #18732 from eileenmcnaughton/fail

dev/financial#152 Remove unused parameters from BaseIPN->failed signature

3 years agodev/financial#152 [REF] Extract getMembershipID
eileen [Sat, 10 Oct 2020 23:30:36 +0000 (12:30 +1300)]
dev/financial#152 [REF] Extract getMembershipID

Note that since NULL is valid we can just return the result of the query. Bypassing for
component=event doesn't provide enough value to justify relying on a url param
as opposed to just looking it up & feels very original-form-flow

3 years agoMerge pull request #18730 from eileenmcnaughton/pp
Seamus Lee [Sat, 10 Oct 2020 23:20:49 +0000 (10:20 +1100)]
Merge pull request #18730 from eileenmcnaughton/pp

dev/financial#152 Remove unused parameters from BaseIPN->cancelled signature

3 years agoMerge pull request #18729 from eileenmcnaughton/aipn
Eileen McNaughton [Sat, 10 Oct 2020 22:37:07 +0000 (11:37 +1300)]
Merge pull request #18729 from eileenmcnaughton/aipn

dev/financial#152 Clean up & test contributionPageID handling

3 years agodev/financial#152 Remove unused parameters from BaseIPN->failed signature
eileen [Sat, 10 Oct 2020 21:54:36 +0000 (10:54 +1300)]
dev/financial#152 Remove unused parameters from BaseIPN->failed signature

Same as https://github.com/civicrm/civicrm-core/pull/18730 but for failed

3 years agoTest: Ensure all APIv4 entities have basic info
Coleman Watts [Sat, 10 Oct 2020 15:15:45 +0000 (11:15 -0400)]
Test: Ensure all APIv4 entities have basic info

3 years agoRemove unused parameters from BaseIPN->cancelled signature
eileen [Sat, 10 Oct 2020 21:20:33 +0000 (10:20 +1300)]
Remove unused parameters from BaseIPN->cancelled signature

3 years agodev/financial#152 Clean up & test contributionPageID handling
eileen [Sat, 10 Oct 2020 20:32:12 +0000 (09:32 +1300)]
dev/financial#152 Clean up & test contributionPageID handling

3 years agoMerge pull request #18726 from demeritcowboy/static-pdfformat
Seamus Lee [Sat, 10 Oct 2020 20:30:54 +0000 (07:30 +1100)]
Merge pull request #18726 from demeritcowboy/static-pdfformat

dev/core#2110 - Warning "Non-static method CRM_Contact_Page_AJAX::pdfFormat() should not be called statically" when changing the page format on print/merge document

3 years agodev/financial#152 Pass contribution directly to completeOrder
eileen [Sat, 10 Oct 2020 19:53:45 +0000 (08:53 +1300)]
dev/financial#152 Pass contribution directly to completeOrder

We have done quite a a bit of cleanup on this and the only value in objects now used is
contribution - this is really explict in the code as we actually unset objects after
extracting contribution.

This alters the function signature such that it receives contribution directly rather than
in an array

3 years agoMerge pull request #18631 from eileenmcnaughton/ppp
colemanw [Sat, 10 Oct 2020 19:39:33 +0000 (15:39 -0400)]
Merge pull request #18631 from eileenmcnaughton/ppp

dev/financial#152 [REF] Parse ids before sending to single function (minor simplification)

3 years agoMerge pull request #18629 from eileenmcnaughton/aipn
colemanw [Sat, 10 Oct 2020 19:38:26 +0000 (15:38 -0400)]
Merge pull request #18629 from eileenmcnaughton/aipn

dev/financial#152 [REF] Parse ids before sending to recur function (minor simplification)

3 years agoMerge pull request #17969 from seamuslee001/widget_normal_route
Eileen McNaughton [Sat, 10 Oct 2020 19:14:35 +0000 (08:14 +1300)]
Merge pull request #17969 from seamuslee001/widget_normal_route

dev/cloud-native#16 Migrate Contribution Page widget extern url to us…

3 years agoMerge pull request #18725 from civicrm/5.31
colemanw [Sat, 10 Oct 2020 18:11:24 +0000 (14:11 -0400)]
Merge pull request #18725 from civicrm/5.31

5.31

3 years agoMerge pull request #18717 from eileenmcnaughton/static2
colemanw [Sat, 10 Oct 2020 15:39:01 +0000 (11:39 -0400)]
Merge pull request #18717 from eileenmcnaughton/static2

dev/core#2108 fix deprecation notice take 2

3 years agoMerge pull request #18713 from eileenmcnaughton/531
colemanw [Sat, 10 Oct 2020 15:33:42 +0000 (11:33 -0400)]
Merge pull request #18713 from eileenmcnaughton/531

dev/core#2102 Fix hang on event edit

3 years agomake routing endpoint static
demeritcowboy [Sat, 10 Oct 2020 13:32:26 +0000 (09:32 -0400)]
make routing endpoint static

3 years agoMerge pull request #18723 from colemanw/crmSearchCleanup
Seamus Lee [Fri, 9 Oct 2020 23:22:35 +0000 (10:22 +1100)]
Merge pull request #18723 from colemanw/crmSearchCleanup

Search ext: misc cleanup & fixes

3 years agodev/cloud-native#16 Migrate Contribution Page widget extern url to use the normal...
Seamus Lee [Mon, 27 Jul 2020 01:53:58 +0000 (11:53 +1000)]
dev/cloud-native#16 Migrate Contribution Page widget extern url to use the normal CMS routing mechanism

Update test to test both endpoints

3 years agoSearch ext: Ensure all entities have titlePlural to fix sort/display
Coleman Watts [Fri, 9 Oct 2020 21:12:57 +0000 (17:12 -0400)]
Search ext: Ensure all entities have titlePlural to fix sort/display

3 years agoMerge pull request #18719 from JMAConsulting/core_2105
Eileen McNaughton [Fri, 9 Oct 2020 20:56:04 +0000 (09:56 +1300)]
Merge pull request #18719 from JMAConsulting/core_2105

core#2105: Groups children now get shown with SPAN CSS error

3 years agoMerge pull request #18716 from eileenmcnaughton/static
colemanw [Fri, 9 Oct 2020 20:55:54 +0000 (16:55 -0400)]
Merge pull request #18716 from eileenmcnaughton/static

dev/core#2108 fix deprecation notice

3 years agoSearch ext: misc cleanup & fixes
Coleman Watts [Fri, 9 Oct 2020 20:44:06 +0000 (16:44 -0400)]
Search ext: misc cleanup & fixes

- Fixes white on white button text by adding btn-default class
- Fixes missing field names in the bulk-update action
- Decouples searchActions from the main search controller
- Misc cleanup

3 years agoMerge pull request #18720 from artfulrobot/artfulrobot-core-issue-1428
colemanw [Fri, 9 Oct 2020 20:40:57 +0000 (16:40 -0400)]
Merge pull request #18720 from artfulrobot/artfulrobot-core-issue-1428

dev/core#1428 Add test for Activity::update()

3 years agoMerge pull request #18715 from seamuslee001/dev_financial_11
Seamus Lee [Fri, 9 Oct 2020 09:03:23 +0000 (20:03 +1100)]
Merge pull request #18715 from seamuslee001/dev_financial_11

dev/financial#11 Expand unit test to ensure that the correct currency…

3 years agoAdd test for Activity::update()
Rich Lott / Artful Robot [Fri, 9 Oct 2020 08:26:27 +0000 (09:26 +0100)]
Add test for Activity::update()

3 years agocore#2105: Groups children now get shown with SPAN CSS error
Monish Deb [Fri, 9 Oct 2020 04:23:04 +0000 (09:53 +0530)]
core#2105: Groups children now get shown with SPAN CSS error

3 years agodev/core#2108 fix deprecation notice take 2
eileen [Fri, 9 Oct 2020 03:43:34 +0000 (16:43 +1300)]
dev/core#2108 fix deprecation notice take 2

Loosens the deprecation notice - alternative to https://github.com/civicrm/civicrm-core/pull/18716 but
we should merge both IMHO

3 years agodev/core#2108 fix deprecation notice
eileen [Fri, 9 Oct 2020 03:36:39 +0000 (16:36 +1300)]
dev/core#2108 fix deprecation notice

This addresses the deprecation warning by moving the text to the tpl layer - we could ease up
on the deprecation for type = 'static' but the pattern didn't seem to make much sense or to be
consistent with how we normally do things

3 years agoMerge pull request #18714 from MegaphoneJon/financial-111
Seamus Lee [Fri, 9 Oct 2020 00:54:23 +0000 (11:54 +1100)]
Merge pull request #18714 from MegaphoneJon/financial-111

Financial#111: Contribution tokens always display amount with default…

3 years agodev/financial#11 Expand unit test to ensure that the correct currency is outputted...
Seamus Lee [Fri, 9 Oct 2020 00:51:06 +0000 (11:51 +1100)]
dev/financial#11 Expand unit test to ensure that the correct currency is outputted in the token

3 years agoMerge pull request #18688 from seamuslee001/dompdf_upgrade
Eileen McNaughton [Fri, 9 Oct 2020 00:46:32 +0000 (13:46 +1300)]
Merge pull request #18688 from seamuslee001/dompdf_upgrade

[REF] Upgrade DomPDF to v0.8.6

3 years agodev/core#2102 Fix hang on event edit
eileen [Thu, 8 Oct 2020 20:57:45 +0000 (09:57 +1300)]
dev/core#2102 Fix hang on event edit

Per https://lab.civicrm.org/dev/core/-/issues/2102

3 years agoFinancial#111: Contribution tokens always display amount with default currency
Jon Goldberg [Thu, 8 Oct 2020 21:20:32 +0000 (17:20 -0400)]
Financial#111: Contribution tokens always display amount with default currency

3 years agoSet version to 5.32.alpha1
CiviCRM [Thu, 8 Oct 2020 09:45:03 +0000 (09:45 +0000)]
Set version to 5.32.alpha1

3 years agoSet version to 5.31.beta1
CiviCRM [Thu, 8 Oct 2020 09:44:07 +0000 (09:44 +0000)]
Set version to 5.31.beta1

3 years agoMerge pull request #18710 from eileenmcnaughton/locev2
Tim Otten [Thu, 8 Oct 2020 08:42:39 +0000 (01:42 -0700)]
Merge pull request #18710 from eileenmcnaughton/locev2

dev/core#2096 Fix in-master-only regression on creating new events

3 years agoMerge pull request #18708 from eileenmcnaughton/locev
Seamus Lee [Thu, 8 Oct 2020 05:18:29 +0000 (16:18 +1100)]
Merge pull request #18708 from eileenmcnaughton/locev

Add unit test that ultimately failed to hit the desired code but does add cover

3 years agoMerge pull request #18711 from seamuslee001/move_to_alpha1_stage
Seamus Lee [Thu, 8 Oct 2020 05:17:23 +0000 (16:17 +1100)]
Merge pull request #18711 from seamuslee001/move_to_alpha1_stage

Move to alpha1 stage

3 years ago[REF] Move recently added upgrade steps from 5.31.0 to 5.31.alpha1 step
Seamus Lee [Thu, 8 Oct 2020 02:20:23 +0000 (13:20 +1100)]
[REF] Move recently added upgrade steps from 5.31.0 to 5.31.alpha1 step

3 years agodev/core#2096 Fix in-master-only regression on creating new events
eileen [Thu, 8 Oct 2020 02:19:08 +0000 (15:19 +1300)]
dev/core#2096 Fix in-master-only regression on creating new events

3 years ago[NFC] Regen after #18624
Seamus Lee [Thu, 8 Oct 2020 01:49:36 +0000 (12:49 +1100)]
[NFC] Regen after #18624

3 years agoAdd unit test that ultimately failed to hit the desired code but does add cover
eileen [Thu, 8 Oct 2020 01:48:23 +0000 (14:48 +1300)]
Add unit test that ultimately failed to hit the desired code but does add cover

3 years agoMerge pull request #18624 from compucorp/CATL-1613-skip-non-case-email
Seamus Lee [Thu, 8 Oct 2020 01:47:45 +0000 (12:47 +1100)]
Merge pull request #18624 from compucorp/CATL-1613-skip-non-case-email

Add options to Mail Account settings to improve inbound mail processing

3 years agoMerge pull request #18360 from colemanw/fixMultiInProfile
Eileen McNaughton [Thu, 8 Oct 2020 01:33:38 +0000 (14:33 +1300)]
Merge pull request #18360 from colemanw/fixMultiInProfile

Fix way of identityfing custom serialized fields

3 years ago[REF] Upgrade DomPDF to v0.8.6
Seamus Lee [Wed, 7 Oct 2020 04:52:37 +0000 (15:52 +1100)]
[REF] Upgrade DomPDF to v0.8.6

3 years agoMerge pull request #18324 from mattwire/payproc_configoptional
Seamus Lee [Thu, 8 Oct 2020 01:02:44 +0000 (12:02 +1100)]
Merge pull request #18324 from mattwire/payproc_configoptional

Display url_site and url_recur based on if the form elements exist

3 years agoMerge pull request #18701 from eileenmcnaughton/leak7
Seamus Lee [Thu, 8 Oct 2020 01:00:41 +0000 (12:00 +1100)]
Merge pull request #18701 from eileenmcnaughton/leak7

dev/core#2073 Fix use of legacy leaky method in tested code

3 years agoMerge pull request #18707 from eileenmcnaughton/notice
Eileen McNaughton [Thu, 8 Oct 2020 00:58:59 +0000 (13:58 +1300)]
Merge pull request #18707 from eileenmcnaughton/notice

Enotice fix

3 years agoMerge pull request #18702 from eileenmcnaughton/leak8
Seamus Lee [Thu, 8 Oct 2020 00:27:51 +0000 (11:27 +1100)]
Merge pull request #18702 from eileenmcnaughton/leak8

dev/core#2073 Fix use of legacy leaky method in tested code

3 years agoMerge pull request #18704 from mlutfy/partListingOutput
Seamus Lee [Thu, 8 Oct 2020 00:23:25 +0000 (11:23 +1100)]
Merge pull request #18704 from mlutfy/partListingOutput

ParticipantListing Report: only display the View link for web, unhardcode others

3 years agoMerge pull request #18699 from eileenmcnaughton/leak5
Eileen McNaughton [Wed, 7 Oct 2020 23:46:52 +0000 (12:46 +1300)]
Merge pull request #18699 from eileenmcnaughton/leak5

dev/core#2073 Fix use of legacy leaky method in tested code

3 years agoMerge pull request #18493 from mlutfy/campaignReportDefaults
Eileen McNaughton [Wed, 7 Oct 2020 23:46:06 +0000 (12:46 +1300)]
Merge pull request #18493 from mlutfy/campaignReportDefaults

Fix default report permissions when creating reports from CiviCampaign

3 years agoEnotice fix
eileen [Wed, 7 Oct 2020 23:44:20 +0000 (12:44 +1300)]
Enotice fix

3 years agoMerge pull request #18706 from civicrm/5.30
Eileen McNaughton [Wed, 7 Oct 2020 23:11:03 +0000 (12:11 +1300)]
Merge pull request #18706 from civicrm/5.30

5.30

3 years agoMerge pull request #18680 from eileenmcnaughton/x
Eileen McNaughton [Wed, 7 Oct 2020 23:10:47 +0000 (12:10 +1300)]
Merge pull request #18680 from eileenmcnaughton/x

dev/financial#151 Paypal express validation fix on event

3 years agoMerge pull request #18705 from agh1/5.30.0-releasenotes-final
Seamus Lee [Wed, 7 Oct 2020 23:06:32 +0000 (10:06 +1100)]
Merge pull request #18705 from agh1/5.30.0-releasenotes-final

5.30.0 release notes: updated with late changes

3 years agoMerge pull request #18700 from eileenmcnaughton/leak6
Seamus Lee [Wed, 7 Oct 2020 22:34:16 +0000 (09:34 +1100)]
Merge pull request #18700 from eileenmcnaughton/leak6

dev/core#2073 Fix use of legacy leaky method in tested code

3 years agoMerge pull request #18698 from seamuslee001/test_dev_core_2053
Seamus Lee [Wed, 7 Oct 2020 22:21:32 +0000 (09:21 +1100)]
Merge pull request #18698 from seamuslee001/test_dev_core_2053

[NFC] dev/core#2053 Extend nextedGroup test to show that it will retu…

3 years ago5.30.0 release notes: updated with late changes
Andrew Hunt [Wed, 7 Oct 2020 22:10:04 +0000 (18:10 -0400)]
5.30.0 release notes: updated with late changes

3 years agodev/core#2073 Fix use of legacy leaky method in tested code
eileen [Wed, 7 Oct 2020 20:14:44 +0000 (09:14 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code

This is too low volume to really leak but it uses the leaky legacy method and
has test cover in

CRM_Contact_Import_Form_MapFieldTest.testSubmit with data set basic_data
CRM_Contact_Import_Form_MapFieldTest.testSubmit with data set save_mapping

3 years agoParticipantListing Report: only display the View link for web, unhardcode others
Mathieu Lutfy [Wed, 7 Oct 2020 21:33:09 +0000 (17:33 -0400)]
ParticipantListing Report: only display the View link for web, unhardcode others

3 years agoMerge pull request #18654 from eileenmcnaughton/token1
colemanw [Wed, 7 Oct 2020 21:26:56 +0000 (17:26 -0400)]
Merge pull request #18654 from eileenmcnaughton/token1

dev/core#2079  [REF] Fix some more calls to getTokens to make it clear only the first return value is used

3 years agoMerge pull request #18653 from eileenmcnaughton/token
colemanw [Wed, 7 Oct 2020 21:26:04 +0000 (17:26 -0400)]
Merge pull request #18653 from eileenmcnaughton/token

dev/core#2079 [Ref] Clarify calls to CRM_Utils_Token::getTokenDetails

3 years agodev/financial#151 Paypal express validation fix on event
eileen [Tue, 6 Oct 2020 21:35:31 +0000 (10:35 +1300)]
dev/financial#151 Paypal express validation fix on event

extension of https://github.com/civicrm/civicrm-core/pull/18459

3 years agodev/core#2073 Fix use of legacy leaky method in tested code
eileen [Wed, 7 Oct 2020 20:48:00 +0000 (09:48 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code

Overview
----------------------------------------
Fix use of legacy leaky method in tested code

Before
----------------------------------------

After
----------------------------------------

Technical Details
----------------------------------------
Has test cover in
CRM_Member_Form_MembershipTest.testSubmitUpdateMembershipFromPartiallyPaid
CRM_Member_Form_MembershipTest.testMembershipViewContributionOwnerDifferent

Comments
----------------------------------------

3 years agodev/core#2073 Fix use of legacy leaky method in tested code
eileen [Wed, 7 Oct 2020 20:37:26 +0000 (09:37 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code

Overview
----------------------------------------
Fix use of legacy leaky method in tested code

Before
----------------------------------------
dao->query()

After
----------------------------------------
CRM_Core_DAO::executeQuery()

Technical Details
----------------------------------------
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in

CRM_Import_DataSource_CsvTest.testToCsv with data set #0
CRM_Import_DataSource_CsvTest.testToCsv with data set #1
----------------------------------------

3 years agodev/core#2073 Fix use of legacy leaky method in tested code
eileen [Wed, 7 Oct 2020 20:22:22 +0000 (09:22 +1300)]
dev/core#2073 Fix use of legacy leaky method in tested code

Overview
----------------------------------------
Fix use of legacy leaky method in tested code

Before
----------------------------------------
dao->query()

After
----------------------------------------
CRM_Core_DAO::executeQuery()

Technical Details
----------------------------------------
This is too low volume to really leak but it uses the leaky legacy method and
has test cover in

CRM_Contact_Page_View_UserDashboard_GroupContactTest.testBrowseDisplaysCorrectListOfAddedGroups
CRM_Contact_Page_View_UserDashboard_GroupContactTest.testBrowseDisplaysCorrectListOfAVailableGroups
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentEmptyContact
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributionsWithInvoicingEnabled
CRM_Contact_Page_View_UserDashBoardTest.testDashboardContentContributions

----------------------------------------

3 years ago[NFC] dev/core#2053 Extend nextedGroup test to show that it will return child groups...
Seamus Lee [Wed, 7 Oct 2020 19:58:03 +0000 (06:58 +1100)]
[NFC] dev/core#2053 Extend nextedGroup test to show that it will return child groups that are Mailing groups even when the parent isn't a mailing group

3 years agoMerge pull request #18667 from eileenmcnaughton/uf
colemanw [Wed, 7 Oct 2020 19:15:53 +0000 (15:15 -0400)]
Merge pull request #18667 from eileenmcnaughton/uf

dev/core#2087 Remove extraneous  CRM_Core_BAO_UFMatch::updateUFName call

3 years agoMerge pull request #18696 from colemanw/btnNoConflict
Eileen McNaughton [Wed, 7 Oct 2020 19:15:15 +0000 (08:15 +1300)]
Merge pull request #18696 from colemanw/btnNoConflict

Greenwich - fix conflict btw bootstrap & jQuery UI button

3 years agoMerge pull request #18556 from eileenmcnaughton/pcp
colemanw [Wed, 7 Oct 2020 19:09:21 +0000 (15:09 -0400)]
Merge pull request #18556 from eileenmcnaughton/pcp

dev/core#2056 Only retrieve pcp & soft_credit info when needed

3 years agoMerge pull request #18695 from colemanw/ids
Eileen McNaughton [Wed, 7 Oct 2020 18:59:18 +0000 (07:59 +1300)]
Merge pull request #18695 from colemanw/ids

Exclude api4 from IDS check

3 years agoMerge pull request #18500 from eileenmcnaughton/loc
colemanw [Wed, 7 Oct 2020 16:23:42 +0000 (12:23 -0400)]
Merge pull request #18500 from eileenmcnaughton/loc

dev/core#2047 [Ref] Remove obsolete check

3 years agoMerge pull request #18650 from eileenmcnaughton/perms
colemanw [Wed, 7 Oct 2020 16:19:42 +0000 (12:19 -0400)]
Merge pull request #18650 from eileenmcnaughton/perms

Fix complexity on cache key

3 years agoMerge pull request #18663 from eileenmcnaughton/blockdel3
colemanw [Wed, 7 Oct 2020 13:47:34 +0000 (09:47 -0400)]
Merge pull request #18663 from eileenmcnaughton/blockdel3

dev/core#2039 Remove extraneous location queries from contact.create->Location::block path

3 years agoMerge pull request #18662 from eileenmcnaughton/blockdel2
colemanw [Wed, 7 Oct 2020 13:45:14 +0000 (09:45 -0400)]
Merge pull request #18662 from eileenmcnaughton/blockdel2

dev/core#2017 Deprecate an unused function

3 years agoMerge pull request #18693 from eileenmcnaughton/leak4
colemanw [Wed, 7 Oct 2020 13:42:28 +0000 (09:42 -0400)]
Merge pull request #18693 from eileenmcnaughton/leak4

dev/core#2073 Fix memory leak in well tested code

3 years agoMerge pull request #18683 from colemanw/searchClause
colemanw [Wed, 7 Oct 2020 13:40:29 +0000 (09:40 -0400)]
Merge pull request #18683 from colemanw/searchClause

Search ext & APIv4 Explorer: Refactor clause from directive to component

3 years agoGreenwich - fix conflict btw bootstrap & jQuery UI button
Coleman Watts [Wed, 7 Oct 2020 13:33:18 +0000 (09:33 -0400)]
Greenwich - fix conflict btw bootstrap & jQuery UI button

This calls noConflict on the Bootstrap3 $.fn.button() method, essentially getting rid of it,
as it is not used by CiviCRM, whereas the jQuery UI $.fn.button() is used.

If we needed the boostrap button function, we could rename it with something like:
`$.fn.btn = $.fn.button.noConflict();`

3 years agoExclude api4 from IDS check
Coleman Watts [Wed, 7 Oct 2020 12:54:00 +0000 (08:54 -0400)]
Exclude api4 from IDS check

3 years agoSearch ext & APIv4 Explorer: Refactor clause from directive to component
Coleman Watts [Wed, 7 Oct 2020 00:56:49 +0000 (20:56 -0400)]
Search ext & APIv4 Explorer: Refactor clause from directive to component

Improves compatibility with Angular 1.8; uses the more modern component system
with less coupling and cleaner interfaces.

3 years agoMerge pull request #18140 from mattwire/removetimeoutpermlocation
colemanw [Wed, 7 Oct 2020 11:26:37 +0000 (07:26 -0400)]
Merge pull request #18140 from mattwire/removetimeoutpermlocation

Remove ajax timeout from contribution page on behalf of

3 years agoMerge pull request #18682 from eileenmcnaughton/add4
Matthew Wire [Wed, 7 Oct 2020 10:40:00 +0000 (11:40 +0100)]
Merge pull request #18682 from eileenmcnaughton/add4

dev/core#2046 Fix api to call Address.create now it is standardised

3 years agoMerge pull request #18690 from seamuslee001/dev_translation_54
Matthew Wire [Wed, 7 Oct 2020 09:22:53 +0000 (10:22 +0100)]
Merge pull request #18690 from seamuslee001/dev_translation_54

dev/translation#54 Ensure that Component titles are translated in lin…

3 years agoMerge pull request #18692 from eileenmcnaughton/leak1
Seamus Lee [Wed, 7 Oct 2020 08:22:59 +0000 (19:22 +1100)]
Merge pull request #18692 from eileenmcnaughton/leak1

dev/core#2073 Remove memory leak in heavily tested (merge) code

3 years agoCATL-1613: Add new field to the mail account form - Skip emails which do not have...
Ivan [Thu, 13 Aug 2020 15:40:01 +0000 (16:40 +0100)]
CATL-1613: Add new field to the mail account form - Skip emails which do not have a Case ID or Case token

3 years agoCATL-1614: Add new field to the mail account form - Do not create new contacts when...
Ivan [Mon, 17 Aug 2020 12:13:33 +0000 (13:13 +0100)]
CATL-1614: Add new field to the mail account form - Do not create new contacts when filing emails

3 years agoMerge pull request #18694 from seamuslee001/master
Seamus Lee [Wed, 7 Oct 2020 07:45:05 +0000 (18:45 +1100)]
Merge pull request #18694 from seamuslee001/master

5.30