civicrm-core.git
4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

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

4 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

4 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

4 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

4 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

4 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…

4 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

4 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

4 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

4 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

4 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

4 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

4 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
----------------------------------------

4 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
----------------------------------------

4 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

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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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

4 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();`

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

4 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.

4 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

4 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

4 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…

4 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

4 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

4 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

4 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

4 years agoMerge in 5.30
Seamus Lee [Wed, 7 Oct 2020 07:42:43 +0000 (18:42 +1100)]
Merge in 5.30

4 years agoMerge pull request #18689 from seamuslee001/nfc_dao_update
Eileen McNaughton [Wed, 7 Oct 2020 07:40:11 +0000 (20:40 +1300)]
Merge pull request #18689 from seamuslee001/nfc_dao_update

[NFC] Update Checksum on CustomField DAO

4 years agodev/core#2073 Fix memory leak in well tested code
eileen [Wed, 7 Oct 2020 06:44:18 +0000 (19:44 +1300)]
dev/core#2073 Fix memory leak in well tested code

Example test

api_v3_ContactTest::testSortLimitChainedRelationshipGetCRM15983

4 years agoMerge pull request #18685 from seamuslee001/ab_test_fix
Seamus Lee [Wed, 7 Oct 2020 05:52:51 +0000 (16:52 +1100)]
Merge pull request #18685 from seamuslee001/ab_test_fix

[REF] Fix error when creating new AB test mailing because domain_id i…

4 years agodev/translation#54 Ensure that Component titles are translated in link text
Seamus Lee [Wed, 7 Oct 2020 05:47:03 +0000 (16:47 +1100)]
dev/translation#54 Ensure that Component titles are translated in link text

4 years ago[NFC] Update Checksum on CustomField DAO
Seamus Lee [Wed, 7 Oct 2020 05:42:25 +0000 (16:42 +1100)]
[NFC] Update Checksum on CustomField DAO

4 years agodev/core#2073 Remove memory leak in heavily tested (merge) code
eileen [Wed, 7 Oct 2020 05:35:49 +0000 (18:35 +1300)]
dev/core#2073 Remove memory leak in heavily tested (merge) code

There are dozens of tests that pass through these lines - I used api_v3_JobTest:testBatchMerge to step through it
- note the dao->affectedRows uses a query to determine that - so it is no more or less accurate than before

4 years agoMerge pull request #18623 from eileenmcnaughton/rene
Seamus Lee [Wed, 7 Oct 2020 04:24:53 +0000 (15:24 +1100)]
Merge pull request #18623 from eileenmcnaughton/rene

dev/core#1790 - Contact Card - Email Links

4 years ago[REF] Fix error when creating new AB test mailing because domain_id is a required...
Seamus Lee [Wed, 7 Oct 2020 04:17:51 +0000 (15:17 +1100)]
[REF] Fix error when creating new AB test mailing because domain_id is a required field

4 years agoMerge pull request #18684 from eileenmcnaughton/block
Seamus Lee [Wed, 7 Oct 2020 03:54:55 +0000 (14:54 +1100)]
Merge pull request #18684 from eileenmcnaughton/block

dev/core#2039 Call del directly - rather than now-deprecated blockDelete

4 years agoMerge pull request #18672 from colemanw/searchKit
Eileen McNaughton [Wed, 7 Oct 2020 02:49:42 +0000 (15:49 +1300)]
Merge pull request #18672 from colemanw/searchKit

Search ext: rename to Search Kit, mark as beta

4 years agodev/core#2046 Fix api to call Address.create now it is standardised
eileen [Wed, 7 Oct 2020 00:45:23 +0000 (13:45 +1300)]
dev/core#2046 Fix api to call Address.create now it is standardised

Switches  api from calling Address.add to Address.create as part of BAO standardisation on create.

This has no material impact - just standardisation

4 years agodev/core#2039 Call del directly - rather than now-deprecated blockDelete
eileen [Wed, 7 Oct 2020 01:05:46 +0000 (14:05 +1300)]
dev/core#2039 Call del directly - rather than now-deprecated blockDelete

blockDelete is now just wrapper for del so this is really NFC

4 years agodev/core#2046 Remove extraneous primary handling
eileen [Fri, 2 Oct 2020 01:49:50 +0000 (14:49 +1300)]
dev/core#2046 Remove extraneous primary handling

This builds on https://github.com/civicrm/civicrm-core/pull/18661 and removes extra primary handling

We can feel confident this is not needed as we have done a handful of rounds of tidy up & added tests
to ensure that for all 4 entities (email, phone, im & openid) potentially created through this
function both the create and the delete functions take action to ensure that the contact
is left with exactly one primary address at the end of this process

4 years agodev/core#2039 Remove extraneous location queries from contact.create->Location::block...
eileen [Tue, 6 Oct 2020 23:56:35 +0000 (12:56 +1300)]
dev/core#2039 Remove extraneous location queries from contact.create->Location::block path

Overview
----------------------------------------
Removes 10 queries from each contact  create that are otherwise dealt with elsewhere
Updated version of https://github.com/civicrm/civicrm-core/pull/18477

Before
----------------------------------------
After creating location blocks 2 queries are done for each of the 5 entities to ensure is_primary fields have not been messed up (ie contact has 1 or more phones but none are marked primary or contact has more than one primary phone).

After
----------------------------------------
Queries are removed as location entities are already created correctly

Technical Details
----------------------------------------
This PR is part of a series of PRs to make this possible - best documented at https://lab.civicrm.org/dev/core/-/issues/2039#note_47758

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

4 years agoMerge pull request #18679 from seamuslee001/vardump_d9_compatability
Seamus Lee [Tue, 6 Oct 2020 22:24:26 +0000 (09:24 +1100)]
Merge pull request #18679 from seamuslee001/vardump_d9_compatability

[REF] Fix compatability with Drupal 9 installing of var_dumper

4 years agoMerge pull request #18658 from eileenmcnaughton/address
Seamus Lee [Tue, 6 Oct 2020 22:09:15 +0000 (09:09 +1100)]
Merge pull request #18658 from eileenmcnaughton/address

dev/core#2046 Migrate BAO_Address::create towards standardisation

4 years agoMerge pull request #18661 from eileenmcnaughton/blockdel
Seamus Lee [Tue, 6 Oct 2020 22:08:34 +0000 (09:08 +1100)]
Merge pull request #18661 from eileenmcnaughton/blockdel

dev/core#2046 Fix blockDelete to delete while ensuring is_primary is valid

4 years agoMerge pull request #18664 from eileenmcnaughton/list
Seamus Lee [Tue, 6 Oct 2020 21:59:34 +0000 (08:59 +1100)]
Merge pull request #18664 from eileenmcnaughton/list

dev/core#2079 [REF] clean up call to apiQuery

4 years agoMerge pull request #18677 from pradpnayak/float
Eileen McNaughton [Tue, 6 Oct 2020 21:11:33 +0000 (10:11 +1300)]
Merge pull request #18677 from pradpnayak/float

change civicrm_price_set.min_amount to float

4 years ago[REF] Fix compatability with Drupal 9 installing of var_dumper
Seamus Lee [Tue, 6 Oct 2020 20:39:38 +0000 (07:39 +1100)]
[REF] Fix compatability with Drupal 9 installing of var_dumper

4 years agoMerge pull request #18678 from demeritcowboy/class-typos
Seamus Lee [Tue, 6 Oct 2020 20:36:25 +0000 (07:36 +1100)]
Merge pull request #18678 from demeritcowboy/class-typos

dev/core#2093 - Fix red error box on new individual form and ltrim typos and doubling-up of class attribute

4 years agoltrim typos
demeritcowboy [Tue, 6 Oct 2020 14:34:48 +0000 (10:34 -0400)]
ltrim typos

4 years agochange civicrm_price_set.min_amount to float
Pradeep Nayak [Tue, 6 Oct 2020 10:48:01 +0000 (11:48 +0100)]
change civicrm_price_set.min_amount to float

4 years agoMerge pull request #18665 from eileenmcnaughton/list2
Seamus Lee [Tue, 6 Oct 2020 06:16:32 +0000 (17:16 +1100)]
Merge pull request #18665 from eileenmcnaughton/list2

dev/core#2079 [REF] clean up call to apiQuery

4 years agoMerge pull request #18657 from eileenmcnaughton/token_2
Seamus Lee [Tue, 6 Oct 2020 06:14:05 +0000 (17:14 +1100)]
Merge pull request #18657 from eileenmcnaughton/token_2

dev/core#2079 do not return never-used, query-wasting variable

4 years agoRemove caching that messes with tests without any time saving
eileen [Tue, 6 Oct 2020 04:52:19 +0000 (17:52 +1300)]
Remove caching that messes with tests without any time saving

4 years agoAdd supporting test
eileen [Mon, 5 Oct 2020 23:11:38 +0000 (12:11 +1300)]
Add supporting test

4 years agoMerge pull request #18676 from seamuslee001/ref_remove_xml_util
Eileen McNaughton [Tue, 6 Oct 2020 04:47:33 +0000 (17:47 +1300)]
Merge pull request #18676 from seamuslee001/ref_remove_xml_util

[REF] Remove XML_Util dependancy within ewaysingle extension

4 years ago[REF] Remove XML_Util dependancy within ewaysingle extension
Seamus Lee [Tue, 6 Oct 2020 01:23:50 +0000 (12:23 +1100)]
[REF] Remove XML_Util dependancy within ewaysingle extension

4 years agoMerge pull request #18673 from totten/master-gitignore
Seamus Lee [Tue, 6 Oct 2020 01:27:44 +0000 (12:27 +1100)]
Merge pull request #18673 from totten/master-gitignore

When exporting for composer-style deployment, exclude the `.gitignore` file

4 years agodev/core#2079 [REF] clean up call to apiQuery
eileen [Fri, 2 Oct 2020 20:13:04 +0000 (09:13 +1300)]
dev/core#2079 [REF] clean up call to apiQuery

This fixes a few things
1) fixes apiQuery to be called statically as it is a static function
2) casts results directly to detail
3) removes unnused variable

4 years agodev/core#2087 Remove extraneous CRM_Core_BAO_UFMatch::updateUFName call
eileen [Fri, 2 Oct 2020 22:06:11 +0000 (11:06 +1300)]
dev/core#2087 Remove extraneous  CRM_Core_BAO_UFMatch::updateUFName call

This is called from Email.create already (which is how this creates emails) - to be cautious an extra
change ensures that if the primary email is deleled & another is promoted it is called

4 years agoMerge pull request #18675 from eileenmcnaughton/uf2
Seamus Lee [Tue, 6 Oct 2020 01:10:37 +0000 (12:10 +1100)]
Merge pull request #18675 from eileenmcnaughton/uf2

dev/core#2087 move uf_match check above the primary check

4 years agoMerge pull request #18674 from seamuslee001/form_buttons_key
Eileen McNaughton [Tue, 6 Oct 2020 00:47:12 +0000 (13:47 +1300)]
Merge pull request #18674 from seamuslee001/form_buttons_key

[REF] Fix adding in the accessKey based on the button array

4 years agodev/core#2087 move uf_match check above the primary check
eileen [Fri, 2 Oct 2020 22:07:37 +0000 (11:07 +1300)]
dev/core#2087 move uf_match check above the primary check

the uf_match check will result in an early return more often than the other

4 years ago[REF] Fix adding in the accessKey based on the button array
Seamus Lee [Mon, 5 Oct 2020 22:50:57 +0000 (09:50 +1100)]
[REF] Fix adding in the accessKey based on the button array

4 years agoMerge pull request #18143 from mattwire/membertabbuttons
Seamus Lee [Mon, 5 Oct 2020 22:50:08 +0000 (09:50 +1100)]
Merge pull request #18143 from mattwire/membertabbuttons

Move membership tab add/submit membership buttons to PHP layer

4 years agoMerge pull request #18611 from mattwire/activitytokensmodifieddate
Seamus Lee [Mon, 5 Oct 2020 22:34:02 +0000 (09:34 +1100)]
Merge pull request #18611 from mattwire/activitytokensmodifieddate

Add modified_date to list of activity tokens

4 years agoMerge pull request #18610 from demeritcowboy/error-recursion-recursion
Seamus Lee [Mon, 5 Oct 2020 22:27:24 +0000 (09:27 +1100)]
Merge pull request #18610 from demeritcowboy/error-recursion-recursion

dev/drupal#119 - Avoid crash from recursion on unhandled exceptions

4 years agogitattributes - When exporting for composer-style tarball, exclude gitignore
Tim Otten [Mon, 5 Oct 2020 20:40:46 +0000 (13:40 -0700)]
gitattributes - When exporting for composer-style tarball, exclude gitignore

4 years agoMerge pull request #18649 from seamuslee001/error_class_remove
Eileen McNaughton [Mon, 5 Oct 2020 20:12:58 +0000 (09:12 +1300)]
Merge pull request #18649 from seamuslee001/error_class_remove

Ensure that the crm-error class on the field is also remove when field is changed

4 years agoSearch ext: rename to Search Kit, mark as beta
Coleman Watts [Mon, 5 Oct 2020 12:45:16 +0000 (08:45 -0400)]
Search ext: rename to Search Kit, mark as beta

4 years agoMerge pull request #18671 from MegaphoneJon/fix-perm-labels
Yashodha Chaku [Mon, 5 Oct 2020 11:27:18 +0000 (16:57 +0530)]
Merge pull request #18671 from MegaphoneJon/fix-perm-labels

fix labels on new admin permissions

4 years agoMerge pull request #17675 from agh1/aria-form-fixes
colemanw [Sun, 4 Oct 2020 23:03:28 +0000 (19:03 -0400)]
Merge pull request #17675 from agh1/aria-form-fixes

Select field fixes for screen reader