Commit Graph

27724 Commits

Author SHA1 Message Date
Adria Navarro 185a3462b5 Fix tsconfig paths 2024-08-06 09:11:34 +02:00
Adria Navarro b9c1aa05b0 Add todo for types 2024-08-06 09:10:41 +02:00
Adria Navarro 1e6bb7ebd7 Fix build on view search 2024-08-06 08:15:30 +02:00
Adria Navarro 98d9f52f66 Fix shared-core build 2024-08-06 08:09:20 +02:00
Andrew Kingston 5071f39153
Lint 2024-08-05 19:45:10 +01:00
Andrew Kingston 5127a90e5d
Remove old code 2024-08-05 19:42:24 +01:00
Andrew Kingston e58f34ef8c
Merge branch 'master' into grid-layout-improved 2024-08-05 19:34:01 +01:00
Andrew Kingston 5101cca197
Update default grid size to 200x200 2024-08-05 19:31:35 +01:00
Andrew Kingston e91607acb1
Update background colour and styles of grid lines to work with user specified background colours 2024-08-05 18:50:19 +01:00
Sam Rose 879552d298
Fix account-portal server tests. 2024-08-05 17:27:03 +01:00
Sam Rose da74441c1c
Merge branch 'master' of github.com:budibase/budibase into budi-8483-consolidate-feature-flags-into-a-single-endpoint 2024-08-05 17:11:23 +01:00
Dean 8279a0b31c Merge remote-tracking branch 'origin/master' into dean-fixes 2024-08-05 17:05:12 +01:00
Dean e3f021aea1 Added single user validation config so user fields display as set when bindings are used. 2024-08-05 17:05:09 +01:00
Andrew Kingston 22cda514b4
Update component settings bar to respect dependsOn metadata 2024-08-05 16:53:10 +01:00
Andrew Kingston c6cb267b30
Fix settings bar values not working with default values 2024-08-05 16:42:34 +01:00
mike12345567 48ddc059af Bumping google-spreadsheet version to latest version with fix added by Dean. 2024-08-05 16:38:21 +01:00
Adria Navarro 58162410ea Fix merge conflicts 2024-08-05 17:32:40 +02:00
Adria Navarro 9743aca715
Merge branch 'master' into BUDI-8508/sql-support-for-logical-operators 2024-08-05 17:28:58 +02:00
Adria Navarro c845db966f Fix prefixes for SQS 2024-08-05 17:25:17 +02:00
Adria Navarro 1cd3347262 Types 2024-08-05 17:23:55 +02:00
Adria Navarro 0b5eb9f21c Run tests for all sql 2024-08-05 17:19:14 +02:00
Sam Rose 7f49f87f27
Oracle fix PR comments. 2024-08-05 16:15:15 +01:00
Adria Navarro ebca381e9b Nested $and's and $or's test 2024-08-05 15:09:33 +02:00
Sam Rose 6c79f3410c
Merge branch 'master' of github.com:budibase/budibase into test-oracle 2024-08-05 14:08:26 +01:00
Sam Rose 7fe0e31883
Fix sql.spec.ts 2024-08-05 14:08:07 +01:00
Andrew Kingston e3f4e5525e
Fix background color on grid underlay and ensure screens with grids default to 24x24 2024-08-05 13:34:38 +01:00
melohagan f07ebc18db
Make sure to delete SSO ID doc as well (#14307) 2024-08-05 12:54:36 +01:00
Sam Rose 2efa8dfca2
Fix lint. 2024-08-05 12:10:03 +01:00
Sam Rose eecd521a8a
Fix generic-sql.spec.ts 2024-08-05 12:05:42 +01:00
Adria Navarro 940a080e18 Run only for external 2024-08-05 12:35:09 +02:00
Adria Navarro 2e23a0e4ce Implement SQL and/or 2024-08-05 12:33:44 +02:00
deanhannigan b440f8d532
Merge branch 'master' into dean-fixes 2024-08-05 11:25:43 +01:00
Adria Navarro 47de3f0c53 Add or tests 2024-08-05 11:07:37 +02:00
Dean 2b9298963f Assorted builder fixes and a fix for Google sheets filtering 2024-08-05 09:57:27 +01:00
Adria Navarro ff0bee5974 Add tests 2024-08-05 10:55:56 +02:00
Adria Navarro 4799e0c2c4 Add extra typings 2024-08-05 10:29:36 +02:00
Andrew Kingston 1ff0c99764
Fix component preview border in tablet and mobile when on small screens 2024-08-03 11:21:56 +01:00
Andrew Kingston 4bdb408a39
Add reactivity to settings bar grid style buttons 2024-08-03 11:15:10 +01:00
Andrew Kingston 8a6d4c0bf6
Update remaining components with sizes and grid metadata 2024-08-03 09:44:32 +01:00
Sam Rose 165e368a24
Add Oracle to viewV2.spec.ts 2024-08-02 17:22:18 +01:00
Sam Rose 1ce5b53409
Add Oracle to executeQuery.spec.ts 2024-08-02 17:20:52 +01:00
Sam Rose bc797238aa
row.spec.ts passing in full 2024-08-02 17:17:33 +01:00
Sam Rose 2671b9d5ef
More row.spec.ts fixes. 2024-08-02 16:58:12 +01:00
Andrew Kingston 1bce9855d0
More improvements 2024-08-02 16:44:18 +01:00
Andrew Kingston 0ba00a5117
Move most grid specific logic into a dedicated file to avoid polluting rest of the codebase 2024-08-02 16:13:49 +01:00
Sam Rose 7ab442eae7
Merge master. 2024-08-02 15:29:48 +01:00
mike12345567 661fc361a0 Refactoring search SDK to make it obvious the different search methods, exports was using lucene always when doing internal export rows which shouldn't be the case, should go through the complete search SDK. 2024-08-02 15:01:33 +01:00
Michael Drury c443ad5d5b
Merge branch 'master' into fix/sql-pagination-fixes 2024-08-02 13:21:22 +01:00
Adria Navarro d8f55498ad Treat bigint as string 2024-08-02 13:44:20 +02:00
Adria Navarro e8e4f064a5 Fix invalid 2024-08-02 13:14:33 +02:00
Adria Navarro cd1a7699b2 Fix schema require checks 2024-08-02 13:12:47 +02:00
Adria Navarro 616b1bf012 Add and fix table tests 2024-08-02 13:02:18 +02:00
Adria Navarro a7c8009e09 Fix csv checks 2024-08-02 13:02:18 +02:00
Adria Navarro 0dce3aa02c Add structures.fullSchemaWithoutLinks 2024-08-02 13:02:18 +02:00
Adria Navarro e1ace85248 Fix schema parser 2024-08-02 13:02:18 +02:00
Adria Navarro 02d6458ac8 Improve test 2024-08-02 13:02:18 +02:00
Adria Navarro b1f9325987 Add tests 2024-08-02 13:02:18 +02:00
Adria Navarro f3c18b87b1 Expose csvToJson test utils 2024-08-02 13:02:18 +02:00
Adria Navarro 8afb1e6c42 Allow format on exportRows test utils 2024-08-02 13:02:18 +02:00
Sam Rose 84020be98e
Merge branch 'master' of github.com:budibase/budibase into test-oracle 2024-08-02 11:20:19 +01:00
Sam Rose f23f479eb9
Fix autocolumn detection on schema import. 2024-08-02 11:17:38 +01:00
Sam Rose 5c490dbe70
Merge branch 'master' into node-fetch-mockectomy-2 2024-08-02 11:07:48 +01:00
Sam Rose 40e886b34d
Merge branch 'master' of github.com:budibase/budibase into test-oracle 2024-08-02 10:48:14 +01:00
Sam Rose 8d22df3a8a
Merge branch 'master' into node-fetch-mockectomy 2024-08-02 10:41:48 +01:00
Andrew Kingston dbfad2cb3a
Fix tag component being totally broken 2024-08-02 10:35:35 +01:00
Andrew Kingston 2bc4d3a6da
Improve more component compatibility with grid layouts 2024-08-02 10:00:49 +01:00
Andrew Kingston 3630c73837
Fix flashing of missing component settings panel when deleting components 2024-08-02 09:40:12 +01:00
Andrew Kingston 8dd0658f18
Fix component autosizing not working on mobile grids 2024-08-02 09:23:47 +01:00
Andrew Kingston 5cc4002f32
Add better support for auto sizing error state components in grid layouts 2024-08-02 09:22:04 +01:00
Sam Rose 01ad68f843
Remove all mocking from rest.spec.ts. 2024-08-01 17:57:33 +01:00
Andrew Kingston 9906ea96a9
Update some component manifest styles and fix issue with default grid vars 2024-08-01 16:23:53 +01:00
Sam Rose b2f70f5051
Merge branch 'master' into node-fetch-mockectomy 2024-08-01 15:49:56 +01:00
mike12345567 6eb3b2793b Linting. 2024-08-01 13:31:10 +01:00
mike12345567 224d2a1953 PR comments. 2024-08-01 13:07:34 +01:00
mike12345567 99e8ef58dd Adding test case - had to rejig how internal limit is retrieved but works without requiring thousands of rows. 2024-08-01 13:03:58 +01:00
Sam Rose 97e142a1d8
Delete node-fetch.ts mock. 2024-08-01 12:46:01 +01:00
Sam Rose a38dc3d163
Fix datasource.spec.ts's reliance on the node-fetch mock. 2024-08-01 12:45:37 +01:00
Sam Rose a973b65a72
Fix plugni.spec.ts's reliance on the node-fetch mock (again?). 2024-08-01 12:36:32 +01:00
Andrew Kingston 4e9e644e13
Prevent cross-grid variable inheritance 2024-08-01 12:27:19 +01:00
Andrew Kingston 61e24d18bc
Fix issue with nested grids 2024-08-01 12:22:01 +01:00
Sam Rose c8fadc33d9
Fix discorfd.spec.ts's reliance on the node-fetch mock. 2024-08-01 12:21:42 +01:00
Sam Rose 6d70dd1924
Fix outgoingWebhook.spec.ts's reliance on the node-fetch mock. 2024-08-01 12:19:44 +01:00
Andrew Kingston 1eedb9241b
Fix nested grids not laying out properly 2024-08-01 12:09:44 +01:00
Sam Rose 661e1f241d
Fix startup.spec.ts's reliance on the node-fetch mock. 2024-08-01 12:09:11 +01:00
Sam Rose b39875fb4b
Fix make.spec.ts's reliance on the node-fetch mock. 2024-08-01 12:07:01 +01:00
Andrew Kingston 64c182df0f
Fix indicator positioning in preview 2024-08-01 12:06:22 +01:00
Sam Rose f16f1fb7ba
Fix zapier.spec.ts's reliance on the node-fetch mock. 2024-08-01 12:03:29 +01:00
Andrew Kingston e7dd45a5e9
Fix typo 2024-08-01 12:02:51 +01:00
Andrew Kingston 50a4f75f2b
Only allow selecting components via wrappers if interactive 2024-08-01 12:02:09 +01:00
Andrew Kingston 1219463162
Update grid rows and columns settings and add them to screen settings 2024-08-01 11:58:06 +01:00
Sam Rose e530400f46
Fix n8n.spec.ts's reliance on the node-fetch mock. 2024-08-01 11:57:04 +01:00
Sam Rose 3657067337
Fix googlesheets.spec.ts's reliance on the node-fetch mock. 2024-08-01 11:44:58 +01:00
Sam Rose 9a2e8031bc
Fix plugin.spec.ts's reliance on the node-fetch mock. 2024-08-01 11:43:37 +01:00
Andrew Kingston 8879188595
Update how screen layout param is handled 2024-08-01 11:40:16 +01:00
mike12345567 8a64dd1e0a Reverting init.sql. 2024-08-01 11:39:31 +01:00
mike12345567 f0da4b0366 Merge branch 'master' of github.com:Budibase/budibase into fix/sql-pagination-fixes 2024-08-01 11:39:01 +01:00
Adria Navarro c32b5085e7
Merge branch 'master' into fix/dont-allow-protected-column-names-on-import 2024-08-01 12:34:10 +02:00
mike12345567 86f59fb71d Fixes an issue with MS-SQL timeouts, it doesn't respect query timeout value as the client has its own built in timeout by default of 15000ms. 2024-08-01 11:20:23 +01:00
Sam Rose 3d20d4ccb7
Fix application.spec.ts's reliance on the node-fetch mock. 2024-08-01 10:37:54 +01:00
Adria Navarro bf1566ebb2
Merge branch 'master' into fix/dont-allow-protected-column-names-on-import 2024-08-01 11:04:14 +02:00
Adria Navarro f4bd303572 Handle frontend 2024-08-01 11:02:21 +02:00
Adria Navarro 0d6b4cee95
Merge branch 'master' into fix/reimporting_rows 2024-08-01 10:54:26 +02:00
Adria Navarro 3128501083
Merge branch 'master' into fix/import-column-issues 2024-08-01 10:38:56 +02:00
Sam Rose 0bd18a2832
wip trigger support 2024-08-01 09:34:56 +01:00
Adria Navarro e6c4c8ef77
Merge branch 'master' into chore/unify-row-format-values 2024-08-01 10:29:36 +02:00
Andrew Kingston 99c7859fb2
Fix DND ghost cursor issue on mac 2024-08-01 09:00:18 +01:00
Andrew Kingston 7433b073c5
Prevent pointer events in components while dragging 2024-08-01 08:52:41 +01:00
Peter Clement 8539f6d853
Add helper function / builder for creating Automations for tests and improved types (#14220)
* basic class for generating and running an automation

* change filename

* add to existing tests

* remove dupe tests

* add types to automation steps

* add types to triggers

* update tests and typing

* fix types

* typo

* move all step schema types do types folder

* updated types

* typing pr comments

* remove unused param

* some more typing and tests

* more typing

* improve type map

* fix broken type

* this will surely fix my issue
2024-07-31 22:18:00 +01:00
Sam Rose 6b78e599f0
Working on getting Oracle auto column imports working. 2024-07-31 17:37:16 +01:00
mike12345567 b54157a6fb Fix for enrich endpoint discovered by tests. 2024-07-31 17:22:17 +01:00
mike12345567 70071dac28 Merge branch 'fix/sql-pagination-fixes' of github.com:Budibase/budibase into fix/sql-pagination-fixes 2024-07-31 16:56:51 +01:00
mike12345567 de22a078c0 Adding bookmark to each subsequent (thanks tests ). 2024-07-31 16:50:20 +01:00
Andrew Kingston 391294f7a1
Merge branch 'master' of github.com:Budibase/budibase into grid-layout-improved 2024-07-31 16:45:13 +01:00
Andrew Kingston f6f0b575d6
Add top level screen layout setting 2024-07-31 16:44:46 +01:00
Michael Drury 47401e26ff
Merge branch 'master' into fix/sql-pagination-fixes 2024-07-31 16:41:04 +01:00
Adria Navarro 8f741ffe6a More validations 2024-07-31 17:40:30 +02:00
Adria Navarro 62ec93441a
Merge branch 'master' into chore/unify-row-format-values 2024-07-31 17:37:12 +02:00
Adria Navarro ad74eca709 Fix 2024-07-31 17:32:36 +02:00
Adria Navarro 3f4484af00 Add extra tests 2024-07-31 17:32:19 +02:00
mike12345567 a2f11f17fd Type fix. 2024-07-31 16:31:02 +01:00
Adria Navarro 788a16cf48 Add safety tests 2024-07-31 17:26:42 +02:00
mike12345567 1d695be77c This PR includes a change to pagination which makes sure if the 5000 max row limit is hit that pagination still kicks in. This means that you can eventually return all rows, although for very large tables you may hit rate limits (if you have thousands of rows related to each row in your table). 2024-07-31 16:21:49 +01:00
Adria Navarro c015f8d192 Run for both internal and external 2024-07-31 17:18:03 +02:00
Adria Navarro 73eefa1046 Check protected names on validation 2024-07-31 17:14:02 +02:00
Adria Navarro 785ab12237 Add protected name validation test 2024-07-31 17:07:56 +02:00
Adria Navarro 38da9012ea Display error 2024-07-31 16:56:14 +02:00
Andrew Kingston 940e2b5a94
Improve client loading states, skeleton and underlay 2024-07-31 15:53:40 +01:00
Sam Rose f0dbaa5eae
Add query to span as a tag. 2024-07-31 15:40:54 +01:00
Sam Rose e62298e199
Record SQS queries in DataDog. 2024-07-31 15:38:26 +01:00
Andrew Kingston 8540f4020b
Improve client preview styles to work with increase client padding 2024-07-31 15:34:15 +01:00
Adria Navarro c0e60e8e3e
Merge branch 'master' into chore/unify-row-format-values 2024-07-31 16:13:02 +02:00
Andrew Kingston de9b80e23d
Multiple style improvements and pixel layout fixes 2024-07-31 15:03:29 +01:00
Adria Navarro b74841d99d Fix 2024-07-31 15:20:06 +02:00
Adria Navarro a6beb0fa82 Support no updating existing rows 2024-07-31 15:14:29 +02:00
Andrew Kingston e385c7291c
Fix some crashes and improve pixel alignment 2024-07-31 14:12:46 +01:00
Adria Navarro f794f84e90 Fix quote count 2024-07-31 15:03:31 +02:00
Adria Navarro 24cdfb3443 Fix re-importing 2024-07-31 15:03:31 +02:00
Adria Navarro b28aaa3a93 Fix 2024-07-31 15:03:31 +02:00
Adria Navarro 9d0fdeff68 Add validateExistingTableImport _id support test 2024-07-31 15:03:31 +02:00
Adria Navarro 5896e94e56 Add basic validateExistingTableImport test 2024-07-31 15:03:31 +02:00
Adria Navarro 4f65306c4f Add basic validateNewTableImport test 2024-07-31 15:03:31 +02:00
Andrew Kingston 0ea9b157c7
Further refactoring to grid nested layouts 2024-07-31 13:58:29 +01:00
Adria Navarro 543d0e1ce6 Add tests 2024-07-31 14:01:38 +02:00
Adria Navarro 95b18076d4
Merge branch 'master' into fix/import-column-issues 2024-07-31 13:36:48 +02:00
Adria Navarro fe2b2bb097 Don't export couchdb fields 2024-07-31 13:33:20 +02:00
Adria Navarro 62fa05a855 Type 2024-07-31 13:28:28 +02:00
Sam Rose d6c5042aa6
Merge branch 'master' of github.com:budibase/budibase into test-oracle 2024-07-31 12:01:11 +01:00
Sam Rose d4ddfb4de2
Merge branch 'test-oracle' of github.com:budibase/budibase into test-oracle 2024-07-31 12:00:59 +01:00
Sam Rose 4b7042be9f
Ignore Oracle on bulk upsert tests. 2024-07-31 12:00:50 +01:00
Adria Navarro 2b22abe0bd
Merge branch 'master' into chore/unify-row-format-values 2024-07-31 12:25:55 +02:00
Adria Navarro 58a47b801a Remove magic strings 2024-07-31 12:23:09 +02:00
Adria Navarro 0202db3efe Unify enums 2024-07-31 12:20:45 +02:00
Michael Drury 29b803cddc
Merge branch 'master' into fix/datadog-400-error 2024-07-31 11:20:23 +01:00
mike12345567 4d058b7053 Fixing an issue seen when browsing through datadog error logs for app service. 2024-07-31 11:11:52 +01:00
Adria Navarro 981e2ca89d
Merge branch 'master' into fix/csv-importing-file-refresh 2024-07-31 12:11:03 +02:00
mike12345567 76895174b5 Merge branch 'master' of github.com:Budibase/budibase into test-oracle 2024-07-31 11:03:30 +01:00
Adria Navarro 780f672100 Handle state issues 2024-07-31 11:44:39 +02:00
Andrew Kingston fc2fb81205
Fix bug with responsive css variables 2024-07-31 10:43:25 +01:00
Andrew Kingston fd57f2ffcc
Remove logs 2024-07-31 10:36:39 +01:00
Andrew Kingston cb3c667859
Large refactor of grid css variable handling to simplify everything 2024-07-31 10:35:57 +01:00
mike12345567 8ee2e6d0de Merge branch 'test-oracle' of github.com:Budibase/budibase into test-oracle 2024-07-30 18:22:38 +01:00
mike12345567 7cc000a838 Fixes for not contains in oracle. 2024-07-30 18:22:20 +01:00
Adria Navarro a172a44741 Fix test 2024-07-30 19:08:00 +02:00
Adria Navarro a9a40516db Fix test 2024-07-30 18:58:51 +02:00
Sam Rose ea7a6195bf
Merge branch 'master' of github.com:budibase/budibase into test-oracle 2024-07-30 17:58:44 +01:00
Sam Rose 3c4832c7a6
Merge branch 'test-oracle' of github.com:budibase/budibase into test-oracle 2024-07-30 17:58:35 +01:00
Sam Rose cc1e466db9
Add Oracle to table.spec.ts 2024-07-30 17:57:21 +01:00
mike12345567 b470ecc7d9 Merge branch 'test-oracle' of github.com:Budibase/budibase into test-oracle 2024-07-30 17:54:10 +01:00
mike12345567 f0bdbd5b4d Fixing not contains with oracle. 2024-07-30 17:53:53 +01:00
Adria Navarro e24229e5b2
Merge branch 'master' into chore/improve_typings 2024-07-30 18:53:06 +02:00
Adria Navarro 48349f9ad0 Fix tests 2024-07-30 18:44:00 +02:00
Sam Rose d7199c9def
Fix a few more clob problems. 2024-07-30 17:41:39 +01:00
Adria Navarro 3d88ed0c42
Merge branch 'master' into chore/save_autofields_on_bulksaves 2024-07-30 18:36:08 +02:00
Adria Navarro e41f3ada62
Merge branch 'master' into chore/improve_typings 2024-07-30 18:36:00 +02:00
Sam Rose 383132d06c
Actually fix time zone problems this time. 2024-07-30 17:26:00 +01:00
Adria Navarro 0a35ae012f Prevent test container name conflicts 2024-07-30 18:16:29 +02:00
Adria Navarro 9371f9913e Types 2024-07-30 18:14:54 +02:00
Sam Rose aa7894604f
Fix dates and times for good? maybe? 2024-07-30 16:56:59 +01:00
Adria Navarro 21b9bf36fd Add api types 2024-07-30 17:52:27 +02:00
Andrew Kingston de183d5c78
Refactor and tidy up 2024-07-30 16:48:54 +01:00
Adria Navarro 7d17717895 Subtype required for autocolumns 2024-07-30 17:48:08 +02:00
Adria Navarro 10351c52f8 Improve types 2024-07-30 17:46:48 +02:00
Adria Navarro ff15b84429
Merge branch 'master' into chore/save_autofields_on_bulksaves 2024-07-30 17:40:01 +02:00
Adria Navarro 643d57b583 Add extra tests 2024-07-30 17:29:03 +02:00
Adria Navarro 61d73b1f59 Add createdAd and updatedAt on bulkDocs 2024-07-30 17:26:49 +02:00
Adria Navarro e07bc5b572 Add bulkDocs test 2024-07-30 17:26:29 +02:00
Adria Navarro 8280c2ccfd Add databaseImpl.put tests 2024-07-30 17:22:21 +02:00
mike12345567 8a7e0793d4 Linting. 2024-07-30 16:07:09 +01:00
mike12345567 8f7a88ce86 Moving logic to frontend - definitions are returned unless they are deprecated, frontend decides which it can use to create. 2024-07-30 16:04:33 +01:00
Sam Rose c6ec710abe
Solve _some_ date problems. 2024-07-30 16:03:03 +01:00
mike12345567 8badd7b83e Merge branch 'fix/hide-row-actions' of github.com:Budibase/budibase into fix/hide-row-actions 2024-07-30 15:34:16 +01:00
mike12345567 7a68db4274 Fix test to remove invalid definitions. 2024-07-30 15:33:43 +01:00
Andrew Kingston 29ddeab0d4
Update grid layout to include nested flex wrappers for more layout control 2024-07-30 15:20:59 +01:00
Michael Drury 2486497a6c
Merge branch 'master' into fix/hide-row-actions 2024-07-30 15:20:21 +01:00
mike12345567 76652ddab5 Fixes some issues with row actions which were allowing them to be added from the automation section (which is not allowed) as well as breaking app access once they were added - this hides them properly so they can't be added as well as fixing the issue when they exist. 2024-07-30 15:07:34 +01:00
Andrew Kingston 32ba04c83d
Merge branch 'master' into dean-fixes 2024-07-30 15:03:54 +01:00
Andrew Kingston 0d6e7bd5d3
Fix issues with min-widths in grid children 2024-07-30 13:53:11 +01:00
Andrew Kingston 7d4acc936b
Rewrite grid CSS variable handling 2024-07-30 13:50:38 +01:00
mike12345567 d06377a25d Merge branch 'master' of github.com:Budibase/budibase into test-oracle 2024-07-30 13:02:22 +01:00
deanhannigan d2be5f6f16
Merge branch 'master' into fix/accomodate-missing-auto-trigger 2024-07-30 12:56:38 +01:00