civicrm-core.git
2 years agoMerge pull request #23642 from eileenmcnaughton/import_c
colemanw [Wed, 1 Jun 2022 02:11:47 +0000 (22:11 -0400)]
Merge pull request #23642 from eileenmcnaughton/import_c

 Fix State handling to be case insensitive again (unreleased regression)

2 years agoMerge pull request #23636 from eileenmcnaughton/import_contact_type
colemanw [Wed, 1 Jun 2022 02:10:46 +0000 (22:10 -0400)]
Merge pull request #23636 from eileenmcnaughton/import_contact_type

Import - ensure userID is set on parser

2 years agoMerge pull request #23643 from eileenmcnaughton/match
colemanw [Wed, 1 Jun 2022 02:07:59 +0000 (22:07 -0400)]
Merge pull request #23643 from eileenmcnaughton/match

Fixes for contact matching - unreleased regression

2 years agoMerge pull request #23603 from eileenmcnaughton/rel2
demeritcowboy [Wed, 1 Jun 2022 00:37:03 +0000 (20:37 -0400)]
Merge pull request #23603 from eileenmcnaughton/rel2

Fix createEmployerRelationship to work with the data it has when doing a lookup, test

2 years agoFixes for contact matching
Eileen McNaughton [Tue, 31 May 2022 19:03:49 +0000 (07:03 +1200)]
Fixes for contact matching

2 years agoFix State handling to be case insensitive again
Eileen McNaughton [Tue, 31 May 2022 16:05:41 +0000 (04:05 +1200)]
Fix State handling to be case insensitive again

2 years agoAdd geocode import
Eileen McNaughton [Mon, 30 May 2022 04:58:49 +0000 (16:58 +1200)]
Add geocode import

2 years agoFix State handling to be case insensitive again
Eileen McNaughton [Tue, 31 May 2022 16:05:41 +0000 (04:05 +1200)]
Fix State handling to be case insensitive again

2 years agoAdd geocode import
Eileen McNaughton [Mon, 30 May 2022 04:58:49 +0000 (16:58 +1200)]
Add geocode import

2 years agoMerge pull request #23629 from eileenmcnaughton/import_greetings
colemanw [Tue, 31 May 2022 21:25:40 +0000 (17:25 -0400)]
Merge pull request #23629 from eileenmcnaughton/import_greetings

Simplify greeting handling, add test

2 years agoMerge pull request #23567 from kurund/honor-roll-fixes
Eileen McNaughton [Tue, 31 May 2022 19:16:50 +0000 (07:16 +1200)]
Merge pull request #23567 from kurund/honor-roll-fixes

show honor roll only if it's enabled for the PCP page

2 years agoMerge pull request #23640 from aydun/casetype
Eileen McNaughton [Tue, 31 May 2022 16:18:38 +0000 (04:18 +1200)]
Merge pull request #23640 from aydun/casetype

Make CaseType usable in Afform & SearchKit

2 years agoSimplify greeting handling, add test
Eileen McNaughton [Mon, 30 May 2022 03:22:30 +0000 (15:22 +1200)]
Simplify greeting handling, add test

2 years agoMerge pull request #23623 from eileenmcnaughton/pcm
colemanw [Tue, 31 May 2022 14:49:12 +0000 (10:49 -0400)]
Merge pull request #23623 from eileenmcnaughton/pcm

Deprecate crazy BAO handling of preferred_communication_method

2 years agoMake CaseType usable in Afform
Aidan Saunders [Tue, 31 May 2022 14:20:33 +0000 (15:20 +0100)]
Make CaseType usable in Afform

2 years agoMerge pull request #23056 from yashodha/dev-3141
Eileen McNaughton [Tue, 31 May 2022 09:07:42 +0000 (21:07 +1200)]
Merge pull request #23056 from yashodha/dev-3141

(dev/core#3141) Membership should be listed chronologically by join d…

2 years agoMerge pull request #23626 from eileenmcnaughton/import_try
Monish Deb [Tue, 31 May 2022 05:22:41 +0000 (10:52 +0530)]
Merge pull request #23626 from eileenmcnaughton/import_try

Minor cleanup on import return codes

2 years agoMerge pull request #23597 from colemanw/searchKitProximity
Eileen McNaughton [Tue, 31 May 2022 04:19:17 +0000 (16:19 +1200)]
Merge pull request #23597 from colemanw/searchKitProximity

SearchKit - add address proximity (map radius) search

2 years agoMerge pull request #23631 from eileenmcnaughton/authx
Eileen McNaughton [Tue, 31 May 2022 03:16:39 +0000 (15:16 +1200)]
Merge pull request #23631 from eileenmcnaughton/authx

Add Authx settings to navigation

2 years agoImport - ensure userID is set on parser
Eileen McNaughton [Tue, 31 May 2022 02:13:51 +0000 (14:13 +1200)]
Import - ensure userID is set on parser

2 years agoUpdate ext/authx/authx.php
Eileen McNaughton [Tue, 31 May 2022 00:28:40 +0000 (12:28 +1200)]
Update ext/authx/authx.php

Co-authored-by: Tim Otten <totten@civicrm.org>
2 years agoAdd Authx settings to navigation
Eileen McNaughton [Mon, 30 May 2022 11:28:53 +0000 (23:28 +1200)]
Add Authx settings to navigation

2 years agoMinor cleanup on import return codes
Eileen McNaughton [Sun, 29 May 2022 23:51:56 +0000 (11:51 +1200)]
Minor cleanup on import return codes

2 years agoMerge pull request #23634 from eileenmcnaughton/import_unreach
Eileen McNaughton [Tue, 31 May 2022 00:07:20 +0000 (12:07 +1200)]
Merge pull request #23634 from eileenmcnaughton/import_unreach

Remove legacy calls to `civicrm_error`, unpack return

2 years agoAnother unreachable place - code is always duplicate if it is an array
Eileen McNaughton [Mon, 30 May 2022 22:27:08 +0000 (10:27 +1200)]
Another unreachable place - code is always duplicate if it is an array

2 years agoRemove more checks that can be is_array
Eileen McNaughton [Mon, 30 May 2022 22:21:11 +0000 (10:21 +1200)]
Remove more checks that can be is_array

2 years agoRemove unreachable code
Eileen McNaughton [Mon, 30 May 2022 22:11:51 +0000 (10:11 +1200)]
Remove unreachable code

2 years agoRemove legacy calls to civicrm_error, unpack return
Eileen McNaughton [Mon, 30 May 2022 22:07:49 +0000 (10:07 +1200)]
Remove legacy calls to civicrm_error, unpack return

The function can only return an array or a BAO object

2 years agoMerge pull request #23633 from briennekordis/patch-2
demeritcowboy [Mon, 30 May 2022 16:38:35 +0000 (12:38 -0400)]
Merge pull request #23633 from briennekordis/patch-2

Update contributor-key.yml

2 years agoUpdate contributor-key.yml
Brienne Kordis [Mon, 30 May 2022 14:36:05 +0000 (10:36 -0400)]
Update contributor-key.yml

add @briennekordis as a contributor

2 years agoMerge pull request #23610 from eileenmcnaughton/import_dupe
Yashodha Chaku [Mon, 30 May 2022 11:27:17 +0000 (16:57 +0530)]
Merge pull request #23610 from eileenmcnaughton/import_dupe

[Import] [Ref] Trivial - fold function contents back into parent

2 years agoMerge pull request #23628 from totten/5.50-alsoinc-test
Eileen McNaughton [Mon, 30 May 2022 06:58:11 +0000 (18:58 +1200)]
Merge pull request #23628 from totten/5.50-alsoinc-test

(NFC) Scheduled Reminders - Reinstate and analyze test-case for "Also Include"

2 years agoMerge pull request #23627 from eileenmcnaughton/import_test
Yashodha Chaku [Mon, 30 May 2022 06:23:03 +0000 (11:53 +0530)]
Merge pull request #23627 from eileenmcnaughton/import_test

Test cleanup - use names keys in mapper array where possible for clarity

2 years agoMerge pull request #23625 from eileenmcnaughton/import_suff
Yashodha Chaku [Mon, 30 May 2022 05:23:54 +0000 (10:53 +0530)]
Merge pull request #23625 from eileenmcnaughton/import_suff

Remove obsolete code - this parameter is not possible

2 years agoDeprecate crazy BAO handling of preferred_communication_method
Eileen McNaughton [Sun, 29 May 2022 11:18:28 +0000 (23:18 +1200)]
Deprecate crazy BAO handling of preferred_communication_method

In the context of import this is tested in
testImportFieldsWithVariousOptions

- for the api it is tested via testPseudoFields - although in
api context it is just a deprecation

2 years ago(NFC) Scheduled Reminders - Reinstate and analyze test-case for "Also Include"
Tim Otten [Mon, 30 May 2022 02:46:27 +0000 (19:46 -0700)]
(NFC) Scheduled Reminders - Reinstate and analyze test-case for "Also Include"

After reading #23445 and #23101, I wanted to see the test-coverage for "Also
Include".  There's a little...  but not a lot.  There was an interesting-but-inert
test-case.

Before
------

* Test-case is commented-out
* Comments indicate a vague sense of confusion

After
-----

* Test-case is enabled
* Comments indicate a well-developed, robust sense of confusion

2 years agoTest cleanup - use names keys in mapper array where possible for clarity
Eileen McNaughton [Sun, 29 May 2022 22:43:58 +0000 (10:43 +1200)]
Test cleanup - use names keys in mapper array where possible for clarity

2 years agoMerge pull request #23619 from darrick/pull/23534
Eileen McNaughton [Mon, 30 May 2022 00:34:41 +0000 (12:34 +1200)]
Merge pull request #23619 from darrick/pull/23534

Fix swapOptions writing over selected options on mapField page load.

2 years agoMerge pull request #23624 from mattwire/sqlgroup
Seamus Lee [Sun, 29 May 2022 23:55:15 +0000 (09:55 +1000)]
Merge pull request #23624 from mattwire/sqlgroup

Release lock when deleting cache key

2 years ago[Import] [Ref] Trivial - fold function contents back into parent
Eileen McNaughton [Fri, 27 May 2022 21:43:41 +0000 (09:43 +1200)]
[Import] [Ref] Trivial - fold function contents back into parent

The parent is actually longer by virtue of calling the child than without it....

2 years agoRemove obsolete code - this parameter is not possible
Eileen McNaughton [Sun, 29 May 2022 21:35:21 +0000 (09:35 +1200)]
Remove obsolete code - this parameter is not possible

2 years agoRelease lock when deleting cache key
Matthew Wire [Sun, 29 May 2022 16:00:51 +0000 (17:00 +0100)]
Release lock when deleting cache key

2 years agoMerge pull request #23474 from eileenmcnaughton/import_dep
colemanw [Sun, 29 May 2022 15:46:20 +0000 (11:46 -0400)]
Merge pull request #23474 from eileenmcnaughton/import_dep

[Import] Unpack the weird wild error return

2 years agoMerge pull request #23609 from briennekordis/leading_zero_fix
colemanw [Sun, 29 May 2022 15:44:19 +0000 (11:44 -0400)]
Merge pull request #23609 from briennekordis/leading_zero_fix

core 3459 getlist leading zero fix

2 years agoMerge pull request #23613 from eileenmcnaughton/member_unused
colemanw [Sun, 29 May 2022 15:42:50 +0000 (11:42 -0400)]
Merge pull request #23613 from eileenmcnaughton/member_unused

Remove unused variables

2 years agoMerge pull request #23614 from eileenmcnaughton/import_unused2
colemanw [Sun, 29 May 2022 15:42:19 +0000 (11:42 -0400)]
Merge pull request #23614 from eileenmcnaughton/import_unused2

Remove some unused variables

2 years agoMerge pull request #23621 from eileenmcnaughton/import_1
colemanw [Sun, 29 May 2022 15:41:41 +0000 (11:41 -0400)]
Merge pull request #23621 from eileenmcnaughton/import_1

Whitespace cleanup - remove `if(1)`

2 years agoMerge pull request #23586 from eileenmcnaughton/import_mem
colemanw [Sun, 29 May 2022 15:40:59 +0000 (11:40 -0400)]
Merge pull request #23586 from eileenmcnaughton/import_mem

dev/core#3038 Fix handling for payment_instrument_id, cleanup financial_type_id

2 years agoWhitespace cleanup - remove if(1)
Eileen McNaughton [Sun, 29 May 2022 11:02:26 +0000 (23:02 +1200)]
Whitespace cleanup - remove if(1)

2 years agoFix style errors
Darrick Servis [Sun, 29 May 2022 03:15:47 +0000 (20:15 -0700)]
Fix style errors

2 years agoFix swapOptions writing over selected options on mapField page load.
Darrick Servis [Sat, 28 May 2022 18:21:50 +0000 (11:21 -0700)]
Fix swapOptions writing over selected options on mapField page load.

use swapOptions exclusivily to hide fields on mapField form.

2 years agoMerge pull request #23560 from eileenmcnaughton/import_catcher
Eileen McNaughton [Sat, 28 May 2022 03:00:05 +0000 (15:00 +1200)]
Merge pull request #23560 from eileenmcnaughton/import_catcher

[Import] Test + fix for failure to reject invalid ex identifier

2 years ago[Import] Test + fix for failure to reject invalid ex identifier
Eileen McNaughton [Tue, 24 May 2022 05:10:24 +0000 (17:10 +1200)]
[Import] Test + fix for failure to reject invalid ex identifier

2 years agoRemove some unused variables
Eileen McNaughton [Fri, 27 May 2022 22:04:36 +0000 (10:04 +1200)]
Remove some unused variables

2 years agoRemove unused variables
Eileen McNaughton [Fri, 27 May 2022 22:01:28 +0000 (10:01 +1200)]
Remove unused variables

2 years agoMerge pull request #23612 from civicrm/5.50
Eileen McNaughton [Fri, 27 May 2022 21:49:08 +0000 (09:49 +1200)]
Merge pull request #23612 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23607 from mattwire/23099recentitemspermission
Eileen McNaughton [Fri, 27 May 2022 21:46:01 +0000 (09:46 +1200)]
Merge pull request #23607 from mattwire/23099recentitemspermission

Fix 'Authorization Failed' regression when submitting eg. webform via checksum

2 years agoMerge pull request #23606 from eileenmcnaughton/import_activity
Eileen McNaughton [Fri, 27 May 2022 21:32:42 +0000 (09:32 +1200)]
Merge pull request #23606 from eileenmcnaughton/import_activity

[Import] [Activity] Fix fatal error regression

2 years agocore 3459 getlist leading zero fix
Brienne Kordis [Fri, 27 May 2022 20:57:16 +0000 (16:57 -0400)]
core 3459 getlist leading zero fix

2 years agoMerge pull request #23563 from eileenmcnaughton/import_location_all
colemanw [Fri, 27 May 2022 20:05:30 +0000 (16:05 -0400)]
Merge pull request #23563 from eileenmcnaughton/import_location_all

Import locations - code cleanup, add tests, fix bugs

2 years ago[Import] [Activity] Fix fatal error regression
Eileen McNaughton [Fri, 27 May 2022 06:48:37 +0000 (18:48 +1200)]
[Import] [Activity] Fix fatal error regression

2 years agoMerge pull request #23599 from aydun/contriberror
Eileen McNaughton [Fri, 27 May 2022 19:41:29 +0000 (07:41 +1200)]
Merge pull request #23599 from aydun/contriberror

Make this error message more informative.

2 years agoMake this error message more informative.
Aidan Saunders [Thu, 26 May 2022 14:14:23 +0000 (15:14 +0100)]
Make this error message more informative.
Update test

2 years agoMerge pull request #23546 from ixiam/skip-constraint
demeritcowboy [Fri, 27 May 2022 13:07:10 +0000 (09:07 -0400)]
Merge pull request #23546 from ixiam/skip-constraint

dev/core#3467 - Drupal 8 - Skip requirement for password when changing your own civi contact's email

2 years agoSkip requirement for password when changing the current user fields
César [Fri, 27 May 2022 10:49:25 +0000 (12:49 +0200)]
Skip requirement for password when changing the current user fields

2 years agoFix 'Authorization Failed' regression when submitting eg. webform via checksum
Matthew Wire [Fri, 27 May 2022 10:37:24 +0000 (11:37 +0100)]
Fix 'Authorization Failed' regression when submitting eg. webform via checksum

2 years agoe-notice fix
Eileen McNaughton [Fri, 27 May 2022 03:40:32 +0000 (15:40 +1200)]
e-notice fix

2 years agoRemove sneaky files
Eileen McNaughton [Fri, 27 May 2022 02:17:41 +0000 (14:17 +1200)]
Remove sneaky files

2 years agoFix import to work with phone_ext, test
Eileen McNaughton [Sun, 22 May 2022 02:14:24 +0000 (14:14 +1200)]
Fix import to work with phone_ext, test

This fixes a couple of bugs I found writing tests & adds
test cover for website & phone imports + cleanup

Notably - creating a phone with a phone_ext or an email
with signature_text doesn't work prior to this

2 years agoCountry validation
Eileen McNaughton [Tue, 24 May 2022 02:37:55 +0000 (14:37 +1200)]
Country validation

m

2 years agoImprove comparison for options
Eileen McNaughton [Tue, 24 May 2022 00:58:09 +0000 (12:58 +1200)]
Improve comparison for options

2 years agoCleanup array explosion
Eileen McNaughton [Tue, 24 May 2022 00:12:24 +0000 (12:12 +1200)]
Cleanup array explosion

2 years agoUse metadata to get the relevant entity
Eileen McNaughton [Tue, 24 May 2022 00:13:58 +0000 (12:13 +1200)]
Use metadata to get the relevant entity

2 years agoAdd as-yet-unused functions to reduce PR conflicts
Eileen McNaughton [Thu, 26 May 2022 14:59:25 +0000 (02:59 +1200)]
Add as-yet-unused functions to reduce PR conflicts

2 years agoMerge pull request #23601 from colemanw/authxBeta
Eileen McNaughton [Fri, 27 May 2022 06:43:11 +0000 (18:43 +1200)]
Merge pull request #23601 from colemanw/authxBeta

Authx - Mark extension as beta

2 years agoMerge pull request #23468 from mattwire/contributionpagedeprecatecompletetransaction
Eileen McNaughton [Fri, 27 May 2022 04:45:23 +0000 (16:45 +1200)]
Merge pull request #23468 from mattwire/contributionpagedeprecatecompletetransaction

REF Deprecate method completeTransaction on contribution pages

2 years agoAdd as-yet-unused functions to reduce PR conflicts
Eileen McNaughton [Thu, 26 May 2022 14:59:25 +0000 (02:59 +1200)]
Add as-yet-unused functions to reduce PR conflicts

2 years agoUpdate ext/authx/info.xml
Eileen McNaughton [Fri, 27 May 2022 03:43:01 +0000 (15:43 +1200)]
Update ext/authx/info.xml

Co-authored-by: Tim Otten <totten@civicrm.org>
2 years agoMerge pull request #23592 from eileenmcnaughton/import_parent
Seamus Lee [Fri, 27 May 2022 02:51:26 +0000 (12:51 +1000)]
Merge pull request #23592 from eileenmcnaughton/import_parent

[Import] [ref] Move function to parent for use by siblings

2 years agoMerge pull request #23565 from eileenmcnaughton/preffered_mail
colemanw [Fri, 27 May 2022 00:28:29 +0000 (20:28 -0400)]
Merge pull request #23565 from eileenmcnaughton/preffered_mail

Remove deprecated preferred_mail_format from more places...

2 years agoMerge pull request #23605 from eileenmcnaughton/import_indie
colemanw [Fri, 27 May 2022 00:23:56 +0000 (20:23 -0400)]
Merge pull request #23605 from eileenmcnaughton/import_indie

Remove some never used fields - copy & paste begone

2 years agoRemove some never used fields - copy & paste begone
Eileen McNaughton [Thu, 26 May 2022 22:16:18 +0000 (10:16 +1200)]
Remove some never used fields - copy & paste begone

2 years agoMerge pull request #23562 from eileenmcnaughton/import_cc
Eileen McNaughton [Thu, 26 May 2022 21:54:15 +0000 (09:54 +1200)]
Merge pull request #23562 from eileenmcnaughton/import_cc

Additional test

2 years agoSimplify parameters for completetransaction for zero value payment
Matthew Wire [Mon, 16 May 2022 12:44:48 +0000 (13:44 +0100)]
Simplify parameters for completetransaction for zero value payment

2 years agoDeprecate method completeTransaction on contribution pages
Matthew Wire [Mon, 16 May 2022 12:31:54 +0000 (13:31 +0100)]
Deprecate method completeTransaction on contribution pages

2 years agoFix createEmployerRelationship to work with the data it has when doing a lookup,...
Eileen McNaughton [Tue, 18 Jan 2022 06:04:01 +0000 (19:04 +1300)]
Fix createEmployerRelationship to work with the data it has when doing a lookup, test

The duplicate check has a bug in it but also it's really complicated
give we specifically know the ids & type and not any other values

2 years agoAuthx - Mark extension as beta
Coleman Watts [Thu, 26 May 2022 18:27:42 +0000 (14:27 -0400)]
Authx - Mark extension as beta

2 years agoMerge pull request #23583 from colemanw/apiDisabledFields
demeritcowboy [Thu, 26 May 2022 18:06:23 +0000 (14:06 -0400)]
Merge pull request #23583 from colemanw/apiDisabledFields

APIv4 - Exclude disabled custom fields

2 years agoSearchKit - Add proximity search to UI
Coleman Watts [Thu, 26 May 2022 13:38:46 +0000 (09:38 -0400)]
SearchKit - Add proximity search to UI

Fixes dev/core#3163

2 years agoAPIv4 - Add Address::getCoordinates action
Coleman Watts [Thu, 26 May 2022 12:15:13 +0000 (08:15 -0400)]
APIv4 - Add Address::getCoordinates action

2 years agoAPIv4 - Add address proximity search filter
Coleman Watts [Wed, 25 May 2022 18:53:40 +0000 (14:53 -0400)]
APIv4 - Add address proximity search filter

2 years agoUse 'getParser' rathe than name the parser
Eileen McNaughton [Thu, 26 May 2022 07:25:32 +0000 (19:25 +1200)]
Use 'getParser' rathe than name the parser

2 years ago[Import] [ref] Move function to parent for use by siblings
Eileen McNaughton [Thu, 26 May 2022 07:21:11 +0000 (19:21 +1200)]
[Import] [ref] Move function to parent for use by siblings

2 years agoMerge pull request #23456 from eileenmcnaughton/import_more
Yashodha Chaku [Thu, 26 May 2022 14:06:06 +0000 (19:36 +0530)]
Merge pull request #23456 from eileenmcnaughton/import_more

[Import] Consolidate DataSource.tpl - template for first file on activity import

2 years agoMerge pull request #23590 from eileenmcnaughton/import_member_labels
colemanw [Thu, 26 May 2022 12:16:50 +0000 (08:16 -0400)]
Merge pull request #23590 from eileenmcnaughton/import_member_labels

[Import] Add some not-yet-used `getParser` functions that are prone to conflict

2 years agoMerge pull request #23596 from civicrm/5.50
Eileen McNaughton [Thu, 26 May 2022 11:02:17 +0000 (23:02 +1200)]
Merge pull request #23596 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23594 from totten/5.50-upgrade
Eileen McNaughton [Thu, 26 May 2022 11:01:52 +0000 (23:01 +1200)]
Merge pull request #23594 from totten/5.50-upgrade

Upgrader - Fix error on Snapshot::cleanupTask

2 years agoUpgrader - Fix error on Snapshot::cleanupTask
Tim Otten [Thu, 26 May 2022 07:36:15 +0000 (00:36 -0700)]
Upgrader - Fix error on Snapshot::cleanupTask

This is a follow-up to #23522.

Before
------

Upgrade works on `cv upgrade:db` but fails on `drush civicrm-upgrade-db`

After
-----

Upgrades on both `cv upgrade:db` and `drush civicrm-upgrade-db`

2 years ago[Import] Add some not-yet-used functions that are prone to conflict
Eileen McNaughton [Thu, 26 May 2022 07:09:36 +0000 (19:09 +1200)]
[Import] Add some not-yet-used functions that are prone to conflict

2 years agoMerge pull request #23589 from demeritcowboy/null
Eileen McNaughton [Thu, 26 May 2022 06:52:44 +0000 (18:52 +1200)]
Merge pull request #23589 from demeritcowboy/null

php8.1 - Check null first before sending to strlen