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
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
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`
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
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
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…
Monish Deb [Thu, 26 May 2022 05:42:21 +0000 (11:12 +0530)]
Merge pull request #23561 from eileenmcnaughton/import_catcher_
Test fix
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
demeritcowboy [Thu, 26 May 2022 04:51:31 +0000 (00:51 -0400)]
check null first
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
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…
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
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
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
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
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
Eileen McNaughton [Wed, 25 May 2022 22:52:47 +0000 (10:52 +1200)]
Merge pull request #23581 from colemanw/removeUnused
ProximityQuery - Remove unused code
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
Seamus Lee [Wed, 25 May 2022 21:27:47 +0000 (07:27 +1000)]
[REF] Upgrade Guzzle to 6.5.6
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
demeritcowboy [Wed, 25 May 2022 18:50:51 +0000 (14:50 -0400)]
Merge pull request #23580 from colemanw/removeDeprecatedClass
Remove unused class
Coleman Watts [Wed, 25 May 2022 16:34:55 +0000 (12:34 -0400)]
ProximityQuery - Remove unused code
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
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
Coleman Watts [Wed, 25 May 2022 14:09:40 +0000 (10:09 -0400)]
Allow SearchSegments to be packaged as .mgd.php
Coleman Watts [Tue, 24 May 2022 23:15:30 +0000 (19:15 -0400)]
SearchKit - Fix default aggregate function for grand total rows
demeritcowboy [Wed, 25 May 2022 13:22:54 +0000 (09:22 -0400)]
bring back deleted tests
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
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
Eileen McNaughton [Fri, 20 May 2022 05:47:47 +0000 (17:47 +1200)]
[Import] Fix Contribution Import mapping fields to use labels
Eileen McNaughton [Wed, 25 May 2022 01:32:00 +0000 (13:32 +1200)]
Remove required field check on import
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]
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
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
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
Eileen McNaughton [Tue, 24 May 2022 23:08:44 +0000 (11:08 +1200)]
Merge pull request #23454 from colemanw/searchKitGrandTotals
Search kit grand totals
Coleman Watts [Tue, 24 May 2022 22:51:13 +0000 (18:51 -0400)]
SearchKit - Fix 'undefined var' error after import
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
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
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
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
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
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
Eileen McNaughton [Tue, 24 May 2022 10:06:00 +0000 (22:06 +1200)]
Merge pull request #23555 from civicrm/5.50
5.50
David Reedy Jr [Tue, 17 May 2022 13:15:21 +0000 (08:15 -0500)]
Calculate unit_price based on qty
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
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
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
Eileen McNaughton [Tue, 24 May 2022 05:19:27 +0000 (17:19 +1200)]
Test fix
Tim Otten [Tue, 24 May 2022 05:10:39 +0000 (22:10 -0700)]
Define experimental option CIVICRM_UPGRADE_SNAPSHOT
Tim Otten [Tue, 24 May 2022 01:55:44 +0000 (18:55 -0700)]
CRM/Upgrade - Add notice about snap_* and MySQL configuration
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`)
Tim Otten [Mon, 23 May 2022 21:58:18 +0000 (14:58 -0700)]
CRM/Upgrade - Snapshots should have name `civicrm_snap_{OWNER}_{VERSION}_{NAME}`
Tim Otten [Mon, 23 May 2022 21:45:54 +0000 (14:45 -0700)]
CRM/Upgrade - Store snapshots with compression. More comments.
Tim Otten [Fri, 20 May 2022 22:04:55 +0000 (15:04 -0700)]
(REF) SnapshotTest - Split big test in two. Cleanup comments.
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.
Tim Otten [Fri, 20 May 2022 05:20:18 +0000 (22:20 -0700)]
CRM/Upgrade - Add basic support for snapshots to the upgrade framework
Tim Otten [Fri, 20 May 2022 05:05:20 +0000 (22:05 -0700)]
CRM/Upgrade - Define "Snapshot" helper (with unit-tests)
Eileen McNaughton [Tue, 24 May 2022 04:01:02 +0000 (16:01 +1200)]
Another always-true-if
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
Eileen McNaughton [Tue, 24 May 2022 02:39:59 +0000 (14:39 +1200)]
Remove do-nothing deprecated line
Eileen McNaughton [Mon, 23 May 2022 23:21:19 +0000 (11:21 +1200)]
Remove unreachable code
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
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
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
colemanw [Mon, 23 May 2022 23:16:23 +0000 (19:16 -0400)]
Merge pull request #23532 from eileenmcnaughton/import_depo
Remove extraneous deprecated check
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`
Eileen McNaughton [Mon, 23 May 2022 21:03:08 +0000 (09:03 +1200)]
Clean up function signature
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)
colemanw [Mon, 23 May 2022 20:49:38 +0000 (16:49 -0400)]
Merge pull request #23515 from eileenmcnaughton/no_prof
[REF] Simplify contact.create
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
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
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
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'
colemanw [Mon, 23 May 2022 20:43:55 +0000 (16:43 -0400)]
Merge pull request #23540 from eileenmcnaughton/import_location
Add location import testing
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
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
Eileen McNaughton [Mon, 23 May 2022 19:33:17 +0000 (07:33 +1200)]
Merge pull request #22487 from mattwire/repeattransactiontemplatecontribution
dev/financial#6 Use template contribution for Contribution.repeattransaction
demeritcowboy [Mon, 23 May 2022 17:09:23 +0000 (13:09 -0400)]
Merge pull request #23467 from christianwach/event-caps
Capitalise event setting title
Yashodha Chaku [Mon, 23 May 2022 17:06:10 +0000 (22:36 +0530)]
Merge pull request #23541 from eileenmcnaughton/import_provider
E-notice fix on import
Christian Wach [Mon, 23 May 2022 14:50:42 +0000 (15:50 +0100)]
Capitalise event setting title
Eileen McNaughton [Sun, 22 May 2022 01:26:40 +0000 (13:26 +1200)]
Remove never-true fields, and impossible property handling from previously shared function
colemanw [Mon, 23 May 2022 03:37:03 +0000 (23:37 -0400)]
Merge pull request #23542 from eileenmcnaughton/import_location2
Duplicate function - divide & conquer
Eileen McNaughton [Sun, 22 May 2022 22:13:40 +0000 (10:13 +1200)]
Fix for sms mode to skip on hold
Eileen McNaughton [Fri, 20 May 2022 02:53:12 +0000 (14:53 +1200)]
dev/core#3177 Switch sms to use flexmailer token rendering
colemanw [Sun, 22 May 2022 18:00:49 +0000 (14:00 -0400)]
Merge pull request #23544 from colemanw/revertPost
Revert "SearchKit - Use POST to send contact ids to action forms"
Coleman Watts [Sun, 22 May 2022 17:59:27 +0000 (13:59 -0400)]
Revert "SearchKit - Use POST to send contact ids to action forms"
This reverts commit
1297a574fd3e28d4714c145627b35c08e5933675.
Eileen McNaughton [Sun, 22 May 2022 01:11:58 +0000 (13:11 +1200)]
Duplicate function - divide & conquer
Eileen McNaughton [Sun, 22 May 2022 00:11:28 +0000 (12:11 +1200)]
Add location import testing
Eileen McNaughton [Sun, 22 May 2022 01:12:12 +0000 (13:12 +1200)]
E-notice fix
Eileen McNaughton [Sat, 21 May 2022 19:59:56 +0000 (07:59 +1200)]
Merge pull request #23539 from demeritcowboy/huh
[NFC] Remove weird file
demeritcowboy [Sat, 21 May 2022 14:02:21 +0000 (10:02 -0400)]
weird file
colemanw [Sat, 21 May 2022 13:52:20 +0000 (09:52 -0400)]
Merge pull request #23404 from colemanw/getFieldsFilters
SearchKit - Make inline edit only available when applicable
Eileen McNaughton [Sat, 21 May 2022 09:29:02 +0000 (21:29 +1200)]
Fix unreleased regression from strict typing
Eileen McNaughton [Sat, 21 May 2022 07:08:40 +0000 (19:08 +1200)]
[REF] Minor simplification on input
Eileen McNaughton [Sat, 21 May 2022 06:00:57 +0000 (18:00 +1200)]
Greeting handling - if email_greeting_custom (etc) isset & email_greeting_id is not, set to 'Customized'
Eileen McNaughton [Sat, 21 May 2022 03:49:52 +0000 (15:49 +1200)]
Merge pull request #23502 from eileenmcnaughton/import_test_ex
Add unit tests to cover date field imports
Coleman Watts [Thu, 19 May 2022 00:01:52 +0000 (20:01 -0400)]
APIv4 GetFields - Ignore invalid fields rather than fatal error in getFields action
Coleman Watts [Mon, 9 May 2022 00:45:21 +0000 (20:45 -0400)]
SearchKit - ensure only relevant fields are editable
Fixes dev/core#3423
Ensures that custom fields for one entity sub-type (e.g. Individual) are not
presented as editable for other sub-types (e.g. Organiztion).
Eileen McNaughton [Sat, 21 May 2022 00:51:07 +0000 (12:51 +1200)]
Remove always true if conditions (whitespace in next commit)