civicrm-core.git
11 months agoMerge pull request #28703 from eileenmcnaughton/declarations
Eileen McNaughton [Mon, 18 Dec 2023 20:28:24 +0000 (09:28 +1300)]
Merge pull request #28703 from eileenmcnaughton/declarations

Remove parent-declared properties

11 months agoRemove parent-declared properties
Eileen McNaughton [Mon, 18 Dec 2023 19:37:23 +0000 (08:37 +1300)]
Remove parent-declared properties

11 months agoMerge pull request #28697 from eileenmcnaughton/ignore
Eileen McNaughton [Mon, 18 Dec 2023 19:32:11 +0000 (08:32 +1300)]
Merge pull request #28697 from eileenmcnaughton/ignore

Stop ignoring tests when apiv4 function does not exist

11 months agoMerge pull request #28666 from colemanw/daoCleanup
Eileen McNaughton [Mon, 18 Dec 2023 19:03:10 +0000 (08:03 +1300)]
Merge pull request #28666 from colemanw/daoCleanup

DAO - Remove fieldKeys(), getLog() and getTableName()

11 months agoStop ignoring tests when apiv4 function does not exist
Eileen McNaughton [Mon, 18 Dec 2023 12:50:08 +0000 (01:50 +1300)]
Stop ignoring tests when apiv4 function does not exist

11 months agoMerge pull request #28698 from civicrm/5.69
demeritcowboy [Mon, 18 Dec 2023 16:01:25 +0000 (11:01 -0500)]
Merge pull request #28698 from civicrm/5.69

5.69

11 months agoMerge pull request #28696 from eileenmcnaughton/notice_processor
demeritcowboy [Mon, 18 Dec 2023 14:52:53 +0000 (09:52 -0500)]
Merge pull request #28696 from eileenmcnaughton/notice_processor

Address payment processor notice in thankyou.tpl

11 months agoAddress payment processor notice in thankyou .tpl
Eileen McNaughton [Mon, 18 Dec 2023 12:22:56 +0000 (01:22 +1300)]
Address payment processor notice in thankyou .tpl

11 months agoMerge pull request #28676 from eileenmcnaughton/init
Matthew Wire [Mon, 18 Dec 2023 11:48:25 +0000 (11:48 +0000)]
Merge pull request #28676 from eileenmcnaughton/init

Remove deprecated function `initSet`

11 months agoMerge pull request #28678 from eileenmcnaughton/init_less
Matthew Wire [Mon, 18 Dec 2023 11:42:51 +0000 (11:42 +0000)]
Merge pull request #28678 from eileenmcnaughton/init_less

Stop setting front-end values in back office form

11 months agoMerge pull request #28652 from eileenmcnaughton/update_2
Matthew Wire [Mon, 18 Dec 2023 11:41:22 +0000 (11:41 +0000)]
Merge pull request #28652 from eileenmcnaughton/update_2

Standardise fetching of variables on recur management screens

11 months agoMerge pull request #28692 from eileenmcnaughton/frequent_test_2
Matthew Wire [Mon, 18 Dec 2023 11:39:24 +0000 (11:39 +0000)]
Merge pull request #28692 from eileenmcnaughton/frequent_test_2

Move ContributionPage test to ConfirmTest class

11 months agoMove ContributionPage test to ConfirmTest class
Eileen McNaughton [Mon, 18 Dec 2023 06:25:40 +0000 (19:25 +1300)]
Move ContributionPage test to ConfirmTest class

11 months agoMerge pull request #28687 from eileenmcnaughton/status
Eileen McNaughton [Mon, 18 Dec 2023 06:29:11 +0000 (19:29 +1300)]
Merge pull request #28687 from eileenmcnaughton/status

Stop comparing status_id with membership type in test

11 months agoMinor params cleanup in test
Eileen McNaughton [Mon, 18 Dec 2023 06:02:56 +0000 (19:02 +1300)]
Minor params cleanup in test

11 months agoStop comparing status_id with membership type in test
Eileen McNaughton [Mon, 18 Dec 2023 01:10:40 +0000 (14:10 +1300)]
Stop comparing status_id with membership type in test

11 months agoMerge pull request #28691 from seamuslee001/package_lock
Seamus Lee [Mon, 18 Dec 2023 04:19:38 +0000 (15:19 +1100)]
Merge pull request #28691 from seamuslee001/package_lock

Update package lock for newer npm versions

11 months agoMerge pull request #28690 from seamuslee001/master
Seamus Lee [Mon, 18 Dec 2023 03:12:11 +0000 (14:12 +1100)]
Merge pull request #28690 from seamuslee001/master

5.69

11 months agoUpdate package lock for newer npm versions
Seamus Lee [Mon, 18 Dec 2023 03:11:40 +0000 (14:11 +1100)]
Update package lock for newer npm versions

11 months agoMerge branch '5.69'
Seamus Lee [Mon, 18 Dec 2023 03:10:09 +0000 (14:10 +1100)]
Merge branch '5.69'

11 months agoMerge pull request #28674 from eileenmcnaughton/test_up
colemanw [Mon, 18 Dec 2023 03:03:07 +0000 (22:03 -0500)]
Merge pull request #28674 from eileenmcnaughton/test_up

Test update - use apiv4 to set up for test

11 months agoMerge pull request #28677 from demeritcowboy/extcrash
Seamus Lee [Mon, 18 Dec 2023 03:02:12 +0000 (14:02 +1100)]
Merge pull request #28677 from demeritcowboy/extcrash

dev/core#4867 - Crash if you try to enable civicase or civicampaign from the extensions screen

11 months agoMerge pull request #28681 from eileenmcnaughton/explode
demeritcowboy [Mon, 18 Dec 2023 02:32:52 +0000 (21:32 -0500)]
Merge pull request #28681 from eileenmcnaughton/explode

dev/core#4866 tag search fix

11 months agoregen
demeritcowboy [Sun, 17 Dec 2023 20:12:47 +0000 (15:12 -0500)]
regen

11 months agomissing extensions
demeritcowboy [Sun, 17 Dec 2023 20:07:08 +0000 (15:07 -0500)]
missing extensions

11 months agoFix tests to more standard setup method
Eileen McNaughton [Sun, 17 Dec 2023 22:20:33 +0000 (11:20 +1300)]
Fix tests to more standard setup method

11 months agoMerge pull request #28685 from civicrm/5.69
Eileen McNaughton [Sun, 17 Dec 2023 23:25:02 +0000 (12:25 +1300)]
Merge pull request #28685 from civicrm/5.69

5.69

11 months agoStop setting front-end values in back office form
Eileen McNaughton [Sun, 17 Dec 2023 20:20:43 +0000 (09:20 +1300)]
Stop setting front-end values in back office form

These values are only used in the front end validatePriceSet which is not called from the back office form

11 months agoMinor test simplification
Eileen McNaughton [Sun, 17 Dec 2023 22:02:49 +0000 (11:02 +1300)]
Minor test simplification

11 months agoMerge pull request #28294 from eileenmcnaughton/currency_notice
Seamus Lee [Sun, 17 Dec 2023 22:30:25 +0000 (09:30 +1100)]
Merge pull request #28294 from eileenmcnaughton/currency_notice

Fix tax on other_amount, treat as inclusive of tax

11 months agoMerge pull request #28682 from eileenmcnaughton/build_form
Eileen McNaughton [Sun, 17 Dec 2023 22:14:54 +0000 (11:14 +1300)]
Merge pull request #28682 from eileenmcnaughton/build_form

Set formBuilt to TRUE when, erm, it is built

11 months agoMerge pull request #28679 from eileenmcnaughton/no_fee_block
Eileen McNaughton [Sun, 17 Dec 2023 21:40:24 +0000 (10:40 +1300)]
Merge pull request #28679 from eileenmcnaughton/no_fee_block

Replace undeclared property with local variable

11 months agoMerge pull request #28683 from civicrm/5.69
Eileen McNaughton [Sun, 17 Dec 2023 21:02:13 +0000 (10:02 +1300)]
Merge pull request #28683 from civicrm/5.69

5.69

11 months agoMerge pull request #28658 from eileenmcnaughton/payment
colemanw [Sun, 17 Dec 2023 20:56:40 +0000 (15:56 -0500)]
Merge pull request #28658 from eileenmcnaughton/payment

Fix amount not getting passed through in simple contribution flow

11 months agoMerge pull request #28675 from eileenmcnaughton/tests-
Seamus Lee [Sun, 17 Dec 2023 20:50:47 +0000 (07:50 +1100)]
Merge pull request #28675 from eileenmcnaughton/tests-

Minor variable standardisation in test

11 months agoSet formBuilt to TRUE when, erm, it is built
Eileen McNaughton [Sun, 17 Dec 2023 20:45:11 +0000 (09:45 +1300)]
Set formBuilt to TRUE when, erm, it is built

11 months agodev/core#4866 tag search fix
Eileen McNaughton [Sun, 17 Dec 2023 20:35:09 +0000 (09:35 +1300)]
dev/core#4866 tag search fix

11 months agoReplace undeclared property with local variable
Eileen McNaughton [Sun, 17 Dec 2023 20:28:15 +0000 (09:28 +1300)]
Replace undeclared property with local variable

11 months agoRemove deprecated function initSet
Eileen McNaughton [Sun, 17 Dec 2023 20:14:51 +0000 (09:14 +1300)]
Remove deprecated function initSet

11 months agoMinor variable standardisation in test
Eileen McNaughton [Sun, 17 Dec 2023 20:05:54 +0000 (09:05 +1300)]
Minor variable standardisation in test

11 months agoTest update - use apiv4 to set up for test
Eileen McNaughton [Sun, 17 Dec 2023 06:17:15 +0000 (19:17 +1300)]
Test update - use apiv4 to set up for test

11 months agoMerge pull request #28464 from seamuslee001/line_item_crm_type
Eileen McNaughton [Sun, 17 Dec 2023 05:28:56 +0000 (18:28 +1300)]
Merge pull request #28464 from seamuslee001/line_item_crm_type

[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money a…

11 months agoMerge pull request #28671 from eileenmcnaughton/test_cleanup_fix
Seamus Lee [Sat, 16 Dec 2023 23:56:49 +0000 (10:56 +1100)]
Merge pull request #28671 from eileenmcnaughton/test_cleanup_fix

Cleanup membership Types in test

11 months agoCleanup membership Types
Eileen McNaughton [Sat, 16 Dec 2023 22:22:36 +0000 (11:22 +1300)]
Cleanup membership Types

11 months agoFix tests to test-template-data-update
Eileen McNaughton [Sat, 16 Dec 2023 21:33:47 +0000 (10:33 +1300)]
Fix tests to test-template-data-update

11 months agoMerge pull request #28669 from demeritcowboy/context-php8
Eileen McNaughton [Sat, 16 Dec 2023 21:34:44 +0000 (10:34 +1300)]
Merge pull request #28669 from demeritcowboy/context-php8

[PHP8] Remove unneeded $this->_context in Case_Page_Tab

11 months agoStandardise fetching of entity variables on recur management forms
Eileen McNaughton [Thu, 14 Dec 2023 10:53:31 +0000 (23:53 +1300)]
Standardise fetching of entity variables on recur management forms

11 months agodoes nothing
demeritcowboy [Sat, 16 Dec 2023 20:01:08 +0000 (15:01 -0500)]
does nothing

11 months agoMerge pull request #28667 from civicrm/5.69
demeritcowboy [Sat, 16 Dec 2023 13:46:10 +0000 (08:46 -0500)]
Merge pull request #28667 from civicrm/5.69

5.69

11 months agoMerge pull request #28665 from vingle/patch-19
demeritcowboy [Sat, 16 Dec 2023 01:38:46 +0000 (20:38 -0500)]
Merge pull request #28665 from vingle/patch-19

Fixes two advanced search accordions UX regressions

11 months agoExt- Regenerate DAO files without fieldKeys(), getLog() and getTableName().
colemanw [Sat, 16 Dec 2023 00:27:16 +0000 (19:27 -0500)]
Ext- Regenerate DAO files without fieldKeys(), getLog() and getTableName().

Per 9d89b14 these functions are redundant with the parent class.

11 months agoCore - Regenerate DAO files without fieldKeys(), getLog() and getTableName().
colemanw [Sat, 16 Dec 2023 00:17:02 +0000 (19:17 -0500)]
Core - Regenerate DAO files without fieldKeys(), getLog() and getTableName().

Per 9d89b14 these functions are redundant with the parent class.

11 months agoDAO - Remove fieldKeys(), getLog() and getTableName() from template
colemanw [Sat, 16 Dec 2023 00:06:12 +0000 (19:06 -0500)]
DAO - Remove fieldKeys(), getLog() and getTableName() from template

In 2020, 9d89b14 added these functions to the base class, effectively making them redundant in the generated DAO files.
But out of an abundance of caution, they were not immediatetly removed from the DAO template.
This was so that extensions that generate DAOs with civix (which uses the same template from core) would
not immediately lose backward-compat with prior versions of Civi.
At this point enough time has gone by. The functions were added to 5.31 which is quite a few ESR-releases old now.
Any extension wishing to generate DAO files compatible with versions < 5.31 can do so by using an older version of core
when running civix:generate.

11 months agoFixes two UX regressions
Nicol [Sat, 16 Dec 2023 00:18:49 +0000 (00:18 +0000)]
Fixes two UX regressions

https://lab.civicrm.org/dev/core/-/issues/4856

11 months agoMerge pull request #28664 from demeritcowboy/regen
Seamus Lee [Fri, 15 Dec 2023 23:44:09 +0000 (10:44 +1100)]
Merge pull request #28664 from demeritcowboy/regen

regen after 28633

11 months agoMerge pull request #28663 from civicrm/5.69
demeritcowboy [Fri, 15 Dec 2023 23:09:40 +0000 (18:09 -0500)]
Merge pull request #28663 from civicrm/5.69

5.69

11 months agoregen
demeritcowboy [Fri, 15 Dec 2023 23:03:02 +0000 (18:03 -0500)]
regen

11 months agoMerge pull request #28633 from eileenmcnaughton/no_text_
demeritcowboy [Fri, 15 Dec 2023 22:57:44 +0000 (17:57 -0500)]
Merge pull request #28633 from eileenmcnaughton/no_text_

Remove the text versions of a few more template

11 months agoMerge pull request #28661 from vingle/patch-15
demeritcowboy [Fri, 15 Dec 2023 22:36:48 +0000 (17:36 -0500)]
Merge pull request #28661 from vingle/patch-15

Advanced search UX regression - collapses search criteria when there's results

11 months agoMerge pull request #28442 from colemanw/metadataFlush
colemanw [Fri, 15 Dec 2023 21:50:55 +0000 (16:50 -0500)]
Merge pull request #28442 from colemanw/metadataFlush

Metadata - Refresh clientside resources when clearing cache

11 months agoCache - Use service name
colemanw [Sun, 3 Dec 2023 16:20:07 +0000 (16:20 +0000)]
Cache - Use service name

11 months agoUpdate templates/CRM/Contact/Form/Search/Advanced.tpl
Nicol [Fri, 15 Dec 2023 17:21:01 +0000 (17:21 +0000)]
Update templates/CRM/Contact/Form/Search/Advanced.tpl

Simpler syntax

Co-authored-by: colemanw <coleman@civicrm.org>
11 months agoAdvanced search UX regression - collapses search criteria when there's results
Nicol [Fri, 15 Dec 2023 16:26:33 +0000 (16:26 +0000)]
Advanced search UX regression - collapses search criteria when there's results

Old UX of collapsing search criteria when there's results was lost during recent markup changes. This restores that.

11 months agoMerge pull request #28523 from jaapjansma/role_permission_ui
Rich Lott [Fri, 15 Dec 2023 11:31:33 +0000 (11:31 +0000)]
Merge pull request #28523 from jaapjansma/role_permission_ui

dev/core#4835 Standalone Permissions user interface

11 months agoMerge pull request #28654 from eileenmcnaughton/build_back
Matthew Wire [Fri, 15 Dec 2023 10:08:59 +0000 (10:08 +0000)]
Merge pull request #28654 from eileenmcnaughton/build_back

Remove front-end-only optionFullIds handling from back office form

11 months agoMerge pull request #28651 from eileenmcnaughton/update
Matthew Wire [Fri, 15 Dec 2023 10:08:03 +0000 (10:08 +0000)]
Merge pull request #28651 from eileenmcnaughton/update

Update updateSubscriptionTest to use`FormTestTrait`

11 months agoMerge pull request #28476 from AlainBenbassat/searchkit_manage_events
Seamus Lee [Fri, 15 Dec 2023 06:16:58 +0000 (17:16 +1100)]
Merge pull request #28476 from AlainBenbassat/searchkit_manage_events

adds Manage Events

11 months agoMerge pull request #28466 from artfulrobot/artfulrobot-ang-href-attr
Seamus Lee [Fri, 15 Dec 2023 06:16:21 +0000 (17:16 +1100)]
Merge pull request #28466 from artfulrobot/artfulrobot-ang-href-attr

Fix missing blank href attr on <a> links in searchkit angular

11 months agoMerge pull request #28660 from colemanw/relationshipCacheStatusCheck
Seamus Lee [Fri, 15 Dec 2023 06:15:46 +0000 (17:15 +1100)]
Merge pull request #28660 from colemanw/relationshipCacheStatusCheck

RelationshipCache - Add status check to ensure cache table is up-to-date

11 months ago[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money as this field...
Seamus Lee [Mon, 4 Dec 2023 05:04:31 +0000 (16:04 +1100)]
[REF] Change LineItem.qty to be CRM type of FLOAT rather than Money as this field needs decimals but not to have $ added

11 months agoRelationshipCache - Add status check to ensure cache table is up-to-date
colemanw [Fri, 15 Dec 2023 01:47:58 +0000 (20:47 -0500)]
RelationshipCache - Add status check to ensure cache table is up-to-date

11 months agoMerge pull request #28656 from eileenmcnaughton/update_3
Seamus Lee [Thu, 14 Dec 2023 23:03:33 +0000 (10:03 +1100)]
Merge pull request #28656 from eileenmcnaughton/update_3

Add standardised form get traits

11 months agoMerge pull request #28657 from eileenmcnaughton/part_formy
colemanw [Thu, 14 Dec 2023 22:20:21 +0000 (17:20 -0500)]
Merge pull request #28657 from eileenmcnaughton/part_formy

Unshare init event fee

11 months agoAdd check for mis-formatted amount
Eileen McNaughton [Thu, 14 Dec 2023 20:56:04 +0000 (09:56 +1300)]
Add check for mis-formatted amount

11 months agofix comment
Eileen McNaughton [Thu, 14 Dec 2023 21:55:09 +0000 (10:55 +1300)]
fix comment

11 months agoFix amount not getting passed through in simple contribution flow
Eileen McNaughton [Thu, 14 Dec 2023 20:34:04 +0000 (09:34 +1300)]
Fix amount not getting passed through in simple contribution flow

11 months agoUnshare init event fee
Eileen McNaughton [Thu, 14 Dec 2023 19:59:07 +0000 (08:59 +1300)]
Unshare init event fee

11 months agoMerge pull request #28649 from eileenmcnaughton/remove
colemanw [Thu, 14 Dec 2023 19:40:08 +0000 (14:40 -0500)]
Merge pull request #28649 from eileenmcnaughton/remove

Remove extraneous call to check financial acl

11 months agoAdd standardised for get traits
Eileen McNaughton [Thu, 14 Dec 2023 19:28:33 +0000 (08:28 +1300)]
Add standardised for get traits

11 months agoMerge pull request #28655 from civicrm/5.69
Eileen McNaughton [Thu, 14 Dec 2023 19:23:17 +0000 (08:23 +1300)]
Merge pull request #28655 from civicrm/5.69

5.69 to master

11 months agoRemove front-end-only optionFullIds variable
Eileen McNaughton [Thu, 14 Dec 2023 05:24:46 +0000 (18:24 +1300)]
Remove front-end-only optionFullIds variable

11 months agoMerge pull request #28445 from colemanw/superAdmin
Tim Otten [Thu, 14 Dec 2023 17:43:44 +0000 (09:43 -0800)]
Merge pull request #28445 from colemanw/superAdmin

APIv4 - Super-admins don't always have access to everything

11 months agoMerge pull request #28588 from mlutfy/checklist
Matthew Wire [Thu, 14 Dec 2023 12:15:48 +0000 (12:15 +0000)]
Merge pull request #28588 from mlutfy/checklist

ConfigTaskList: a few language tweaks and add reference to CiviCRM themes

11 months agoMerge pull request #28646 from eileenmcnaughton/build_back
Matthew Wire [Thu, 14 Dec 2023 12:09:05 +0000 (12:09 +0000)]
Merge pull request #28646 from eileenmcnaughton/build_back

Unshare `buildAmount` block functions from front_end form

11 months agoMerge pull request #28648 from eileenmcnaughton/notice_tasks
Matthew Wire [Thu, 14 Dec 2023 12:08:21 +0000 (12:08 +0000)]
Merge pull request #28648 from eileenmcnaughton/notice_tasks

Fix notices on tasks for less permissioned user

11 months agoMerge pull request #28645 from eileenmcnaughton/params
Matthew Wire [Thu, 14 Dec 2023 12:07:58 +0000 (12:07 +0000)]
Merge pull request #28645 from eileenmcnaughton/params

[php8.x] Fully remove interaction with `_params` from backoffice participant form

11 months agoMerge pull request #28640 from eileenmcnaughton/tax
Matthew Wire [Thu, 14 Dec 2023 12:07:26 +0000 (12:07 +0000)]
Merge pull request #28640 from eileenmcnaughton/tax

Use local array for tax_amount

11 months agoMerge pull request #28650 from eileenmcnaughton/regress
Matthew Wire [Thu, 14 Dec 2023 12:06:45 +0000 (12:06 +0000)]
Merge pull request #28650 from eileenmcnaughton/regress

Fix rc-only regression where submitting back office contribution with a price set selected fatals

11 months agoUpdate updateSubscriptionTest to use FormTestTrait
Eileen McNaughton [Thu, 14 Dec 2023 10:42:08 +0000 (23:42 +1300)]
Update updateSubscriptionTest to use FormTestTrait

11 months agoRemove the text versions of a few more template
Eileen McNaughton [Wed, 13 Dec 2023 01:58:50 +0000 (14:58 +1300)]
Remove the text versions of a few more template

We have done a few of the most common ones. These are all lest common
ones, but could still cause formatting changes in the text version,
requiring a dual to the death with jenkins

11 months agoFully remove interaction with _params from participant form
Eileen McNaughton [Thu, 14 Dec 2023 03:33:51 +0000 (16:33 +1300)]
Fully remove interaction with _params from participant form

This removes the last places _params was accessed & adds a __get for any external access to it

Note this also removes the expiry date from the template. I can't find
the discussion we had about this (maybe on chat) but it was generally agreed that
since we hadn't added a column for this in the DB it made sense to exclude from
the template (as the template should be the same however it is sent).
There was some difference of opinion about whether it should have
stored in the DB though

11 months agoFix regression where submitting back office contribution with a price set selected...
Eileen McNaughton [Thu, 14 Dec 2023 09:33:36 +0000 (22:33 +1300)]
Fix regression where submitting back office contribution with a price set selected fatals

11 months agoRemove extraneous call to check financial acl
Eileen McNaughton [Thu, 14 Dec 2023 07:45:30 +0000 (20:45 +1300)]
Remove extraneous call to check financial acl

BuildAmount hook already does this

11 months agoFix notices on tasks for less permissioned user
Eileen McNaughton [Thu, 14 Dec 2023 07:05:51 +0000 (20:05 +1300)]
Fix notices on tasks for less permissioned user

11 months agoRemove front-end-only optionFullIds variable
Eileen McNaughton [Thu, 14 Dec 2023 05:24:46 +0000 (18:24 +1300)]
Remove front-end-only optionFullIds variable

11 months agoRemove code relating to front-end-only allowConfirmation property
Eileen McNaughton [Thu, 14 Dec 2023 05:23:20 +0000 (18:23 +1300)]
Remove code relating to front-end-only allowConfirmation property

11 months agoUnshare buildAmount block functions from front_end form
Eileen McNaughton [Thu, 14 Dec 2023 05:14:29 +0000 (18:14 +1300)]
Unshare buildAmount block functions from front_end form

Sharing these functions complicates rather than simplifies

11 months agoRemove invalid tax_amount setting
Eileen McNaughton [Wed, 13 Dec 2023 20:47:49 +0000 (09:47 +1300)]
Remove invalid tax_amount setting

11 months agoMerge pull request #28644 from seamuslee001/master
Seamus Lee [Thu, 14 Dec 2023 00:47:20 +0000 (11:47 +1100)]
Merge pull request #28644 from seamuslee001/master

5.69

11 months agoMerge branch '5.69'
Seamus Lee [Thu, 14 Dec 2023 00:44:40 +0000 (11:44 +1100)]
Merge branch '5.69'