eileen [Thu, 4 Jan 2024 02:14:19 +0000 (15:14 +1300)]
Minor cleanup in ReportInstance BAO
Eileen McNaughton [Thu, 4 Jan 2024 00:53:43 +0000 (13:53 +1300)]
Merge pull request #28859 from eileenmcnaughton/table
Fix notice on civi-report display
eileen [Thu, 4 Jan 2024 00:11:23 +0000 (13:11 +1300)]
Fix notice on civi-report display
Tim Otten [Wed, 3 Jan 2024 23:48:11 +0000 (17:48 -0600)]
Merge pull request #28757 from totten/master-oauth2-google
(dev/core#3581) composer.json - Allow newer version of oauth2-google
Tim Otten [Thu, 21 Dec 2023 19:12:00 +0000 (11:12 -0800)]
(dev/core#3581) composer.json - Allow newer version of oauth2-google
I looked at the diffs for v3.0.4 and 4.0.0.
* They raised the requirements to PHP 7.3/8.0 and added some type-hints.
* They raised the test-env to PHPUnit 8/9
* They updated some metadata to say all that.
* The main contracts are provided by `league/oauth2-client` -- which
hasn't changed. It's still the same v2.x requirement.
* I don't believe that Civi directly extends/overrides any of the Google Auth stuff.
Eileen McNaughton [Wed, 3 Jan 2024 22:25:25 +0000 (11:25 +1300)]
Merge pull request #28519 from MegaphoneJon/pcp-enumerate
[REF] Rewrite PCP enumeration to avoid caching bug
Eileen McNaughton [Wed, 3 Jan 2024 19:29:06 +0000 (08:29 +1300)]
Merge pull request #28857 from civicrm/5.69
5.69 to master
Eileen McNaughton [Wed, 3 Jan 2024 19:28:38 +0000 (08:28 +1300)]
Merge pull request #28856 from eileenmcnaughton/569
Correct jcalendar.tpl
Stephen Palmstrom [Wed, 3 Jan 2024 17:37:29 +0000 (17:37 +0000)]
Correct jcalendar.tpl
Eileen McNaughton [Wed, 3 Jan 2024 19:23:28 +0000 (08:23 +1300)]
Merge pull request #28851 from colemanw/ruleGroupTestCleanup
[NFC] Cleanup dummy DAO in ruleGroupTest class
Rich Lott [Wed, 3 Jan 2024 18:09:29 +0000 (18:09 +0000)]
Merge pull request #28852 from colemanw/checkAccessHelp
[NFC] Fix docblock reference in _checkAccess functions
colemanw [Wed, 3 Jan 2024 14:50:05 +0000 (09:50 -0500)]
Merge pull request #28540 from twomice/3912_sk_manage_premiums
Add "Manage Premiums" to AdminUI, toward dev/core#3912 .
colemanw [Wed, 3 Jan 2024 14:42:04 +0000 (09:42 -0500)]
Fix docblock reference in _checkAccess functions
colemanw [Wed, 3 Jan 2024 14:35:26 +0000 (09:35 -0500)]
Cleanup dummy DAO in ruleGroupTest class
The getReferenceColumns() is no longer needed and can just use the parent function.
colemanw [Wed, 3 Jan 2024 14:05:39 +0000 (09:05 -0500)]
Update preview path in Product.xml
Seamus Lee [Wed, 3 Jan 2024 07:28:51 +0000 (18:28 +1100)]
Merge pull request #28849 from eileenmcnaughton/test_clean
Minor cleanup in test class
eileen [Wed, 3 Jan 2024 05:35:23 +0000 (18:35 +1300)]
Standardise processor set up, variable usage
eileen [Wed, 3 Jan 2024 05:20:14 +0000 (18:20 +1300)]
Minor cleanup in test class
Eileen McNaughton [Wed, 3 Jan 2024 03:14:01 +0000 (16:14 +1300)]
Merge pull request #28846 from colemanw/extReferenceColumns
Regenerate ext DAO files using updated civix
Eileen McNaughton [Wed, 3 Jan 2024 02:39:26 +0000 (15:39 +1300)]
Merge pull request #28844 from eileenmcnaughton/date_non_us
Fix handling of non-padded day in import date in dd/mm/yyy format
colemanw [Wed, 3 Jan 2024 02:07:26 +0000 (21:07 -0500)]
Regenerate ext DAO files using updated civix
Uses the update from https://github.com/totten/civix/pull/328 to add FKColumnName metadata.
Eileen McNaughton [Wed, 3 Jan 2024 00:34:29 +0000 (13:34 +1300)]
Merge pull request #28843 from civicrm/5.69
5.69
Eileen McNaughton [Wed, 3 Jan 2024 00:22:19 +0000 (13:22 +1300)]
Merge pull request #28827 from colemanw/getReferenceColumns
DAO - Return reference columns based on field metadata
eileen [Tue, 2 Jan 2024 02:39:50 +0000 (15:39 +1300)]
Fix handling of non-padded month in dd_mon_YY format
eileen [Tue, 2 Jan 2024 01:48:03 +0000 (14:48 +1300)]
Fix time handling for us-style
Add consistent time-format support for US formats, add test for our magic year-handling
Seamus Lee [Tue, 2 Jan 2024 23:52:41 +0000 (10:52 +1100)]
Merge pull request #28842 from MegaphoneJon/price-field-weights
Price field and value weights not respected
Eileen McNaughton [Tue, 2 Jan 2024 23:23:52 +0000 (12:23 +1300)]
Merge pull request #28647 from eileenmcnaughton/delete
Move implementation of financial type acl out of core (leverage existing extension hooks)
Jon Goldberg [Tue, 2 Jan 2024 22:33:27 +0000 (17:33 -0500)]
fix price field and value weights
Eileen McNaughton [Thu, 14 Dec 2023 07:20:25 +0000 (20:20 +1300)]
Remove duplicate check
Eileen McNaughton [Thu, 14 Dec 2023 07:19:44 +0000 (20:19 +1300)]
Do not call core function from extension
Eileen McNaughton [Thu, 14 Dec 2023 07:16:41 +0000 (20:16 +1300)]
Move financial type check from event register page
Eileen McNaughton [Thu, 14 Dec 2023 06:56:35 +0000 (19:56 +1300)]
Move link handling to extension
Eileen McNaughton [Thu, 14 Dec 2023 06:34:15 +0000 (19:34 +1300)]
Move check permissioned line items to acl now it is not used in core
Eileen McNaughton [Thu, 14 Dec 2023 06:09:39 +0000 (19:09 +1300)]
Move implementation of financial type acl out of core (leverage existing extension hooks)
Eileen McNaughton [Tue, 2 Jan 2024 21:47:54 +0000 (10:47 +1300)]
Merge pull request #28668 from colemanw/utilsArrayCollect
REF - Swap CRM_Utils_Array::collect with vanilla array_column
colemanw [Tue, 2 Jan 2024 21:31:55 +0000 (16:31 -0500)]
Merge pull request #28828 from eileenmcnaughton/date_iso
Fix time validation for iso date format
Eileen McNaughton [Tue, 2 Jan 2024 20:36:08 +0000 (09:36 +1300)]
Merge pull request #28834 from colemanw/phpStormGetLinks
[NFC] Add 'getLinks' action to phpStorm extension
Eileen McNaughton [Tue, 2 Jan 2024 20:26:25 +0000 (09:26 +1300)]
Merge pull request #28837 from colemanw/group_notice2
Fix e-notice on contact create for low-permissioned user
Tim Otten [Tue, 2 Jan 2024 19:17:36 +0000 (13:17 -0600)]
Merge pull request #28786 from colemanw/oauthLinks
dev/core#4674 - Add Oauth links for AdminUi MailSettings
colemanw [Tue, 2 Jan 2024 18:44:58 +0000 (13:44 -0500)]
Merge pull request #28838 from spalmstr/Issue_4879
Issue 4879 second attempt
Stephen Palmstrom [Tue, 2 Jan 2024 17:47:22 +0000 (17:47 +0000)]
Following suggested additional changes.
colemanw [Tue, 2 Jan 2024 15:08:53 +0000 (10:08 -0500)]
Fix e-notice on contact create for low-permissioned user
This cleans up some very messy code which was emitting e-notices when the 'group' key was missing.
This can happen when the current user does not have permissions to add contacts to groups.
Stephen Palmstrom [Tue, 2 Jan 2024 14:53:46 +0000 (14:53 +0000)]
Issue 4879
colemanw [Tue, 2 Jan 2024 14:48:58 +0000 (09:48 -0500)]
Merge pull request #28831 from eileenmcnaughton/template_vars_sample
Remove smarty2 functions from sample code
colemanw [Tue, 2 Jan 2024 14:35:56 +0000 (09:35 -0500)]
Merge pull request #28829 from eileenmcnaughton/template_vars
Use getTemplateVars in smarty help function
colemanw [Tue, 2 Jan 2024 14:33:42 +0000 (09:33 -0500)]
Merge pull request #28830 from eileenmcnaughton/template_smarty
Replace getTemplateVars() in test, assignTemplateVariables
colemanw [Tue, 2 Jan 2024 14:29:24 +0000 (09:29 -0500)]
Merge pull request #28621 from artfulrobot/issue-4857
standalone: implement cms-prefixed permissions as concrete ones
colemanw [Tue, 2 Jan 2024 14:18:53 +0000 (09:18 -0500)]
Merge pull request #28833 from artfulrobot/standaloneusers-dependency
Remove missingStandaloneExtension() checks which were pre-alpha scaffold
colemanw [Tue, 2 Jan 2024 14:02:25 +0000 (09:02 -0500)]
Add 'getLinks' action to phpStorm extension
Rich Lott / Artful Robot [Tue, 2 Jan 2024 12:43:18 +0000 (12:43 +0000)]
Remove missingStandaloneExtension() checks which were pre-alpha scaffold
Rich Lott [Tue, 2 Jan 2024 09:33:23 +0000 (09:33 +0000)]
Merge pull request #28784 from mlutfy/floatLeftButton
Merging as no objections
eileen [Tue, 2 Jan 2024 08:31:22 +0000 (21:31 +1300)]
Remove smarty2 functions from sample code
eileen [Tue, 2 Jan 2024 08:24:50 +0000 (21:24 +1300)]
Replace getTemplateVars() in test, assignTemplateVariables
eileen [Tue, 2 Jan 2024 07:56:58 +0000 (20:56 +1300)]
Use getTeplateVars in smarty help function
eileen [Tue, 2 Jan 2024 01:20:17 +0000 (14:20 +1300)]
Combine convertToDefaultDate back into only calling function
It is not a logical separation of concerns & makes code more complex
rather than simpler
eileen [Tue, 2 Jan 2024 01:06:13 +0000 (14:06 +1300)]
Fix time validation for iso date format
As this is a very simple format strtotime will get it right
so we just fix our validation & simplify
Eileen McNaughton [Tue, 2 Jan 2024 06:47:21 +0000 (19:47 +1300)]
Merge pull request #28826 from eileenmcnaughton/act_workflow
Use distinct test workflow message for workflow message tests
eileen [Tue, 2 Jan 2024 05:13:22 +0000 (18:13 +1300)]
Disable check temporily for PR juggling
colemanw [Sat, 23 Dec 2023 15:50:09 +0000 (10:50 -0500)]
dev/core#4674 - Add Oauth links for AdminUi MailSettings
This fixes https://lab.civicrm.org/dev/core/-/issues/4674 by adding a LinksProvider
for the new GetLinks action from #27973.
It uses the CRM_Core_BAO_MailSettings::getSetupActions() function to generate the extra links,
but there is a mismatch between the two functions:
- getSetupActions() returns a fully-formed url
- API::getLinks() returns a path
However, I noticed that while in theory hook_civicrm_mailSetupActions could return various urls,
in practice they are all the same: a generic civicrm/ajax/setupMailAccount redirect.
So this returns that as the path and it works.
Perhaps we should deprecate the option to return a url from hook_civicrm_mailSetupActions
(or just remove it, since it appears to be unused & YAGNI).
colemanw [Tue, 2 Jan 2024 04:30:12 +0000 (23:30 -0500)]
Regenerate Ext DAO files without boilerplate getReferenceColumns()
colemanw [Tue, 2 Jan 2024 04:25:47 +0000 (23:25 -0500)]
Regenerate Core DAO files without boilerplate getReferenceColumns()
colemanw [Tue, 2 Jan 2024 04:24:16 +0000 (23:24 -0500)]
DAO - Return reference columns based on field metadata
This deletes getReferenceColumns() from the DAO boilerplate and adds all the necessary field metadata
so that they can be generated by the parent class.
Eileen McNaughton [Tue, 2 Jan 2024 03:39:09 +0000 (16:39 +1300)]
Merge pull request #27973 from colemanw/getLinks
SearchKit - New getLinks API action for advanced link handling
colemanw [Tue, 2 Jan 2024 03:23:31 +0000 (22:23 -0500)]
Merge pull request #28789 from eileenmcnaughton/message_template
Update `MessageTemplates` generation to work with Smarty3
eileen [Tue, 2 Jan 2024 03:10:58 +0000 (16:10 +1300)]
Use distinct test workflow message for workflow message tests
The tests for the workflow message subsystem use an instance of a test
case_activity template attached the real message workflow template. They
test the text version - meaning that removing it, like we have with
others, causes various fails. In addition adding a real template that
does not match the test version causes mayhem.
In this case we want to ensure we keep all the tests for the subsystem
functionality but undo the tethering to a particular
template to allow that template to have updates without
having to go deep into this code
eileen [Tue, 2 Jan 2024 00:06:19 +0000 (13:06 +1300)]
Extract date regex validation
Eileen McNaughton [Tue, 2 Jan 2024 02:47:28 +0000 (15:47 +1300)]
Merge pull request #28825 from eileenmcnaughton/no_ref
Remove function use of reference
colemanw [Tue, 2 Jan 2024 02:37:13 +0000 (21:37 -0500)]
Merge pull request #28822 from eileenmcnaughton/date_formats_test
Extend date formats being tested
colemanw [Tue, 2 Jan 2024 02:36:43 +0000 (21:36 -0500)]
Merge pull request #28823 from eileenmcnaughton/date_const
Use constants for date formats
colemanw [Tue, 2 Jan 2024 02:34:45 +0000 (21:34 -0500)]
Merge pull request #28556 from eileenmcnaughton/trait_meta
Fully deprecate MetadataTrait
eileen [Tue, 2 Jan 2024 01:50:08 +0000 (14:50 +1300)]
Deprecate passing in month
eileen [Tue, 2 Jan 2024 01:36:54 +0000 (14:36 +1300)]
Remove pass-by-reference
We have removed a bunch of these (added for php4.x support) with no
issues - it's only where there is inheritance we have
hit issues
eileen [Mon, 1 Jan 2024 23:34:25 +0000 (12:34 +1300)]
Use constants for date formats
eileen [Mon, 1 Jan 2024 21:23:03 +0000 (10:23 +1300)]
Extend date formats to be tested
Eileen McNaughton [Mon, 1 Jan 2024 20:55:58 +0000 (09:55 +1300)]
Merge pull request #28821 from eileenmcnaughton/add
Fix error due to merges co-inciding
eileen [Mon, 1 Jan 2024 20:52:45 +0000 (09:52 +1300)]
Fix error due to merges co-inciding
Eileen McNaughton [Mon, 1 Jan 2024 04:51:26 +0000 (17:51 +1300)]
Merge pull request #28808 from colemanw/canAggregate
SearchKit - Allow aggregate functions to be used without GroupBy
Eileen McNaughton [Mon, 1 Jan 2024 03:15:06 +0000 (16:15 +1300)]
Merge pull request #28818 from civicrm/5.69
Merge forward (5.69-rc to master)
Tim Otten [Mon, 1 Jan 2024 02:08:50 +0000 (20:08 -0600)]
Merge pull request #28718 from eileenmcnaughton/2_term
dev/core#3810 dev/core#3339 Fix handling of auto renew memberships where frequency_interval > 1
Eileen McNaughton [Mon, 1 Jan 2024 01:22:48 +0000 (14:22 +1300)]
Merge pull request #28811 from colemanw/searchDisplayRemoveColFix
SearchKit - Fix wrong column being removed from displays
Eileen McNaughton [Mon, 1 Jan 2024 00:29:42 +0000 (13:29 +1300)]
Merge pull request #28812 from colemanw/removeContactTypeField
APIv4 - Hide 'contact_type' from Individual,Organization,Household getFields
Eileen McNaughton [Sun, 31 Dec 2023 23:59:14 +0000 (12:59 +1300)]
Merge pull request #28783 from braders/php8-last-participant
[REF][PHP8.2] Declare _lastParticipant property
Eileen McNaughton [Sun, 31 Dec 2023 23:58:53 +0000 (12:58 +1300)]
Merge pull request #28815 from braders/event-additional-particiapant-properties
[REF][PHP8.2] Declare missing properties on CRM_Event_Form_Registration_AdditionalParticipant
colemanw [Sun, 31 Dec 2023 13:48:52 +0000 (08:48 -0500)]
Merge pull request #28775 from seamuslee001/dev_core_4841
dev/core#4841 Ensure that APIv4 have same default values which ensureā¦
Seamus Lee [Sun, 31 Dec 2023 05:37:57 +0000 (16:37 +1100)]
Merge pull request #28816 from braders/php8-discounts
[REF][PHP8.2] Cleanup discounts property in eventcart ext
Seamus Lee [Fri, 22 Dec 2023 00:50:49 +0000 (11:50 +1100)]
dev/core#4841 Ensure that APIv4 have same default values which ensures that all required selects are filled out when creating new bulk mailing from Search Kit
Update as per coleman and fix Test fails
Fix calls to defaultComponent to fix test fails
colemanw [Sat, 30 Dec 2023 22:45:43 +0000 (17:45 -0500)]
Merge pull request #28730 from eileenmcnaughton/recur_cancel_api_2
Stop bypassing hooks on ContributionRecur.cancel
Bradley Taylor [Sat, 30 Dec 2023 20:16:42 +0000 (20:16 +0000)]
[REF][PHP8.2] Cleanup discounts property in eventcart ext
Bradley Taylor [Sat, 30 Dec 2023 18:17:50 +0000 (18:17 +0000)]
[REF][PHP8.2] Declare missing properties on CRM_Event_Form_Registration_AdditionalParticipant
colemanw [Sat, 30 Dec 2023 15:58:44 +0000 (09:58 -0600)]
APIv4 - Remove 'contact_type' from Individual,Organization,Household
This field is irrelevant to these pseudo-entities and shouldn't need to be used at all.
Before: Creating a new SearchKit search for Individual includes Contact Type in the default columns.
After: Now it doesn't, and the field is completely hidden for all but the Contact entity.
colemanw [Sat, 30 Dec 2023 16:16:44 +0000 (10:16 -0600)]
Merge pull request #28799 from eileenmcnaughton/date_consolidate
Consolidate import date handling
colemanw [Sat, 30 Dec 2023 16:11:25 +0000 (10:11 -0600)]
Merge pull request #28753 from eileenmcnaughton/search_settings
Clean up search settings page, update group cache text
colemanw [Sat, 30 Dec 2023 16:05:29 +0000 (10:05 -0600)]
Merge pull request #28748 from eileenmcnaughton/dep
Bubble up deprecation if getVar used to get a deprecated property
colemanw [Sat, 30 Dec 2023 03:06:37 +0000 (21:06 -0600)]
Merge pull request #28814 from MegaphoneJon/anonymous-acl-cache
Don't try to insert 0 as a user_id to ACL contact cache
demeritcowboy [Fri, 29 Dec 2023 23:05:54 +0000 (18:05 -0500)]
Merge pull request #28813 from colemanw/deletePhantomJsPolyfill
Remove unused phantomjs-polyfill package
colemanw [Fri, 29 Dec 2023 21:00:05 +0000 (15:00 -0600)]
Remove unused phantomjs-polyfill package
As of
23051b6 we no longer use PhantomJS so this package should not be needed.
Jon Goldberg [Fri, 29 Dec 2023 21:05:49 +0000 (16:05 -0500)]
Don't try to insert 0 as a user_id to ACL contact cache
colemanw [Fri, 29 Dec 2023 20:24:32 +0000 (14:24 -0600)]
SearchKit - Fix wrong column being removed from displays
Fixes recent regression from
4099cd6 causing the wrong column to be removed from a display.
To reproduce: Create a search display, go back to the main search criteria and delete a column,
then tab back to the display. The deleted column should have been removed but instead the wrong
one is still there.
Yashodha Chaku [Fri, 29 Dec 2023 17:22:46 +0000 (22:52 +0530)]
Merge pull request #28776 from eileenmcnaughton/submit
Remove api annotation from getSubmittableFields()
Eileen McNaughton [Fri, 29 Dec 2023 03:44:16 +0000 (16:44 +1300)]
Merge pull request #28809 from civicrm/5.69
5.69 to master