civicrm-core.git
19 months agoUpgrade fix for url change
Eileen McNaughton [Thu, 30 Mar 2023 20:45:40 +0000 (09:45 +1300)]
Upgrade fix for url change

20 months agoMerge pull request #25951 from civicrm/5.60
Eileen McNaughton [Wed, 29 Mar 2023 01:21:32 +0000 (14:21 +1300)]
Merge pull request #25951 from civicrm/5.60

5.60 to master

20 months agoMerge pull request #25950 from demeritcowboy/upgrade-fk
Eileen McNaughton [Wed, 29 Mar 2023 01:21:03 +0000 (14:21 +1300)]
Merge pull request #25950 from demeritcowboy/upgrade-fk

Make 5.60 upgrade rerunnable

20 months agomake upgrade rerunnable
demeritcowboy [Wed, 29 Mar 2023 00:27:54 +0000 (20:27 -0400)]
make upgrade rerunnable

20 months agoMerge pull request #25946 from totten/master-phpunit9
Eileen McNaughton [Wed, 29 Mar 2023 00:26:05 +0000 (13:26 +1300)]
Merge pull request #25946 from totten/master-phpunit9

(dev/core#4188) phpunit.xml.dist - Make file compatible with phpunit8 + phpunit9

20 months agoMerge pull request #25949 from totten/master-phpunit9-crm
Seamus Lee [Wed, 29 Mar 2023 00:23:17 +0000 (11:23 +1100)]
Merge pull request #25949 from totten/master-phpunit9-crm

(dev/core#4188) Update CRM tests for phpunit9 compatibility

20 months agoMerge pull request #25948 from totten/master-phpunit9-api3
Seamus Lee [Wed, 29 Mar 2023 00:23:01 +0000 (11:23 +1100)]
Merge pull request #25948 from totten/master-phpunit9-api3

(dev/core#4188) Update APIv3 tests for phpunit9 compatibility

20 months agoMerge pull request #25947 from totten/master-phpunit9-api4
Seamus Lee [Wed, 29 Mar 2023 00:20:53 +0000 (11:20 +1100)]
Merge pull request #25947 from totten/master-phpunit9-api4

(dev/core#4188) Update APIv4 tests for phpunit9 compatibility

20 months ago(dev/core#4188) Update CRM tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:47:30 +0000 (16:47 -0700)]
(dev/core#4188) Update CRM tests for phpunit9 compatibility

20 months ago(dev/core#4188) Update APIv3 tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:42:21 +0000 (16:42 -0700)]
(dev/core#4188) Update APIv3 tests for phpunit9 compatibility

These tests failed on `phpunit9` because upstream swapped out around the semantics of `assertContains()`.

The specific issue is whether an array like `["1","2","3"]` contains the value `2`.

* `assertContains()` in phpunit8 says yes.
* `assertContains()` in phpunit9 says no.
* `assertContainsEquals()` in both phpunit8+phpunit9 says yes.

20 months ago(dev/core#4188) Update APIv4 tests for phpunit9 compatibility
Tim Otten [Tue, 28 Mar 2023 23:02:01 +0000 (16:02 -0700)]
(dev/core#4188) Update APIv4 tests for phpunit9 compatibility

These tests failed on `phpunit9` because upstream swapped out around the semantics of `assertContains()`.

The specific issue is whether an array like `["1","2","3"]` contains the value `2`.

* `assertContains()` in phpunit8 says yes.
* `assertContains()` in phpunit9 says no.
* `assertContainsEquals()` in both phpunit8+phpunit9 says yes.

20 months agophpunit.xml.dist - Make file compatible with phpunit8 + phpunit9
Tim Otten [Tue, 28 Mar 2023 22:28:26 +0000 (15:28 -0700)]
phpunit.xml.dist - Make file compatible with phpunit8 + phpunit9

20 months agoMerge pull request #25873 from colemanw/ppUpdate
Eileen McNaughton [Tue, 28 Mar 2023 20:28:33 +0000 (09:28 +1300)]
Merge pull request #25873 from colemanw/ppUpdate

PaymentProcessor - Enter title instead of name on form, call hooks

20 months agoPHP 8.2 - declare property _fields
Eileen McNaughton [Tue, 28 Mar 2023 04:01:56 +0000 (17:01 +1300)]
PHP 8.2 - declare property _fields

Really we want to merge this into entityFields but it wasn't as easy as I hoped

20 months agoFix incorrect redirect when saving with bad config
Eileen McNaughton [Tue, 28 Mar 2023 03:59:38 +0000 (16:59 +1300)]
Fix incorrect redirect when saving with bad config

Since the config is checked after saving we want to go to the
edit form, not the new form

20 months agoFix form to stop messing name field for test processor
Eileen McNaughton [Fri, 24 Mar 2023 02:28:47 +0000 (15:28 +1300)]
Fix form to stop messing name field for test processor

20 months agoConsolidate loading parameters from PaymentProcessorType
Eileen McNaughton [Tue, 28 Mar 2023 01:20:05 +0000 (14:20 +1300)]
Consolidate loading parameters from PaymentProcessorType

20 months agoPresent frontend_title for Payment processor
Eileen McNaughton [Tue, 28 Mar 2023 01:29:09 +0000 (14:29 +1300)]
Present frontend_title for Payment processor

20 months agoPaymentProecssor - Add frontend_title & make title required
Coleman Watts [Sun, 19 Mar 2023 23:55:54 +0000 (19:55 -0400)]
PaymentProecssor - Add frontend_title & make title required

Clarifies the role of 'title' as "for admins" and adds a new "frontend_title" for end-users.

Updates the PaymentProcessor form/dao to use hooks instead of an overloaded "create" function,
and only allows the title and frontend_title instead of the name to be entered on the form.

The name will be autogenerated from the title in the DAO::writeRecord function.
The frontend_title is required in the database but will be filled from `title` if not supplied during `create`

Updates tests, sql and sample data with required field

20 months agoMerge pull request #25927 from colemanw/entityRefFix
colemanw [Tue, 28 Mar 2023 15:10:31 +0000 (11:10 -0400)]
Merge pull request #25927 from colemanw/entityRefFix

SearchKit - Fix handling of new Custom EntityReference fields

20 months agoMerge pull request #25937 from colemanw/emailWriteRecord
colemanw [Tue, 28 Mar 2023 12:36:54 +0000 (08:36 -0400)]
Merge pull request #25937 from colemanw/emailWriteRecord

Refactor CRM_Core_BAO_Email to use DAO::writeRecord

20 months agoMerge pull request #25933 from mlutfy/logReminders
Yashodha Chaku [Tue, 28 Mar 2023 12:32:02 +0000 (18:02 +0530)]
Merge pull request #25933 from mlutfy/logReminders

Log sending of Scheduled Reminders

20 months agoMerge pull request #25941 from eileenmcnaughton/nfc_null
Seamus Lee [Tue, 28 Mar 2023 07:31:22 +0000 (18:31 +1100)]
Merge pull request #25941 from eileenmcnaughton/nfc_null

[NFC] Remove extraneous NULL

20 months agoMerge pull request #25943 from totten/master-mfw
Tim Otten [Tue, 28 Mar 2023 07:06:23 +0000 (00:06 -0700)]
Merge pull request #25943 from totten/master-mfw

Merge forward 5.60-rc=>master

20 months agoMerge remote-tracking branch 'origin/5.60' into master-mfw
Tim Otten [Tue, 28 Mar 2023 06:54:07 +0000 (23:54 -0700)]
Merge remote-tracking branch 'origin/5.60' into master-mfw

20 months agoMerge pull request #25942 from totten/5.60-cache-test
Tim Otten [Tue, 28 Mar 2023 06:52:09 +0000 (23:52 -0700)]
Merge pull request #25942 from totten/5.60-cache-test

Simplify steps of loading SimpleCacheTest from cache/integration-tests

20 months agoMerge pull request #25940 from eileenmcnaughton/upgrade_bug
Eileen McNaughton [Tue, 28 Mar 2023 06:18:39 +0000 (19:18 +1300)]
Merge pull request #25940 from eileenmcnaughton/upgrade_bug

Fix bug in just-merged upgrade code

20 months ago[NFC] Remove extraneous NULL
Eileen McNaughton [Tue, 28 Mar 2023 05:53:53 +0000 (18:53 +1300)]
[NFC] Remove extraneous NULL

It confuses code analysers & Coleman says it's silly

20 months ago(NFC) SimpleCacheTest - Adapt license
Tim Otten [Tue, 28 Mar 2023 05:53:30 +0000 (22:53 -0700)]
(NFC) SimpleCacheTest - Adapt license

The copied declaration references a file that doesn't exist. Just inline it.

20 months agoremove dependence on cache/integration-tests
demeritcowboy [Sun, 12 Mar 2023 20:48:48 +0000 (16:48 -0400)]
remove dependence on cache/integration-tests

20 months agoFix bug in just-merged upgrade code
Eileen McNaughton [Tue, 28 Mar 2023 05:42:32 +0000 (18:42 +1300)]
Fix bug in just-merged upgrade code

20 months agoUndeclare cache/integration-tests
Tim Otten [Tue, 28 Mar 2023 05:38:14 +0000 (22:38 -0700)]
Undeclare cache/integration-tests

20 months agoRefactor CRM_Core_BAO_Email to use DAO::writeRecord
Coleman Watts [Mon, 27 Mar 2023 21:41:58 +0000 (17:41 -0400)]
Refactor CRM_Core_BAO_Email to use DAO::writeRecord

20 months agoMerge pull request #25808 from eileenmcnaughton/import_template
colemanw [Mon, 27 Mar 2023 23:09:49 +0000 (19:09 -0400)]
Merge pull request #25808 from eileenmcnaughton/import_template

dev/core#4130 add template support for imports

20 months agoMerge pull request #25936 from civicrm/5.60
Eileen McNaughton [Mon, 27 Mar 2023 21:43:03 +0000 (10:43 +1300)]
Merge pull request #25936 from civicrm/5.60

5.60 to master

20 months agoMerge pull request #25932 from ufundo/api-event-create-from-template
Eileen McNaughton [Mon, 27 Mar 2023 21:00:45 +0000 (10:00 +1300)]
Merge pull request #25932 from ufundo/api-event-create-from-template

Fix for creating new events from template with api

20 months agoMerge pull request #25879 from eileenmcnaughton/import_hooks
colemanw [Mon, 27 Mar 2023 20:22:37 +0000 (16:22 -0400)]
Merge pull request #25879 from eileenmcnaughton/import_hooks

dev/core#3514 Define hook to alter data once it has been mapped but before work is done on it.

20 months agoMerge pull request #25886 from eileenmcnaughton/import_contribution_api4
colemanw [Mon, 27 Mar 2023 20:21:38 +0000 (16:21 -0400)]
Merge pull request #25886 from eileenmcnaughton/import_contribution_api4

Update Contribution Import to use apiv4 field names, prior to adding hooks

20 months agoCast metadata to string, as it would hit deprecation notice on null
Eileen McNaughton [Mon, 27 Mar 2023 20:08:02 +0000 (09:08 +1300)]
Cast metadata to string, as it would hit deprecation notice on null

20 months agoAdd url to UserJob data & declare import Type on MapField screens
Eileen McNaughton [Thu, 16 Mar 2023 04:48:46 +0000 (17:48 +1300)]
Add url to UserJob data & declare import Type on MapField screens

The DataSource screen currently declares the type so this makes it available on MapField

Minor tidy up/ standardisation on Contact defaultValues

This also allows the parent to override the values, e.g if loaded from a template

Fix BAO to support Template UserJobs

- do not save non-template fields
- delete templates on Mapping deletes

Add support for UserJob templates at the form level

Fix for strict typing

20 months agofix creating new event from template
benjamin [Mon, 27 Mar 2023 13:52:52 +0000 (13:52 +0000)]
fix creating new event from template

20 months agomake test for creating event from template a bit more difficult
benjamin [Mon, 27 Mar 2023 14:16:25 +0000 (15:16 +0100)]
make test for creating event from template a bit more difficult

20 months agoMerge pull request #25934 from colemanw/usageGen
Eileen McNaughton [Mon, 27 Mar 2023 19:48:33 +0000 (08:48 +1300)]
Merge pull request #25934 from colemanw/usageGen

Regenerate DAOs with usage from #25874

20 months agoRegenerate DAOs with usage from #25874
Coleman Watts [Mon, 27 Mar 2023 18:46:23 +0000 (14:46 -0400)]
Regenerate DAOs with usage from #25874

20 months agoLog sending of Scheduled Reminders
Mathieu Lutfy [Mon, 27 Mar 2023 16:08:57 +0000 (12:08 -0400)]
Log sending of Scheduled Reminders

They are a pain to debug when they fail because of errors with smarty or tokens

20 months agoMerge pull request #25408 from artfulrobot/artfulrobot-speedup-searchkit
Matthew Wire [Mon, 27 Mar 2023 15:38:03 +0000 (16:38 +0100)]
Merge pull request #25408 from artfulrobot/artfulrobot-speedup-searchkit

Speed up SearchKit results loading by 800ms

20 months agoMerge pull request #25754 from eileenmcnaughton/quick_config
Matthew Wire [Mon, 27 Mar 2023 11:14:04 +0000 (12:14 +0100)]
Merge pull request #25754 from eileenmcnaughton/quick_config

Extract `isMembershipPriceSet` (`useForMember`)

20 months agoMerge pull request #25929 from eileenmcnaughton/mem_test_nfc
Matthew Wire [Mon, 27 Mar 2023 11:10:20 +0000 (12:10 +0100)]
Merge pull request #25929 from eileenmcnaughton/mem_test_nfc

Add unit test cover for test offline mail receipt

20 months agoMerge pull request #25912 from eileenmcnaughton/560
Matthew Wire [Mon, 27 Mar 2023 11:08:12 +0000 (12:08 +0100)]
Merge pull request #25912 from eileenmcnaughton/560

dev/core#4197 Ensure parameters are correct type

20 months agoMerge pull request #25907 from eileenmcnaughton/url
Matthew Wire [Mon, 27 Mar 2023 11:07:44 +0000 (12:07 +0100)]
Merge pull request #25907 from eileenmcnaughton/url

Fix import contribution url

20 months agoMerge pull request #25833 from eileenmcnaughton/mid
Matthew Wire [Mon, 27 Mar 2023 11:06:44 +0000 (12:06 +0100)]
Merge pull request #25833 from eileenmcnaughton/mid

[php8.2] Create getter for `renewalMembershipID`, remove if

20 months agoMerge pull request #25454 from eileenmcnaughton/grant_notice
Matthew Wire [Mon, 27 Mar 2023 11:05:28 +0000 (12:05 +0100)]
Merge pull request #25454 from eileenmcnaughton/grant_notice

CiviReport - Remove duplicate external identifier key in contact fields array, reduce notices

20 months agoAdd unit test cover for test offline mail receipt
Eileen McNaughton [Mon, 27 Mar 2023 04:45:40 +0000 (17:45 +1300)]
Add unit test cover for test offline mail receipt

20 months agoMerge pull request #25928 from eileenmcnaughton/mem_test_nfc
Seamus Lee [Mon, 27 Mar 2023 04:02:54 +0000 (15:02 +1100)]
Merge pull request #25928 from eileenmcnaughton/mem_test_nfc

[NFC] Test cleanup, prefer full form test flow

20 months ago[NFC] Test cleanup, prefer full form test flow
Eileen McNaughton [Mon, 27 Mar 2023 02:36:37 +0000 (15:36 +1300)]
[NFC] Test cleanup, prefer full form test flow

20 months agoAPIv4 - Prevent errors during upgrade when loading custom field metadata
Coleman Watts [Sun, 26 Mar 2023 23:35:29 +0000 (19:35 -0400)]
APIv4 - Prevent errors during upgrade when loading custom field metadata

20 months agoMerge pull request #25924 from eileenmcnaughton/mem_test
Seamus Lee [Sun, 26 Mar 2023 22:05:13 +0000 (09:05 +1100)]
Merge pull request #25924 from eileenmcnaughton/mem_test

Fix intermittant test fail

20 months agoSearchKit - Fix handing of new EntityReference custom fields
Coleman Watts [Sun, 26 Mar 2023 20:46:08 +0000 (16:46 -0400)]
SearchKit - Fix handing of new EntityReference custom fields

Fixes the metadata for the new EntityReference custom fields to correctly display.

Removes redundant function SpecFormatter::customFieldHasOptions which was completely
identical to CRM_Core_BAO_CustomField::hasOptions except for one line which was incorrect.

20 months agoEntityRef fields don't get returned and can't be joined in API4
Jon Goldberg [Fri, 24 Mar 2023 20:22:38 +0000 (16:22 -0400)]
EntityRef fields don't get returned and can't be joined in API4

20 months agoMerge pull request #25926 from braders/entity-form-trait-properties
colemanw [Sun, 26 Mar 2023 15:11:34 +0000 (11:11 -0400)]
Merge pull request #25926 from braders/entity-form-trait-properties

[REF][PHP8.2] Declare properties directly on CRM_Core_Form_EntityFormTrait

20 months agoMerge pull request #25925 from braders/membership-test-variable
colemanw [Sun, 26 Mar 2023 13:27:28 +0000 (09:27 -0400)]
Merge pull request #25925 from braders/membership-test-variable

[REF][PHP8.2] Convert dynamic property into a variable

20 months ago[REF][PHP8.2] Declare properties directly on CRM_Core_Form_EntityFormTrait
Bradley Taylor [Sun, 26 Mar 2023 10:52:14 +0000 (11:52 +0100)]
[REF][PHP8.2] Declare properties directly on CRM_Core_Form_EntityFormTrait

20 months ago[REF][PHP8.2] Convert dynamic property into a variable
Bradley Taylor [Sun, 26 Mar 2023 10:15:58 +0000 (11:15 +0100)]
[REF][PHP8.2] Convert dynamic property into a variable

20 months agoMerge pull request #25923 from eileenmcnaughton/mem_offline
colemanw [Sat, 25 Mar 2023 23:24:11 +0000 (19:24 -0400)]
Merge pull request #25923 from eileenmcnaughton/mem_offline

Stop passing `$this` as `$form` to previously shared, non-static, function

20 months agoFix intermittant test fail
Eileen McNaughton [Sat, 25 Mar 2023 22:51:22 +0000 (11:51 +1300)]
Fix intermittant test fail

20 months agoStop passing this as form to previously shared, non-static, function
Eileen McNaughton [Sat, 25 Mar 2023 22:34:08 +0000 (11:34 +1300)]
Stop passing this as form to previously shared, non-static, function

20 months agoMerge pull request #25918 from mlutfy/core4204
Eileen McNaughton [Sat, 25 Mar 2023 21:08:01 +0000 (10:08 +1300)]
Merge pull request #25918 from mlutfy/core4204

dev/core#4204 Show the Payment Agreement of the selected processor

20 months agoMerge pull request #25921 from braders/unused-ufmatchid
Eileen McNaughton [Sat, 25 Mar 2023 21:05:44 +0000 (10:05 +1300)]
Merge pull request #25921 from braders/unused-ufmatchid

[REF][PHP8.2] Remove unused dyanamic property

20 months ago[REF][PHP8.2] Remove unused dyanamic property
Bradley Taylor [Sat, 25 Mar 2023 16:15:12 +0000 (16:15 +0000)]
[REF][PHP8.2] Remove unused dyanamic property

20 months agodev/core#4204 Show the Payment Agreement of the selected processor
Mathieu Lutfy [Sat, 25 Mar 2023 01:12:45 +0000 (21:12 -0400)]
dev/core#4204 Show the Payment Agreement of the selected processor

20 months agoMerge pull request #25916 from civicrm/5.60
Eileen McNaughton [Sat, 25 Mar 2023 01:11:54 +0000 (14:11 +1300)]
Merge pull request #25916 from civicrm/5.60

5.60 to master

20 months agoMerge pull request #25910 from eileenmcnaughton/regression_dd
Mathieu Lu [Sat, 25 Mar 2023 00:28:33 +0000 (20:28 -0400)]
Merge pull request #25910 from eileenmcnaughton/regression_dd

dev/core#4189 Fix indiscriminate display of direct debit agreement

20 months agoMerge pull request #25900 from eileenmcnaughton/import_contact_custom_bool
colemanw [Fri, 24 Mar 2023 22:50:20 +0000 (18:50 -0400)]
Merge pull request #25900 from eileenmcnaughton/import_contact_custom_bool

dev/core#3937 Remove legacy code causing custom boolean import bug

20 months agoMerge pull request #25913 from mlutfy/flushCacheButton
Matthew Wire [Fri, 24 Mar 2023 21:30:14 +0000 (21:30 +0000)]
Merge pull request #25913 from mlutfy/flushCacheButton

UpdateConfigBackend: use api4 to flush the cache

20 months agoUpdateConfigBackend: use api4 to flush the cache
Mathieu Lutfy [Fri, 24 Mar 2023 19:36:26 +0000 (15:36 -0400)]
UpdateConfigBackend: use api4 to flush the cache

20 months agoMerge pull request #25780 from yashodha/dev-4176
demeritcowboy [Fri, 24 Mar 2023 17:20:22 +0000 (13:20 -0400)]
Merge pull request #25780 from yashodha/dev-4176

(dev/core#4176) Allow to search on participant id

20 months ago(dev/core#4176) Allow to search on participant id
yashodha [Fri, 10 Mar 2023 06:37:38 +0000 (12:07 +0530)]
(dev/core#4176) Allow to search on participant id

20 months agodev/core#4197 Ensure parameters are correct type
Eileen McNaughton [Fri, 24 Mar 2023 03:43:06 +0000 (16:43 +1300)]
dev/core#4197 Ensure parameters are correct type

20 months agoMerge pull request #25876 from eileenmcnaughton/custom_number
Eileen McNaughton [Fri, 24 Mar 2023 02:43:44 +0000 (15:43 +1300)]
Merge pull request #25876 from eileenmcnaughton/custom_number

dev/core#4152 Fix custom data code to not cast to a float

20 months agodev/core#3514 Define hook to alter data once it has been mapped but before work is...
Eileen McNaughton [Mon, 20 Mar 2023 10:43:19 +0000 (23:43 +1300)]
dev/core#3514 Define hook to alter data once it has been mapped but before work is done on it.

20 months agoMinor tidy up in test class
Eileen McNaughton [Wed, 22 Mar 2023 06:46:06 +0000 (19:46 +1300)]
Minor tidy up in test class

20 months agoUpdate Contribution Import to use apiv4 field names, prior to adding hooks
Eileen McNaughton [Tue, 21 Mar 2023 04:11:54 +0000 (17:11 +1300)]
Update Contribution Import to use apiv4 field names, prior to adding hooks

20 months agoMerge pull request #25911 from eileenmcnaughton/master
Eileen McNaughton [Fri, 24 Mar 2023 01:53:36 +0000 (14:53 +1300)]
Merge pull request #25911 from eileenmcnaughton/master

5.60 to master

20 months agoMerge branch '5.60' of github.com:civicrm/civicrm-core
Eileen McNaughton [Fri, 24 Mar 2023 01:52:06 +0000 (14:52 +1300)]
Merge branch '5.60' of github.com:civicrm/civicrm-core

20 months agoMerge pull request #25897 from eileenmcnaughton/import_contact_id
colemanw [Fri, 24 Mar 2023 01:40:10 +0000 (21:40 -0400)]
Merge pull request #25897 from eileenmcnaughton/import_contact_id

Fix for issue when optional contact_id is blank importing contributions

20 months agoMerge pull request #25905 from colemanw/getSetApiValues
colemanw [Fri, 24 Mar 2023 01:30:43 +0000 (21:30 -0400)]
Merge pull request #25905 from colemanw/getSetApiValues

Api4 - Prevent developer error mixing up `addValue` with `addWhere`

20 months agoFix import contribution url
Eileen McNaughton [Thu, 23 Mar 2023 20:17:53 +0000 (09:17 +1300)]
Fix import contribution url

20 months agodev/core#4189 Fix indiscriminate display of direct debit agreement
Eileen McNaughton [Thu, 23 Mar 2023 23:33:14 +0000 (12:33 +1300)]
dev/core#4189 Fix indiscriminate display of direct debit agreement

20 months agoMerge pull request #25909 from totten/5.60-vertest
Tim Otten [Thu, 23 Mar 2023 23:21:30 +0000 (16:21 -0700)]
Merge pull request #25909 from totten/5.60-vertest

(NFC) Version Check Test - Fix multi-user and concurrent execution

20 months agodev/core#3937 Remove legacy code causing custom boolean import bug
Eileen McNaughton [Thu, 23 Mar 2023 00:25:27 +0000 (13:25 +1300)]
dev/core#3937 Remove legacy code causing custom boolean import bug

20 months ago(NFC) Version Check Test - Fix multi-user and concurrent execution
Tim Otten [Thu, 23 Mar 2023 22:22:10 +0000 (15:22 -0700)]
(NFC) Version Check Test - Fix multi-user and concurrent execution

This is a small change to the way the tests run. It doesn't change the meaning of the test.

Before
------

* Writes example file to `/tmp/versionCheckTestFile.json`.
* File left behind at end of test.
* If two users runs the same test at different times, they could interfere with each other.
* If two processes run the same test at the same time, they could interfere with each other.

After
-----

* Writes example file to `/tmp/VersionCheck-NNNNNNN/versionCheckTestFile.json`
* Temp folder cleaned up at end
* If two users or two processes run the test, they use separate folders

20 months agoMerge pull request #25672 from colemanw/joinStuff
Joe Murray [Thu, 23 Mar 2023 21:51:02 +0000 (17:51 -0400)]
Merge pull request #25672 from colemanw/joinStuff

Note API - Fix viewing, joining to, and updating Notes

20 months agoMerge pull request #25903 from colemanw/hookCleanup
demeritcowboy [Thu, 23 Mar 2023 16:40:14 +0000 (12:40 -0400)]
Merge pull request #25903 from colemanw/hookCleanup

Code cleanup on aisle Hook

20 months agoMerge pull request #25895 from eileenmcnaughton/url
colemanw [Thu, 23 Mar 2023 16:35:05 +0000 (12:35 -0400)]
Merge pull request #25895 from eileenmcnaughton/url

Fix recently added import url

20 months agoMerge pull request #25896 from eileenmcnaughton/import_label
colemanw [Thu, 23 Mar 2023 16:33:41 +0000 (12:33 -0400)]
Merge pull request #25896 from eileenmcnaughton/import_label

Show friendlier labels when Civi-Import enabled

20 months agoMerge pull request #25898 from eileenmcnaughton/import_contact_custom
colemanw [Thu, 23 Mar 2023 16:22:05 +0000 (12:22 -0400)]
Merge pull request #25898 from eileenmcnaughton/import_contact_custom

Fix Contact Import tests custom date testing, remove duplicate handling

20 months agoApi4 - Prevent developer error mixing up the `addValue` and `addWhere` functions
Coleman Watts [Thu, 23 Mar 2023 13:05:39 +0000 (09:05 -0400)]
Api4 - Prevent developer error mixing up the `addValue` and `addWhere` functions

20 months agoCode cleanup on aisle CRM_Utils_Hook
Coleman Watts [Thu, 23 Mar 2023 12:40:21 +0000 (08:40 -0400)]
Code cleanup on aisle CRM_Utils_Hook

20 months agoMerge pull request #25902 from demeritcowboy/that
colemanw [Thu, 23 Mar 2023 11:57:36 +0000 (07:57 -0400)]
Merge pull request #25902 from demeritcowboy/that

[NFC] hulk smash

20 months agohulk smash
demeritcowboy [Thu, 23 Mar 2023 06:05:57 +0000 (02:05 -0400)]
hulk smash