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

2 years agoMerge pull request #23559 from eileenmcnaughton/import_yay
Monish Deb [Thu, 26 May 2022 06:11:28 +0000 (11:41 +0530)]
Merge pull request #23559 from eileenmcnaughton/import_yay

Another always-true-if

2 years agoMerge pull request #23570 from ufundo/mailing-group-token-frontend-title
Eileen McNaughton [Thu, 26 May 2022 06:07:29 +0000 (18:07 +1200)]
Merge pull request #23570 from ufundo/mailing-group-token-frontend-title

dev/core#3463 - CiviMail - prefer frontend_title from group for maili…

2 years agoMerge pull request #23561 from eileenmcnaughton/import_catcher_
Monish Deb [Thu, 26 May 2022 05:42:21 +0000 (11:12 +0530)]
Merge pull request #23561 from eileenmcnaughton/import_catcher_

Test fix

2 years agoMerge pull request #23576 from eileenmcnaughton/cust_it
Monish Deb [Thu, 26 May 2022 05:31:34 +0000 (11:01 +0530)]
Merge pull request #23576 from eileenmcnaughton/cust_it

Import - Relax "is_required" check for custom fields

2 years agocheck null first
demeritcowboy [Thu, 26 May 2022 04:51:31 +0000 (00:51 -0400)]
check null first

2 years agoMerge pull request #23516 from eileenmcnaughton/sms
demeritcowboy [Thu, 26 May 2022 04:48:07 +0000 (00:48 -0400)]
Merge pull request #23516 from eileenmcnaughton/sms

dev/core#3177 Switch sms to use flexmailer token rendering

2 years agoMerge pull request #23318 from seamuslee001/php81_preg_replace
demeritcowboy [Thu, 26 May 2022 04:47:30 +0000 (00:47 -0400)]
Merge pull request #23318 from seamuslee001/php81_preg_replace

[REF] Fix handling of NULL values in count_characters smarty modifier…

2 years agoMerge pull request #23577 from demeritcowboy/deleted-tests
Eileen McNaughton [Thu, 26 May 2022 01:36:24 +0000 (13:36 +1200)]
Merge pull request #23577 from demeritcowboy/deleted-tests

[NFC] Bring back deleted activity email tests

2 years agoMerge pull request #23579 from colemanw/searchKitFixCount
Eileen McNaughton [Thu, 26 May 2022 01:34:15 +0000 (13:34 +1200)]
Merge pull request #23579 from colemanw/searchKitFixCount

SearchKit - Fix pager & tab count after creating a new record in a popup

2 years agoAPIv4 - Exclude disabled custom fields
Coleman Watts [Wed, 25 May 2022 19:02:29 +0000 (15:02 -0400)]
APIv4 - Exclude disabled custom fields

2 years agoMerge pull request #23578 from colemanw/managedSearchSegment
colemanw [Thu, 26 May 2022 01:05:59 +0000 (21:05 -0400)]
Merge pull request #23578 from colemanw/managedSearchSegment

SearchKit - Allow SearchSegments to be packaged as .mgd.php

2 years agoMerge pull request #23587 from civicrm/5.50
Eileen McNaughton [Wed, 25 May 2022 23:38:25 +0000 (11:38 +1200)]
Merge pull request #23587 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23584 from civicrm/5_50_guzzle
Eileen McNaughton [Wed, 25 May 2022 23:37:59 +0000 (11:37 +1200)]
Merge pull request #23584 from civicrm/5_50_guzzle

[REF] Upgrade Guzzle to 6.5.6

2 years agoMerge pull request #23581 from colemanw/removeUnused
Eileen McNaughton [Wed, 25 May 2022 22:52:47 +0000 (10:52 +1200)]
Merge pull request #23581 from colemanw/removeUnused

ProximityQuery - Remove unused code

2 years agodev/core#3463 - CiviMail - prefer frontend_title from group for mailing.group token
ufundo [Tue, 24 May 2022 19:20:37 +0000 (19:20 +0000)]
dev/core#3463 - CiviMail - prefer frontend_title from group for mailing.group token

2 years ago[REF] Upgrade Guzzle to 6.5.6
Seamus Lee [Wed, 25 May 2022 21:27:47 +0000 (07:27 +1000)]
[REF] Upgrade Guzzle to 6.5.6

2 years agoMerge pull request #23573 from colemanw/searchKitBetterDefaults
Eileen McNaughton [Wed, 25 May 2022 19:59:05 +0000 (07:59 +1200)]
Merge pull request #23573 from colemanw/searchKitBetterDefaults

SearchKit - Fix default aggregate function for grand total rows

2 years agoMerge pull request #23580 from colemanw/removeDeprecatedClass
demeritcowboy [Wed, 25 May 2022 18:50:51 +0000 (14:50 -0400)]
Merge pull request #23580 from colemanw/removeDeprecatedClass

Remove unused class

2 years agoProximityQuery - Remove unused code
Coleman Watts [Wed, 25 May 2022 16:34:55 +0000 (12:34 -0400)]
ProximityQuery - Remove unused code

2 years agoRemove unused class
Coleman Watts [Wed, 25 May 2022 15:17:57 +0000 (11:17 -0400)]
Remove unused class

Class has been deprecated with a noisy warning for over 4 years

2 years agoSearchKit - Fix pager & tab count after creating a new record in a popup
Coleman Watts [Wed, 25 May 2022 14:25:44 +0000 (10:25 -0400)]
SearchKit - Fix pager & tab count after creating a new record in a popup

2 years agoAllow SearchSegments to be packaged as .mgd.php
Coleman Watts [Wed, 25 May 2022 14:09:40 +0000 (10:09 -0400)]
Allow SearchSegments to be packaged as .mgd.php

2 years agoSearchKit - Fix default aggregate function for grand total rows
Coleman Watts [Tue, 24 May 2022 23:15:30 +0000 (19:15 -0400)]
SearchKit - Fix default aggregate function for grand total rows

2 years agobring back deleted tests
demeritcowboy [Wed, 25 May 2022 13:22:54 +0000 (09:22 -0400)]
bring back deleted tests

2 years agoMerge pull request #23519 from eileenmcnaughton/cont_parser
colemanw [Wed, 25 May 2022 12:56:54 +0000 (08:56 -0400)]
Merge pull request #23519 from eileenmcnaughton/cont_parser

[Import] Fix Contribution Import mapping fields to use labels

2 years agoMerge pull request #23549 from JMAConsulting/issue_39
Eileen McNaughton [Wed, 25 May 2022 09:33:20 +0000 (21:33 +1200)]
Merge pull request #23549 from JMAConsulting/issue_39

[Joomla 4.0] Fatal error on submitting Profile with CMS username/password

2 years ago[Import] Fix Contribution Import mapping fields to use labels
Eileen McNaughton [Fri, 20 May 2022 05:47:47 +0000 (17:47 +1200)]
[Import] Fix Contribution Import mapping fields to use labels

2 years agoConsolidate DataSource.tpl
Eileen McNaughton [Fri, 13 May 2022 20:29:54 +0000 (08:29 +1200)]
Consolidate DataSource.tpl

I took a look at the activity DataSource.tpl and aside from minor
markup the only difference between it and the shared markup is
the absense of 'contactType' on the Activity form - so
I added an 'if'

2 years agoRemove preferred_mail_format handling from legacy mailing
Eileen McNaughton [Tue, 24 May 2022 22:07:28 +0000 (10:07 +1200)]
Remove preferred_mail_format handling from legacy mailing

2 years agoRemove deprecated preferred_mail_format from import
Eileen McNaughton [Tue, 24 May 2022 08:35:05 +0000 (20:35 +1200)]
Remove deprecated preferred_mail_format from import

m

2 years agoRemove required field check on import
Eileen McNaughton [Wed, 25 May 2022 01:32:00 +0000 (13:32 +1200)]
Remove required field check on import

2 years agoMerge pull request #23564 from eileenmcnaughton/validate
colemanw [Wed, 25 May 2022 01:28:07 +0000 (21:28 -0400)]
Merge pull request #23564 from eileenmcnaughton/validate

Move validate field function to the parent class [Straight move]

2 years agoMerge pull request #23575 from civicrm/5.50
Eileen McNaughton [Wed, 25 May 2022 00:47:53 +0000 (12:47 +1200)]
Merge pull request #23575 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23572 from colemanw/resultLength
Eileen McNaughton [Wed, 25 May 2022 00:47:26 +0000 (12:47 +1200)]
Merge pull request #23572 from colemanw/resultLength

SearchKit - Fix 'undefined var' error after import

2 years agoMerge pull request #23522 from totten/5.50-snapshot
Tim Otten [Tue, 24 May 2022 23:59:30 +0000 (16:59 -0700)]
Merge pull request #23522 from totten/5.50-snapshot

Upgrader - Add support for automatic snapshots

2 years agoMerge pull request #23454 from colemanw/searchKitGrandTotals
Eileen McNaughton [Tue, 24 May 2022 23:08:44 +0000 (11:08 +1200)]
Merge pull request #23454 from colemanw/searchKitGrandTotals

Search kit grand totals

2 years agoSearchKit - Fix 'undefined var' error after import
Coleman Watts [Tue, 24 May 2022 22:51:13 +0000 (18:51 -0400)]
SearchKit - Fix 'undefined var' error after import

2 years agoMerge pull request #23571 from eileenmcnaughton/no_send
colemanw [Tue, 24 May 2022 22:21:44 +0000 (18:21 -0400)]
Merge pull request #23571 from eileenmcnaughton/no_send

Add noisy deprecation to unused, deprecated, functions

2 years agoAdd noisy deprecation to unused, deprecated, functions
Eileen McNaughton [Tue, 24 May 2022 19:49:17 +0000 (07:49 +1200)]
Add noisy deprecation to unused, deprecated, functions

These are only being accessed by tests so I removed those

2 years agoMerge pull request #23568 from civicrm/5.50
Eileen McNaughton [Tue, 24 May 2022 19:16:42 +0000 (07:16 +1200)]
Merge pull request #23568 from civicrm/5.50

5.50 to master

2 years agoMerge pull request #23566 from eileenmcnaughton/550
Eileen McNaughton [Tue, 24 May 2022 19:13:35 +0000 (07:13 +1200)]
Merge pull request #23566 from eileenmcnaughton/550

Calculate unit_price based on qty

2 years agoMerge pull request #23556 from eileenmcnaughton/import_depot
colemanw [Tue, 24 May 2022 14:23:18 +0000 (10:23 -0400)]
Merge pull request #23556 from eileenmcnaughton/import_depot

Remove do-nothing deprecated line

2 years agoMerge pull request #23548 from colemanw/post2
demeritcowboy [Tue, 24 May 2022 14:05:25 +0000 (10:05 -0400)]
Merge pull request #23548 from colemanw/post2

SearchKit - Use POST to send contact ids to action forms

2 years agoMerge pull request #23555 from civicrm/5.50
Eileen McNaughton [Tue, 24 May 2022 10:06:00 +0000 (22:06 +1200)]
Merge pull request #23555 from civicrm/5.50

5.50

2 years agoCalculate unit_price based on qty
David Reedy Jr [Tue, 17 May 2022 13:15:21 +0000 (08:15 -0500)]
Calculate unit_price based on qty

2 years agoMove validate field function to the parent class
Eileen McNaughton [Tue, 24 May 2022 07:55:21 +0000 (19:55 +1200)]
Move validate field function to the parent class

I am happy with the signature now so time for it to move to it's forever home

(Actually that's a bit of a euphemism - I'm kinda sending it to the farm
as I think it will get whittled away to nothing but that a conversation for another day

2 years agoMerge pull request #23551 from eileenmcnaughton/import_no_go
Monish Deb [Tue, 24 May 2022 07:01:00 +0000 (12:31 +0530)]
Merge pull request #23551 from eileenmcnaughton/import_no_go

Remove unreachable code

2 years agoAdditional test
Eileen McNaughton [Tue, 24 May 2022 05:27:38 +0000 (17:27 +1200)]
Additional test

2 years agoMerge pull request #23535 from eileenmcnaughton/import_prefix
Monish Deb [Tue, 24 May 2022 06:05:46 +0000 (11:35 +0530)]
Merge pull request #23535 from eileenmcnaughton/import_prefix

Extend import option handling to prefix, suffix, language, communication_style

2 years agoTest fix
Eileen McNaughton [Tue, 24 May 2022 05:19:27 +0000 (17:19 +1200)]
Test fix

2 years agoDefine experimental option CIVICRM_UPGRADE_SNAPSHOT
Tim Otten [Tue, 24 May 2022 05:10:39 +0000 (22:10 -0700)]
Define experimental option CIVICRM_UPGRADE_SNAPSHOT

2 years agoCRM/Upgrade - Add notice about snap_* and MySQL configuration
Tim Otten [Tue, 24 May 2022 01:55:44 +0000 (18:55 -0700)]
CRM/Upgrade - Add notice about snap_* and MySQL configuration

2 years agoCRM/Upgrade - Snapshots should have name `snap_{OWNER}_{VERSION}_{NAME}`
Tim Otten [Tue, 24 May 2022 00:20:11 +0000 (17:20 -0700)]
CRM/Upgrade - Snapshots should have name `snap_{OWNER}_{VERSION}_{NAME}`

1. Prevents the trigger-based logging system from hitting the snapshots.
2. Makes the de-facto table names shorter (less likely to hit 64 char limit)
3. In practice, it should be easier to skim
4. Use the same pseudo-extension name that we use elsewhere (`civicrm`)

2 years agoCRM/Upgrade - Snapshots should have name `civicrm_snap_{OWNER}_{VERSION}_{NAME}`
Tim Otten [Mon, 23 May 2022 21:58:18 +0000 (14:58 -0700)]
CRM/Upgrade - Snapshots should have name `civicrm_snap_{OWNER}_{VERSION}_{NAME}`

2 years agoCRM/Upgrade - Store snapshots with compression. More comments.
Tim Otten [Mon, 23 May 2022 21:45:54 +0000 (14:45 -0700)]
CRM/Upgrade - Store snapshots with compression. More comments.

2 years ago(REF) SnapshotTest - Split big test in two. Cleanup comments.
Tim Otten [Fri, 20 May 2022 22:04:55 +0000 (15:04 -0700)]
(REF) SnapshotTest - Split big test in two. Cleanup comments.

2 years agoCRM/Upgrade - Enable snapshots for 5.50.alpha1
Tim Otten [Fri, 20 May 2022 05:21:05 +0000 (22:21 -0700)]
CRM/Upgrade - Enable snapshots for 5.50.alpha1

Note: This is being committed during 5.50.beta1.  If anyone previously
executed the upgrade for the RC/beta/alpha, then may not get snapshots.  But
those upgrades are already done; and they're not guaranteed anyway; and the
snapshots aren't mandatory anyway.

2 years agoCRM/Upgrade - Add basic support for snapshots to the upgrade framework
Tim Otten [Fri, 20 May 2022 05:20:18 +0000 (22:20 -0700)]
CRM/Upgrade - Add basic support for snapshots to the upgrade framework

2 years agoCRM/Upgrade - Define "Snapshot" helper (with unit-tests)
Tim Otten [Fri, 20 May 2022 05:05:20 +0000 (22:05 -0700)]
CRM/Upgrade - Define "Snapshot" helper (with unit-tests)

2 years agoAnother always-true-if
Eileen McNaughton [Tue, 24 May 2022 04:01:02 +0000 (16:01 +1200)]
Another always-true-if

2 years ago[Joomla 4.0] Fatal error on submitting Profile with CMS username/password
Monish Deb [Mon, 23 May 2022 20:45:21 +0000 (02:15 +0530)]
[Joomla 4.0] Fatal error on submitting Profile with CMS username/password

2 years agoRemove do-nothing deprecated line
Eileen McNaughton [Tue, 24 May 2022 02:39:59 +0000 (14:39 +1200)]
Remove do-nothing deprecated line

2 years agoRemove unreachable code
Eileen McNaughton [Mon, 23 May 2022 23:21:19 +0000 (11:21 +1200)]
Remove unreachable code

2 years agoMerge pull request #23528 from eileenmcnaughton/raw_money
Seamus Lee [Tue, 24 May 2022 02:23:01 +0000 (12:23 +1000)]
Merge pull request #23528 from eileenmcnaughton/raw_money

Fix empty money handling

2 years agoMerge pull request #23550 from eileenmcnaughton/import_cust
Seamus Lee [Tue, 24 May 2022 02:20:48 +0000 (12:20 +1000)]
Merge pull request #23550 from eileenmcnaughton/import_cust

Clean up function signature

2 years agoSearchKit - Use POST to send contact ids to action forms
Coleman Watts [Sat, 30 Apr 2022 20:59:19 +0000 (22:59 +0200)]
SearchKit - Use POST to send contact ids to action forms

Fixes dev/core#2736

2 years agoMerge pull request #23532 from eileenmcnaughton/import_depo
colemanw [Mon, 23 May 2022 23:16:23 +0000 (19:16 -0400)]
Merge pull request #23532 from eileenmcnaughton/import_depo

Remove extraneous deprecated check

2 years agoExtend import option handling to prefix, suffix, language, communication_style
Eileen McNaughton [Sat, 21 May 2022 04:08:52 +0000 (16:08 +1200)]
Extend import option handling to prefix, suffix, language, communication_style

This extends a pattern thoroughly tested for gender to
other single-option-value fields & removes duplicate handling.

Test cover in

`CRM_Contact_Import_Parser_ContactTest::testPrefixLabel`
`CRM_Contact_Import_Parser_ContactTest::testPreferredLanguageImport`

2 years agoClean up function signature
Eileen McNaughton [Mon, 23 May 2022 21:03:08 +0000 (09:03 +1200)]
Clean up function signature

2 years agoMerge pull request #23533 from eileenmcnaughton/import_if
colemanw [Mon, 23 May 2022 20:50:06 +0000 (16:50 -0400)]
Merge pull request #23533 from eileenmcnaughton/import_if

Remove always true if conditions (whitespace in next commit)

2 years agoMerge pull request #23515 from eileenmcnaughton/no_prof
colemanw [Mon, 23 May 2022 20:49:38 +0000 (16:49 -0400)]
Merge pull request #23515 from eileenmcnaughton/no_prof

[REF] Simplify contact.create

2 years agoMerge pull request #23545 from eileenmcnaughton/import_location2
colemanw [Mon, 23 May 2022 20:47:22 +0000 (16:47 -0400)]
Merge pull request #23545 from eileenmcnaughton/import_location2

Remove never-true fields, and impossible property handling from previously shared function

2 years agoMerge pull request #23488 from colemanw/afformGetHook
colemanw [Mon, 23 May 2022 20:46:39 +0000 (16:46 -0400)]
Merge pull request #23488 from colemanw/afformGetHook

Afform - dispatch event when loading afforms

2 years agoMerge pull request #23536 from eileenmcnaughton/import_cust
colemanw [Mon, 23 May 2022 20:45:36 +0000 (16:45 -0400)]
Merge pull request #23536 from eileenmcnaughton/import_cust

[REF] Minor simplification on input

2 years agoMerge pull request #23537 from eileenmcnaughton/greet_cust
colemanw [Mon, 23 May 2022 20:44:54 +0000 (16:44 -0400)]
Merge pull request #23537 from eileenmcnaughton/greet_cust

Greeting handling - if email_greeting_custom (etc) isset & email_greeting_id is not, set to 'Customized'

2 years agoMerge pull request #23540 from eileenmcnaughton/import_location
colemanw [Mon, 23 May 2022 20:43:55 +0000 (16:43 -0400)]
Merge pull request #23540 from eileenmcnaughton/import_location

Add location import testing

2 years agoMerge pull request #23538 from eileenmcnaughton/import_regression
colemanw [Mon, 23 May 2022 20:43:23 +0000 (16:43 -0400)]
Merge pull request #23538 from eileenmcnaughton/import_regression

Fix unreleased regression from strict typing

2 years agoMerge pull request #22682 from agileware/CIVICRM-1922
Eileen McNaughton [Mon, 23 May 2022 19:37:55 +0000 (07:37 +1200)]
Merge pull request #22682 from agileware/CIVICRM-1922

🪳🪳🪳 Bug Fix: Merging an Organisation contact and de-selecting the merge Membership checkbox causes all related Membership to not be removed and the Primary Membership is linked to the deleted Organisation