Anthony [Thu, 24 Mar 2022 04:29:44 +0000 (12:29 +0800)]
dev/core#3133 - Extend Authx functionality to support validation of externally generated JWTs
Migrate legacy rest to appropriate place
Remove legacy auth as not needed due to it self registering now
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
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.
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
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
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
Eileen McNaughton [Fri, 24 Mar 2023 02:28:47 +0000 (15:28 +1300)]
Fix form to stop messing name field for test processor
Eileen McNaughton [Tue, 28 Mar 2023 01:20:05 +0000 (14:20 +1300)]
Consolidate loading parameters from PaymentProcessorType
Eileen McNaughton [Tue, 28 Mar 2023 01:29:09 +0000 (14:29 +1300)]
Present frontend_title for Payment processor
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
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
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
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
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
Tim Otten [Tue, 28 Mar 2023 06:54:07 +0000 (23:54 -0700)]
Merge remote-tracking branch 'origin/5.60' into master-mfw
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
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
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
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.
demeritcowboy [Sun, 12 Mar 2023 20:48:48 +0000 (16:48 -0400)]
remove dependence on cache/integration-tests
Eileen McNaughton [Tue, 28 Mar 2023 05:42:32 +0000 (18:42 +1300)]
Fix bug in just-merged upgrade code
Tim Otten [Tue, 28 Mar 2023 05:38:14 +0000 (22:38 -0700)]
Undeclare cache/integration-tests
Coleman Watts [Mon, 27 Mar 2023 21:41:58 +0000 (17:41 -0400)]
Refactor CRM_Core_BAO_Email to use DAO::writeRecord
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
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
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
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.
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
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
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
benjamin [Mon, 27 Mar 2023 13:52:52 +0000 (13:52 +0000)]
fix creating new event from template
benjamin [Mon, 27 Mar 2023 14:16:25 +0000 (15:16 +0100)]
make test for creating event from template a bit more difficult
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
Coleman Watts [Mon, 27 Mar 2023 18:46:23 +0000 (14:46 -0400)]
Regenerate DAOs with usage from #25874
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
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
Matthew Wire [Mon, 27 Mar 2023 11:14:04 +0000 (12:14 +0100)]
Merge pull request #25754 from eileenmcnaughton/quick_config
Extract `isMembershipPriceSet` (`useForMember`)
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
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
Matthew Wire [Mon, 27 Mar 2023 11:07:44 +0000 (12:07 +0100)]
Merge pull request #25907 from eileenmcnaughton/url
Fix import contribution url
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
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
Eileen McNaughton [Mon, 27 Mar 2023 04:45:40 +0000 (17:45 +1300)]
Add unit test cover for test offline mail receipt
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
Eileen McNaughton [Mon, 27 Mar 2023 02:36:37 +0000 (15:36 +1300)]
[NFC] Test cleanup, prefer full form test flow
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
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
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
Bradley Taylor [Sun, 26 Mar 2023 10:52:14 +0000 (11:52 +0100)]
[REF][PHP8.2] Declare properties directly on CRM_Core_Form_EntityFormTrait
Bradley Taylor [Sun, 26 Mar 2023 10:15:58 +0000 (11:15 +0100)]
[REF][PHP8.2] Convert dynamic property into a variable
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
Eileen McNaughton [Sat, 25 Mar 2023 22:51:22 +0000 (11:51 +1300)]
Fix intermittant test fail
Eileen McNaughton [Sat, 25 Mar 2023 22:34:08 +0000 (11:34 +1300)]
Stop passing this as form to previously shared, non-static, function
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
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
Bradley Taylor [Sat, 25 Mar 2023 16:15:12 +0000 (16:15 +0000)]
[REF][PHP8.2] Remove unused dyanamic property
Mathieu Lutfy [Sat, 25 Mar 2023 01:12:45 +0000 (21:12 -0400)]
dev/core#4204 Show the Payment Agreement of the selected processor
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
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
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
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
Mathieu Lutfy [Fri, 24 Mar 2023 19:36:26 +0000 (15:36 -0400)]
UpdateConfigBackend: use api4 to flush the cache
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
yashodha [Fri, 10 Mar 2023 06:37:38 +0000 (12:07 +0530)]
(dev/core#4176) Allow to search on participant id
Eileen McNaughton [Fri, 24 Mar 2023 03:43:06 +0000 (16:43 +1300)]
dev/core#4197 Ensure parameters are correct type
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
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.
Eileen McNaughton [Wed, 22 Mar 2023 06:46:06 +0000 (19:46 +1300)]
Minor tidy up in test class
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
Eileen McNaughton [Fri, 24 Mar 2023 01:53:36 +0000 (14:53 +1300)]
Merge pull request #25911 from eileenmcnaughton/master
5.60 to master
Eileen McNaughton [Fri, 24 Mar 2023 01:52:06 +0000 (14:52 +1300)]
Merge branch '5.60' of github.com:civicrm/civicrm-core
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
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`
Eileen McNaughton [Thu, 23 Mar 2023 20:17:53 +0000 (09:17 +1300)]
Fix import contribution url
Eileen McNaughton [Thu, 23 Mar 2023 23:33:14 +0000 (12:33 +1300)]
dev/core#4189 Fix indiscriminate display of direct debit agreement
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
Eileen McNaughton [Thu, 23 Mar 2023 00:25:27 +0000 (13:25 +1300)]
dev/core#3937 Remove legacy code causing custom boolean import bug
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
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
demeritcowboy [Thu, 23 Mar 2023 16:40:14 +0000 (12:40 -0400)]
Merge pull request #25903 from colemanw/hookCleanup
Code cleanup on aisle Hook
colemanw [Thu, 23 Mar 2023 16:35:05 +0000 (12:35 -0400)]
Merge pull request #25895 from eileenmcnaughton/url
Fix recently added import url
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
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
Coleman Watts [Thu, 23 Mar 2023 13:05:39 +0000 (09:05 -0400)]
Api4 - Prevent developer error mixing up the `addValue` and `addWhere` functions
Coleman Watts [Thu, 23 Mar 2023 12:40:21 +0000 (08:40 -0400)]
Code cleanup on aisle CRM_Utils_Hook
colemanw [Thu, 23 Mar 2023 11:57:36 +0000 (07:57 -0400)]
Merge pull request #25902 from demeritcowboy/that
[NFC] hulk smash
demeritcowboy [Thu, 23 Mar 2023 06:05:57 +0000 (02:05 -0400)]
hulk smash
Eileen McNaughton [Thu, 23 Mar 2023 02:47:40 +0000 (15:47 +1300)]
Merge pull request #25901 from colemanw/nullObject
Deprecate CRM_Utils_Hook::$nullObject
Coleman Watts [Thu, 23 Mar 2023 01:07:17 +0000 (21:07 -0400)]
Deprecate CRM_Utils_Hook::$nullObject
Eileen McNaughton [Wed, 22 Mar 2023 22:28:25 +0000 (11:28 +1300)]
Fix Contact Import tests custom date testing, remove duplicate handling
All the code in the formatCommonData function is legacy contact
import handling for stuff that is already handled in the generic
metadata based code. This fixes the test so it is actually testing
it for contact and address custom date fields & removes
colemanw [Wed, 22 Mar 2023 12:23:36 +0000 (08:23 -0400)]
Merge pull request #25894 from eileenmcnaughton/find_protected
Add getter for dedupeRuleGroupID
colemanw [Wed, 22 Mar 2023 12:13:46 +0000 (08:13 -0400)]
Merge pull request #25874 from eileenmcnaughton/usage
Add handling of `usage` to `DAO` generator
Eileen McNaughton [Wed, 22 Mar 2023 09:22:37 +0000 (22:22 +1300)]
Fix for issue when optional contact_id is blank
Eileen McNaughton [Wed, 22 Mar 2023 04:41:11 +0000 (17:41 +1300)]
Show friendlier labels when Civi-Import enabled
Eileen McNaughton [Wed, 22 Mar 2023 03:29:54 +0000 (16:29 +1300)]
Fix recently added import url
my head hurts - every other import url follows the other
format - ie civicrm/import/contribution & is
defined in Import.xml
Consistency wishmistancy
Tim Otten [Wed, 22 Mar 2023 00:46:56 +0000 (17:46 -0700)]
Merge pull request #25887 from eileenmcnaughton/dep_dn
Remove 2021 noisily deprecated pdfCommon function
Tim Otten [Wed, 22 Mar 2023 00:30:19 +0000 (17:30 -0700)]
Merge pull request #25891 from eileenmcnaughton/map_field
[NFC] Add metadata about import jobs to `MapField` form
Eileen McNaughton [Tue, 21 Mar 2023 23:18:01 +0000 (12:18 +1300)]
Add getter for dedupeRuleGroupID
We recently declared this with protected visibility - it turns out WMF
actually references it... I figure maybe a getter is better practice so
we still can....
Seamus Lee [Tue, 21 Mar 2023 21:57:54 +0000 (08:57 +1100)]
Merge pull request #25890 from eileenmcnaughton/dep_mail_format
Remove references to deprecated `preferred_mail_format` in tests
Eileen McNaughton [Tue, 21 Mar 2023 21:19:41 +0000 (10:19 +1300)]
[NFC] Add metadata about import jobs to MapField form
This extra metadata has been part of a whole lot of PRs & somehow always
winds up in conflict or otherwise so I'm adding it by itself, wihout any usage of it.
Note that
- this brings MapField into line with DataSource
- there is nothing calling these functions as of this PR - it's just
an attempt to get the extra metadata added to the forms/ parsers without
conflict