Sam Rose
f9bff0846a
Merge branch 'master' into refactor/remove-jsdoc-types-in-ts-files
2023-10-18 11:45:52 +01:00
Michael Drury
0c9f483c39
Merge branch 'master' into fix/improve-external-request-typing
2023-10-18 11:31:53 +01:00
Adria Navarro
06ae3fb52c
Log warn
2023-10-18 12:07:50 +02:00
mike12345567
68e8630d85
Improving the typing around the ExternalRequest object, which has implications throughout the row API and SDK, cleaning up where possible based on it.
2023-10-18 10:57:04 +01:00
Sam Rose
3634687442
Create endpoint and controller function for user column migration.
2023-10-18 10:31:36 +01:00
Adria Navarro
3fd2973152
Remove sentry packages
2023-10-18 10:51:09 +02:00
Adria Navarro
ea1853c78c
Remove sentry from the backend
2023-10-18 10:51:09 +02:00
Sam Rose
767900aec6
Remove type information from JSDoc in .ts files, it's redundant.
2023-10-17 16:46:32 +01:00
Sam Rose
946a7b6d0d
Merge branch 'master' into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if
2023-10-17 11:43:20 +01:00
Adria Navarro
beb3136312
Fix sentry import
2023-10-17 10:59:46 +02:00
Sam Rose
37fe91e488
Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if
2023-10-16 16:05:45 +01:00
Adria Navarro
8e64fb9858
Merge branch 'master' into BUDI-7573/use_existing_image_cache
2023-10-16 16:46:14 +02:00
Michael Drury
5e00a0d0dd
Merge branch 'master' into fix/internal-db-enrich-perf
2023-10-16 13:54:10 +01:00
Adria Navarro
dc4fc27fc8
Merge branch 'master' into BUDI-7573/use_existing_image_cache
2023-10-16 10:38:09 +02:00
mike12345567
cef71ff708
Adding test cases for navbar update.
2023-10-13 18:03:10 +01:00
mike12345567
6a4877159d
Quick fix to make sure that the important components of the app metadata are correctly updated - as well as adjusting the import modal to check if the export is encrypted.
2023-10-13 17:43:14 +01:00
Sam Rose
89e64d18a5
Remove TODOs.
2023-10-13 16:11:56 +01:00
Sam Rose
0b8c829ed1
Clean up correctly after Postgres integration tests.
2023-10-13 15:59:07 +01:00
Sam Rose
e1af1a5be3
Introduce integration tests for `POST /api/datasources/:datasourceId/schema`
2023-10-13 15:29:59 +01:00
Sam Rose
2f0e88c17c
Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if-2
2023-10-13 13:13:41 +01:00
Michael Drury
ec213a3c7a
Merge branch 'master' into fix/user-search-api
2023-10-13 10:41:08 +01:00
Sam Rose
a3cb9d7567
Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if
2023-10-13 10:20:54 +01:00
Sam Rose
18363b7b60
Make sure to stop postgres container after the postgres integration tests have run.
2023-10-13 09:50:45 +01:00
mike12345567
16d551542e
Frontend component of updating the API and accounting for default value not being in the paginated results of the relationship picker.
2023-10-12 19:00:53 +01:00
Sam Rose
6af05500e9
Fix lint warnings.
2023-10-12 17:59:02 +01:00
Sam Rose
f4fa542e86
Remove some unused fields, fix a broken spec.
2023-10-12 17:34:48 +01:00
Sam Rose
16451904c9
Expose an errors object via the buildSchemaFromDb endpoint.
2023-10-12 17:12:49 +01:00
Sam Rose
1faf920c67
DatasourcePlus deals exclusively in ExternalTables, reflect that in the types.
2023-10-12 16:38:15 +01:00
mike12345567
6bbce23910
Updating user fetch functionality to send up lucene syntax for searching to global user endpoint.
2023-10-12 16:31:32 +01:00
Sam Rose
85b3af2971
Refactor DatasourcePlus's buildSchema to return a value, rather than rely on member variables.
2023-10-12 16:27:18 +01:00
Sam Rose
6e1962e6ea
Plumb Google Sheets table fetching error through to buildSchemaFromDb endpoint.
2023-10-12 12:07:13 +01:00
mike12345567
44fbda9290
Fixing conflict.
2023-10-12 11:18:03 +01:00
Michael Drury
a23f918880
Merge branch 'master' into fix/internal-db-enrich-perf
2023-10-12 11:09:17 +01:00
mike12345567
7b8e23eb82
Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache
2023-10-12 11:08:12 +01:00
mike12345567
7090819752
Updating version of VM2 to ^3.9.19 - due to possible RCE issue with Promises (we do not allow async code, but there still could be a risk).
2023-10-11 18:43:25 +01:00
Adria Navarro
5908a791f2
Return email and names on bb reference api output
2023-10-11 19:10:58 +02:00
mike12345567
d1b7ccd86f
Updating docs and removing old documentation pathway.
2023-10-11 17:49:25 +01:00
mike12345567
09ce950e64
Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf
2023-10-11 17:24:08 +01:00
mike12345567
b310d7c5a7
Linting.
2023-10-11 17:12:28 +01:00
Sam Rose
c76e110350
Add BulkImportResponse as a type after merging Adri's type changes.
2023-10-11 16:58:24 +01:00
Sam Rose
789b247879
Pull origin, resolve merge conflicts.
2023-10-11 16:53:28 +01:00
Sam Rose
123f96db12
Pull origin, resolve merge conflicts.
2023-10-11 16:49:34 +01:00
Michael Drury
7825a56847
Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column
2023-10-11 16:48:19 +01:00
Sam Rose
a0e9abb95b
Responding to PR feedback.
2023-10-11 16:45:02 +01:00
Michael Drury
d212837b1b
Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column
2023-10-11 16:42:01 +01:00
Adria Navarro
62fd9011f3
Merge branch 'labday/type_schema' into feature/multi-user-type-column
2023-10-11 14:13:55 +02:00
Adria Navarro
1bfde57391
Remove anys on tests
2023-10-11 14:08:22 +02:00
Adria Navarro
0720aa8b98
Remove any
2023-10-11 13:55:35 +02:00
Adria Navarro
8fa71e2e1b
Clean
2023-10-11 13:54:51 +02:00
Adria Navarro
fcaf657e53
More types
2023-10-11 13:53:14 +02:00
Sam Rose
0d9f257cc2
Remove whitespace-only change.
2023-10-11 12:51:57 +01:00
Adria Navarro
514f2b0cef
Types
2023-10-11 13:48:28 +02:00
Adria Navarro
a3b3c176d3
More types
2023-10-11 13:37:50 +02:00
Adria Navarro
1e8aa9eb60
More types
2023-10-11 13:36:56 +02:00
Sam Rose
7f2ab8b1ae
Make sure table gets saved after bulkImport if it has changed. This fixes auto ID columns having the wrong lastID.
2023-10-11 12:29:43 +01:00
Adria Navarro
f3762885c6
Clean types
2023-10-11 13:29:35 +02:00
Adria Navarro
d03e0cb1f6
Clean code
2023-10-11 13:27:03 +02:00
Adria Navarro
715db97436
Clean code
2023-10-11 13:21:51 +02:00
Adria Navarro
9391854f46
Types
2023-10-11 13:21:19 +02:00
Adria Navarro
6fa5727166
Clean
2023-10-11 13:19:05 +02:00
Adria Navarro
ea1c273de0
Clean
2023-10-11 13:18:04 +02:00
Adria Navarro
164e1f4c18
Clean
2023-10-11 13:15:59 +02:00
Adria Navarro
79ef97387b
Subtype on datetime
2023-10-11 13:06:18 +02:00
Adria Navarro
3f6d48da1f
Fix autoid numbers
2023-10-11 13:03:05 +02:00
Adria Navarro
248c44ac2a
Fix relationship field metadata
2023-10-11 12:55:23 +02:00
Adria Navarro
f57104730e
Remove subtype from the base field schema
2023-10-11 12:23:54 +02:00
Sam Rose
4bda97d70f
Create a failing test for BUDI-7552
2023-10-11 11:07:46 +01:00
mike12345567
ff89a15eea
Updating jest types - old version was causing some weird errors in Webstorm.
2023-10-10 18:12:28 +01:00
Adria Navarro
74cba9de27
Lint
2023-10-10 18:54:57 +02:00
Adria Navarro
1b7be0d637
Fix import
2023-10-10 18:54:57 +02:00
Adria Navarro
a8c814e714
Fixes fixes
2023-10-10 18:54:57 +02:00
Adria Navarro
1f1ebc82e5
Fix more types
2023-10-10 18:54:57 +02:00
Adria Navarro
6c328109b6
Fixes
2023-10-10 18:54:57 +02:00
Adria Navarro
ea86ded912
Fixes
2023-10-10 18:54:57 +02:00
Adria Navarro
7ee63365f7
Fix
2023-10-10 18:54:57 +02:00
Adria Navarro
40226c5c3a
Fix more types
2023-10-10 18:54:57 +02:00
Adria Navarro
21e2d7ddbe
Fix relationship types
2023-10-10 18:54:57 +02:00
Adria Navarro
c8ffa98844
Fixes
2023-10-10 18:54:57 +02:00
Adria Navarro
dd373cd5e9
Fix types
2023-10-10 18:54:57 +02:00
Adria Navarro
fe6535a65f
Type schema fields
2023-10-10 18:54:57 +02:00
Adria Navarro
530857a6ff
Fix
2023-10-10 15:39:05 +02:00
Adria Navarro
c49a16fdac
Fix tests
2023-10-10 15:35:00 +02:00
Adria Navarro
21420c59fa
Fix order
2023-10-10 14:39:55 +02:00
Adria Navarro
78335be26a
Clean
2023-10-10 14:20:26 +02:00
Adria Navarro
e473c8b3a8
Fix tests
2023-10-10 14:07:12 +02:00
Adria Navarro
d3e8e1f4f8
Fix importing
2023-10-10 13:52:47 +02:00
Adria Navarro
b966ed221d
Fix bulk delete
2023-10-10 13:52:47 +02:00
Adria Navarro
71159e4f4a
Import internal
2023-10-10 13:52:47 +02:00
Adria Navarro
fd414dbe4b
Enable importing bbrefs as string csv
2023-10-10 13:52:47 +02:00
Adria Navarro
979c2aeb00
Return only id and primary display
2023-10-10 13:52:47 +02:00
Adria Navarro
df97b7ad93
Expect BB ref data as csv strings
2023-10-10 13:52:47 +02:00
Adria Navarro
f22467fa53
Validate user column
2023-10-10 13:52:47 +02:00
Michael Drury
5783ae3e00
Merge branch 'master' into feature/multi-user-type-column
2023-10-10 12:38:51 +01:00
mike12345567
fa5e340e60
Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/external-table-keep-types
2023-10-09 18:30:47 +01:00
mike12345567
635f33f81e
Make sure that external tables preserve the BB_REFERNECE type, under the hood it is text/array, but it should continue to be treated correctly as its own indpendent type when updating Budibase tables (fetching).
2023-10-09 18:28:09 +01:00
Andrew Kingston
b17ec630c1
Ensure user table editing is still allowed for old apps that are imported
2023-10-09 15:09:11 +01:00
Andrew Kingston
a4e3cd72cc
Add new app feature flag to allow disable user metadata columns in new apps, but allow them in old apps
2023-10-09 15:01:16 +01:00
Adria Navarro
7d6cd53c29
Add comments
2023-10-09 15:37:42 +02:00
Adria Navarro
0909e0547e
Process formulas after processing complex fields
2023-10-09 15:30:07 +02:00
Adria Navarro
d7aa23f740
Testing
2023-10-09 13:21:40 +02:00
Adria Navarro
a5477f14d2
Handle users on search input
2023-10-09 13:21:27 +02:00
Adria Navarro
047936bcbf
Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support
2023-10-09 09:22:55 +02:00
mike12345567
0dc28122fa
Adding test case.
2023-10-06 16:38:36 +01:00
mike12345567
d4335bca73
Quick fix for saving current user._id - make sure it is the correct format of ID.
2023-10-06 16:31:48 +01:00
Michael Drury
c7c63a7b83
Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support
2023-10-06 15:54:12 +01:00
Michael Drury
7934e984cc
Merge branch 'master' into fix/user-column-search-mapping
2023-10-06 14:30:09 +01:00
melohagan
23b7a8de72
Allow relationship to be deleted even if missing ( #11991 )
...
* Allow relationship to be deleted even if missing
* Comment
2023-10-06 14:17:36 +01:00
Adria Navarro
da53f0a366
Cache output files
2023-10-06 14:32:17 +02:00
mike12345567
bc17bc43fa
Fixing issue brought up by some unit tests.
2023-10-06 13:32:12 +01:00
mike12345567
7acc164e12
Fix build.
2023-10-06 13:28:27 +01:00
mike12345567
017b522a3f
Comment to explain function.
2023-10-06 12:56:55 +01:00
mike12345567
6e6c5bc776
Handle arrays and fix issue brought up by REST testcase.
2023-10-06 12:31:52 +01:00
mike12345567
dc50515bcc
Adding negative test case and fixing build issue.
2023-10-06 12:16:37 +01:00
mike12345567
3de8c53166
Adding a mapping layer to search queries so that we can map search inputs based on the table schema if desired - primarily for the user column.
2023-10-06 11:57:11 +01:00
mike12345567
7976772842
Fixing test case.
2023-10-05 23:19:11 +01:00
mike12345567
ee4a042204
Typing fixes - unsure why all of these came up suddenly.
2023-10-05 18:40:56 +01:00
mike12345567
3e2f9dfc4e
Further enhancement, client library sends up the column it wants enriched and then we can ignore everything else, makes a big difference for enriching users (with a lot of relationships).
2023-10-05 18:23:18 +01:00
Adria Navarro
9a97f5f076
Fix devdependency type
2023-10-05 13:38:46 +02:00
mike12345567
069fd33964
Some work towards improving performance of internal DB enrichment, there is a problem with cyclic enrichment due to the outputProcessing, need to decide how to handle formulas on enrichment.
2023-10-04 19:18:21 +01:00
Adria Navarro
91306c79eb
Fix tests
2023-10-04 17:55:23 +02:00
Adria Navarro
46b85ac12c
Multiple users column
2023-10-04 17:55:23 +02:00
Adria Navarro
753cb442c2
Allow edit
2023-10-04 17:55:23 +02:00
Adria Navarro
18545b1c79
Fix vulnerabilities
2023-10-03 23:45:39 +02:00
Adria Navarro
15fd357b54
Update @google-cloud/firestore (yarn audit)
2023-10-03 23:09:57 +02:00
Adria Navarro
9dd5530c4e
More cleanups
2023-10-03 22:39:00 +02:00
Adria Navarro
16752bb437
More cleanups
2023-10-03 22:37:00 +02:00
Adria Navarro
429530a34d
Clean predocker steps
2023-10-03 19:55:23 +02:00
Adria Navarro
94e9715fef
Build only required packages
2023-10-03 19:55:23 +02:00
Adria Navarro
28d5fe37de
Fix postgres docker-compose integration to 15
2023-10-03 15:26:41 +02:00
Michael Drury
57ed79ec0f
Merge branch 'develop' into chore/relation_deletions
2023-09-29 15:46:40 +01:00
Adria Navarro
1a00b60088
Fix tests
2023-09-29 16:39:18 +02:00
Adria Navarro
7050c5352a
Check external table types
2023-09-29 16:09:08 +02:00
Adria Navarro
bc6c6b9e80
Handle deleting m2m
2023-09-29 16:02:45 +02:00
Adria Navarro
dfea7f253e
Fix test ds data
2023-09-29 14:58:41 +02:00
Adria Navarro
9d186df018
Don't modify internal API
2023-09-29 14:58:02 +02:00
mike12345567
c498f39f2a
Fixing type build.
2023-09-29 13:45:02 +01:00
mike12345567
5a3ecc3095
Getting create/update response consistent with internal API for external.
2023-09-29 13:40:40 +01:00
mike12345567
3dc7192113
Merge branch 'chore/relation_deletions' of github.com:Budibase/budibase into chore/relation_deletions
2023-09-29 13:34:09 +01:00
mike12345567
45ac9ae06c
Quick update to fix test case.
2023-09-29 13:33:49 +01:00
Adria Navarro
fe45770266
Merge branch 'develop' into chore/relation_deletions
2023-09-29 14:21:08 +02:00
mike12345567
96327eaef1
Quick fix for REST schema being updated by user, when the request is sent again/query performed again user updates are lost - this means that changes are maintained across runs.
2023-09-29 13:17:14 +01:00
Adria Navarro
1f7aa772c9
Add comment
2023-09-29 14:05:52 +02:00
Adria Navarro
c5e52f7cbe
Fix deleting one-2-many relationships
2023-09-29 14:02:45 +02:00
Adria Navarro
17ecace6fa
Fix test
2023-09-29 12:54:16 +02:00
Adria Navarro
711f82099f
Extend bbreference test to check link relationships
2023-09-29 12:48:55 +02:00
Adria Navarro
46a224751f
Types
2023-09-29 11:47:23 +02:00
melohagan
b4e0d98973
Add bindings support to meeting start / end dates ( #11759 )
...
* Deprecate zapier+make values1..5
* Allow dates in meeting invite to be bindable
* Add DrawerBindableSlot component
* Show calendar icon
* refactor
* Use cancel icon
* Disable cancel for JS bindings
* WIP
* WIP
* WIP
* Fix linkedIds svelte binding
* Label and icon update
* Handle arrays
* Support text area
* Add reactivity to text area icon
* Support boolean
* JSON support
* Remove rowControl
* Allow boolean field to have three states
* lint
* Refactor
---------
Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-09-29 09:15:36 +00:00
Adria Navarro
5b5c0b31ff
Fix link loading relationships on external ds+
2023-09-28 15:54:53 +02:00
Adria Navarro
8be76f1f97
Move the -2 magic number in its right place
2023-09-28 13:55:35 +02:00
Adria Navarro
c202f88b6d
Allow deleting cell
2023-09-28 12:42:42 +02:00
Adria Navarro
606bad7f4d
Clean
2023-09-28 11:41:20 +02:00
Adria Navarro
7db92638de
Prevent double fetching on patch
2023-09-28 11:40:58 +02:00
Adria Navarro
80e979faa6
Type external request responses
2023-09-28 11:02:16 +02:00
Adria Navarro
0c4cdde25f
Allow BB_REFERENCE to google sheets
2023-09-28 10:12:45 +02:00
Adria Navarro
317da512a5
Fix tests
2023-09-28 10:00:25 +02:00
Adria Navarro
fad4f12e26
Fix test
2023-09-28 10:00:25 +02:00
Adria Navarro
0cec026932
Datasource usage on tests
2023-09-28 10:00:25 +02:00
Adria Navarro
8c99ac3f9b
Test search
2023-09-28 10:00:25 +02:00
Adria Navarro
e22c770bad
Clean tests
2023-09-28 10:00:25 +02:00
Adria Navarro
d7cbd2dcbc
Fix
2023-09-28 10:00:25 +02:00
Adria Navarro
049a91debb
Clean
2023-09-28 10:00:25 +02:00
Adria Navarro
0e3cacd19c
Clean
2023-09-28 10:00:25 +02:00
Adria Navarro
01057baa96
Add extra tests
2023-09-28 10:00:25 +02:00
Adria Navarro
8a9e87ea6f
Add extra tests
2023-09-28 10:00:25 +02:00
Adria Navarro
a87e3dd0fc
Extra tests
2023-09-28 10:00:25 +02:00
Adria Navarro
3c0a033c8b
Add new tests
2023-09-28 10:00:25 +02:00
Adria Navarro
bf975ac039
Fix tests
2023-09-28 10:00:25 +02:00
Adria Navarro
fdb6474868
Fix tests
2023-09-28 10:00:25 +02:00
Adria Navarro
9afa334501
Fix deletions
2023-09-28 10:00:25 +02:00
Adria Navarro
1fb3c4b3c3
Fix external save/update
2023-09-28 10:00:25 +02:00
Adria Navarro
d0fcb5d7e6
Fix patch on external ds
2023-09-28 10:00:25 +02:00
Adria Navarro
81ca81222c
Process bb_references on external
2023-09-28 10:00:25 +02:00
Michael Drury
a67f78fead
Merge branch 'develop' into fix/BUDI-7236
2023-09-27 17:08:21 +01:00
Martin McKeaveney
65af2ed7c2
backmerge from master
2023-09-27 17:06:57 +01:00
mike12345567
e3469ed38d
Fixing dev-tools handling of custom roles and build issue - PR comments.
2023-09-27 16:52:20 +01:00
mike12345567
395969e0f0
Fixing build issue,.
2023-09-27 16:24:12 +01:00
mike12345567
4bfda10fbb
Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-7236
2023-09-27 15:51:49 +01:00
mike12345567
e916178046
Adding test case for new endpoint and covering public, builder and normal roles.
2023-09-27 15:46:04 +01:00
Adria Navarro
294a6f0eed
Merge branch 'develop' into chore/clean_unused_dependencies
2023-09-27 15:53:43 +02:00
mike12345567
bb2892cbc2
Getting client library loading in Webstorm debug, as well as adding accessible roles endpoint.
2023-09-27 14:21:25 +01:00
Michael Drury
81bbc3adf6
Merge branch 'develop' into fix/BUDI-7508
2023-09-27 13:33:20 +01:00
melohagan
6c9ff55f8a
Check manyRelationships length ( #11907 )
2023-09-27 13:31:27 +01:00
Michael Drury
0820363790
Merge branch 'develop' into fix/BUDI-7508
2023-09-27 11:15:08 +01:00
Adria Navarro
41c56217c4
Merge branch 'develop' into chore/clean_unused_dependencies
2023-09-26 18:30:39 +02:00
Adria Navarro
f600ad7711
Editing scripts
2023-09-26 18:08:37 +02:00
mike12345567
7bd84bd048
Some typing fixes as well as a fix for the frontend issue of tables not correctly having their schemas updated in the table store when relationships added.
2023-09-26 17:01:30 +01:00
Adria Navarro
ba24504546
Remove "@budibase/standard-components" devDependency
2023-09-26 17:06:05 +02:00
Adria Navarro
d006ec890a
Dedupe babel
2023-09-26 17:02:54 +02:00
Adria Navarro
c68cfc5042
Remove unused devDependencies on worker
2023-09-26 16:37:10 +02:00
Adria Navarro
30af3e4c10
Remove unused koa dependencies
2023-09-26 16:17:41 +02:00
Adria Navarro
ebb3966092
Remove unused devDependencies on server
2023-09-26 16:10:43 +02:00
Adria Navarro
7c5f13a12b
Remove unused dependencies on server
2023-09-26 16:07:52 +02:00
Adria Navarro
7feaf58f7f
Fix dependencies from backend-core
2023-09-26 12:53:09 +02:00
Adria Navarro
f4542283f5
Merge branch 'develop' into feature/user-column-type
2023-09-26 11:51:20 +02:00
Adria Navarro
6487d76b1d
Merge branch 'develop' into feature/user-column-type
2023-09-25 21:51:43 +02:00
melohagan
9d12fbb3f4
Merge branch 'develop' into budi-6922-the-number-0-cannot-be-displayed-on-input-number-fields-when
2023-09-25 20:01:47 +01:00
Adria Navarro
79e693c89d
Merge branch 'develop' into feature/user-column-type
2023-09-25 19:03:25 +02:00
mike12345567
6b52adc294
Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7458
2023-09-25 17:55:06 +01:00
mike12345567
98680f7895
Updating dual bulkDocs call, to handle the merging of similar documents.
2023-09-25 17:48:07 +01:00
mike12345567
3d143c28a9
Last PR comments.
2023-09-25 17:00:20 +01:00