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
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
Eileen McNaughton [Mon, 30 May 2022 22:21:11 +0000 (10:21 +1200)]
Remove more checks that can be is_array
Eileen McNaughton [Mon, 30 May 2022 22:11:51 +0000 (10:11 +1200)]
Remove unreachable code
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
demeritcowboy [Mon, 30 May 2022 16:38:35 +0000 (12:38 -0400)]
Merge pull request #23633 from briennekordis/patch-2
Update 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
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
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"
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
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
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
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
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.
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
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....
Eileen McNaughton [Sun, 29 May 2022 21:35:21 +0000 (09:35 +1200)]
Remove obsolete code - this parameter is not possible
Matthew Wire [Sun, 29 May 2022 16:00:51 +0000 (17:00 +0100)]
Release lock when deleting cache key
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
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
colemanw [Sun, 29 May 2022 15:42:50 +0000 (11:42 -0400)]
Merge pull request #23613 from eileenmcnaughton/member_unused
Remove unused variables
colemanw [Sun, 29 May 2022 15:42:19 +0000 (11:42 -0400)]
Merge pull request #23614 from eileenmcnaughton/import_unused2
Remove some unused variables
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)`
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
Eileen McNaughton [Sun, 29 May 2022 11:02:26 +0000 (23:02 +1200)]
Whitespace cleanup - remove if(1)
Darrick Servis [Sun, 29 May 2022 03:15:47 +0000 (20:15 -0700)]
Fix style errors
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.
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
Eileen McNaughton [Tue, 24 May 2022 05:10:24 +0000 (17:10 +1200)]
[Import] Test + fix for failure to reject invalid ex identifier
Eileen McNaughton [Fri, 27 May 2022 22:04:36 +0000 (10:04 +1200)]
Remove some unused variables
Eileen McNaughton [Fri, 27 May 2022 22:01:28 +0000 (10:01 +1200)]
Remove unused variables
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
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
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
Brienne Kordis [Fri, 27 May 2022 20:57:16 +0000 (16:57 -0400)]
core 3459 getlist leading zero fix
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
Eileen McNaughton [Fri, 27 May 2022 06:48:37 +0000 (18:48 +1200)]
[Import] [Activity] Fix fatal error regression
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.
Aidan Saunders [Thu, 26 May 2022 14:14:23 +0000 (15:14 +0100)]
Make this error message more informative.
Update test
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
César [Fri, 27 May 2022 10:49:25 +0000 (12:49 +0200)]
Skip requirement for password when changing the current user fields
Matthew Wire [Fri, 27 May 2022 10:37:24 +0000 (11:37 +0100)]
Fix 'Authorization Failed' regression when submitting eg. webform via checksum
Eileen McNaughton [Fri, 27 May 2022 03:40:32 +0000 (15:40 +1200)]
e-notice fix
Eileen McNaughton [Fri, 27 May 2022 02:17:41 +0000 (14:17 +1200)]
Remove sneaky files
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
Eileen McNaughton [Tue, 24 May 2022 02:37:55 +0000 (14:37 +1200)]
Country validation
m
Eileen McNaughton [Tue, 24 May 2022 00:58:09 +0000 (12:58 +1200)]
Improve comparison for options
Eileen McNaughton [Tue, 24 May 2022 00:12:24 +0000 (12:12 +1200)]
Cleanup array explosion
Eileen McNaughton [Tue, 24 May 2022 00:13:58 +0000 (12:13 +1200)]
Use metadata to get the relevant entity
Eileen McNaughton [Thu, 26 May 2022 14:59:25 +0000 (02:59 +1200)]
Add as-yet-unused functions to reduce PR conflicts
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
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
Eileen McNaughton [Thu, 26 May 2022 14:59:25 +0000 (02:59 +1200)]
Add as-yet-unused functions to reduce PR conflicts
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>
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
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...
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
Eileen McNaughton [Thu, 26 May 2022 22:16:18 +0000 (10:16 +1200)]
Remove some never used fields - copy & paste begone
Eileen McNaughton [Thu, 26 May 2022 21:54:15 +0000 (09:54 +1200)]
Merge pull request #23562 from eileenmcnaughton/import_cc
Additional test
Matthew Wire [Mon, 16 May 2022 12:44:48 +0000 (13:44 +0100)]
Simplify parameters for completetransaction for zero value payment
Matthew Wire [Mon, 16 May 2022 12:31:54 +0000 (13:31 +0100)]
Deprecate method completeTransaction on contribution pages
Coleman Watts [Thu, 26 May 2022 18:27:42 +0000 (14:27 -0400)]
Authx - Mark extension as beta
demeritcowboy [Thu, 26 May 2022 18:06:23 +0000 (14:06 -0400)]
Merge pull request #23583 from colemanw/apiDisabledFields
APIv4 - Exclude disabled custom fields
Eileen McNaughton [Thu, 26 May 2022 07:25:32 +0000 (19:25 +1200)]
Use 'getParser' rathe than name the parser
Eileen McNaughton [Thu, 26 May 2022 07:21:11 +0000 (19:21 +1200)]
[Import] [ref] Move function to parent for use by siblings
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
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
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 07:09:36 +0000 (19:09 +1200)]
[Import] Add some not-yet-used functions that are prone to conflict
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 [Wed, 25 May 2022 22:14:33 +0000 (10:14 +1200)]
dev/core#3038 Fix handling for payment_instrument_id, cleanup financial_type_id
This addresses https://lab.civicrm.org/dev/core/-/issues/3038
by getting rid of the non-standardness around payment_instrument_id
and financial_type_id. The two fields are now
marked as importable and we use the
real names (payment_instrument_id) rather than the
'handy-dandy' names (payment_instrument) - which means
we can simplify in a bunch of places. Also since we are
already cleaning up names in the upgrade we add these in there
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
Coleman Watts [Wed, 25 May 2022 19:02:29 +0000 (15:02 -0400)]
APIv4 - Exclude disabled custom fields
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