Commit Graph

1542 Commits (125a265806aab82c5423003ee22d66132f23b20a)

Author SHA1 Message Date
RiotRobot ec571ddd8d Upgrade matrix-js-sdk to 15.5.1-rc.1 2022-02-08 15:37:07 +00:00
J. Ryan Stinnett 7f3f186044
Switch back to upstream Linkify (#7677) 2022-02-04 17:21:03 +00:00
Kerry 292971dd0e
Upgrade to jest 27 (#7699)
* use jest@27.4.0, replace jest-environment-jsdom-sixteen with jest-environment-jsdom

Signed-off-by: Kerry Archibald <kerrya@element.io>

* polyfill setImmediate

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove done from async test cases

* useRealTimers in test relying on promise flushing

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove jest environment file

Signed-off-by: Kerry Archibald <kerrya@element.io>

* replace ts-jest mocked with jest utils mocked

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-02-02 13:02:17 +01:00
RiotRobot e90885dd9d Merge branch 'master' into develop 2022-02-01 15:52:12 +00:00
RiotRobot 34a95f4d27 v3.39.1 2022-02-01 15:50:26 +00:00
Michael Telatynski 8dd0722e04
Update eventName=Screen to $screen to match PostHog's special behaviour (#7667) 2022-02-01 15:49:49 +00:00
RiotRobot 8221faad6c Reset matrix-js-sdk back to develop branch 2022-01-31 14:57:25 +00:00
RiotRobot 9283202b87 Resetting package fields for development 2022-01-31 14:57:14 +00:00
RiotRobot a25fea9f96 Merge branch 'master' into develop 2022-01-31 14:57:13 +00:00
RiotRobot bdcdd745ba v3.39.0 2022-01-31 14:55:25 +00:00
RiotRobot e0b041bdca Upgrade matrix-js-sdk to 15.5.0 2022-01-31 14:48:14 +00:00
Kerry 085ecc7f5f
Chat export parameter customisation (#7647)
* use export settings and hide fields

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix exporter tests

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test ExportDialog with settings

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tidy debugs, rename setting to Parameters

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use reasonable 100gb limit

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use normal setting instead of UIFeature

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use a customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* move validateNumberInRange to utils

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use nullish coalesce

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use 8gb size limit for customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update comments

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-01-31 12:54:14 +01:00
RiotRobot 7567aebe47 v3.39.0-rc.2 2022-01-26 18:07:18 +00:00
RiotRobot f2d360e639 v3.39.0-rc.1 2022-01-26 17:04:44 +00:00
RiotRobot 01d1e0292c Upgrade matrix-js-sdk to 15.5.0-rc.1 2022-01-26 17:01:37 +00:00
J. Ryan Stinnett 51a44f491e
Upgrade linkifyjs to fix schemes as domain prefixes (#7628) 2022-01-25 17:37:54 +00:00
David Baker 91743c9a1a
Switch to github: URL to be consistent with other deps (#7588)
and resolves to a tarball which can be cached nicely. Also
some other yarn.lock change that yarn seems to be insisting on.

Fixes https://github.com/vector-im/element-web/issues/20628
2022-01-21 09:32:09 +00:00
Travis Ralston 6712a5b1c5
Parse matrix-schemed URIs (#7453)
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Dariusz Niemczyk <dariuszn@element.io>
Co-authored-by: Timo K <toger5@hotmail.de>

With this pr all href use matrix matrix.to links. As a consequence right-click copy link will always return get you a sharable matrix.to link.
2022-01-20 18:18:47 +01:00
Dariusz Niemczyk 336e1ae3b6
Upgrade linkify to v3.0 (#7282)
Co-authored-by: Timo K <toger5@hotmail.de>
2022-01-18 18:24:16 +01:00
Travis Ralston 65987e6b72
Move all polls processing to events-sdk & prep for stable polls (#7517)
* Move all polls processing to events-sdk

This makes polls support the full range of extensible events (both parsing and generation).

* Appease the linter

* Fix & update tests

* Update events-sdk for polls bugfix

* Update events-sdk for typechecking

* Add missing type cast

* Update per review
2022-01-17 10:06:30 -07:00
RiotRobot 4028b5ef2e Resetting package fields for development 2022-01-17 14:26:25 +00:00
RiotRobot 11ca9bd707 Merge branch 'master' into develop 2022-01-17 14:24:39 +00:00
RiotRobot 0b83dfcd63 v3.38.0 2022-01-17 14:17:04 +00:00
RiotRobot 3c26418b5c Upgrade matrix-js-sdk to 15.4.0 2022-01-17 14:13:57 +00:00
Travis Ralston 61a0be7d46
Render events as extensible events (behind labs) (#7462)
* Render events as extensible events (behind labs)

* Include the SDK

* Appease linter

* Update for changed property name

* Fix formatting error

* Fix branch matching for build steps

* Update SDK

* Update scripts/fetchdep.sh

Co-authored-by: Andy Balaam <andyb@element.io>

Co-authored-by: Andy Balaam <andyb@element.io>
2022-01-13 17:03:37 +00:00
J. Ryan Stinnett 8b01b68fa3
Use published matrix-web-i18n (#7530) 2022-01-13 10:30:09 +00:00
Eric Eastwood 038a6bc204
Make slash command errors translatable but also work in rageshakes (#7377)
See https://github.com/matrix-org/matrix-react-sdk/pull/7372#discussion_r769556546

We want the error to be translated for the user but not in our rageshake logs.

Also updates some error messages to give more info.
2022-01-11 12:25:28 -06:00
RiotRobot 3c7c620b1f v3.38.0-rc.1 2022-01-11 15:04:11 +00:00
RiotRobot 0d84372da2 Upgrade matrix-js-sdk to 15.4.0-rc.1 2022-01-11 15:02:33 +00:00
J. Ryan Stinnett 6199c337ea
Fix spacing errors (#7484) 2022-01-10 12:57:20 +00:00
Kerry 846fbfa2a0
Add jsx-a11y eslint plugin (#7434)
* add matrix-org a11y eslint plgin

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add eslint a11y, enable and fix anchor-has-content rule

Signed-off-by: Kerry Archibald <kerrya@element.io>

* enable and fix jsx-a11y/no-redundant-roles

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove debug

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use jsx-a11y via matrix-org-eslint

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-01-03 18:51:58 +01:00
RiotRobot 2330292c24 Reset back to develop branch 2021-12-20 14:29:05 +00:00
RiotRobot 689ddb2ba7 Resetting package fields for development 2021-12-20 14:22:48 +00:00
RiotRobot 96e16940bb v3.37.0 2021-12-20 14:05:26 +00:00
RiotRobot fa63c939ba Upgrade matrix-js-sdk to 15.3.0 2021-12-20 14:03:15 +00:00
Michael Telatynski 3bf85a05a9
[Release] Pin qrcode to fix e2e verification bug (#7379) 2021-12-15 16:23:18 +00:00
RiotRobot 12abc9731a v3.37.0-rc.1 2021-12-14 14:43:37 +00:00
RiotRobot 0fac781f47 Upgrade matrix-js-sdk to 15.3.0-rc.1 2021-12-14 14:42:11 +00:00
Michael Telatynski 132e19beb7
Update typescript-eslint plugin & parser (#7351) 2021-12-13 23:39:45 +00:00
RiotRobot 56dcce6bfc Merge branch 'master' into develop 2021-12-13 15:30:11 +00:00
RiotRobot b693ecffb8 v3.36.1 2021-12-13 15:27:02 +00:00
RiotRobot 72bdd61407 Upgrade matrix-js-sdk to 15.2.1 2021-12-13 15:25:24 +00:00
David Baker b54a6d570e
update olm to 3.2.8 (#7347) 2021-12-13 14:59:13 +00:00
Michael Telatynski c96b9413e7
Update Typescript to 4.5 (#7344) 2021-12-13 11:22:53 +00:00
Andy Balaam c56833816a
Update yarn.lock (#7327) 2021-12-10 11:29:27 +00:00
Travis Ralston 9cc8a6d24a Update eslint 2021-12-09 16:04:45 -07:00
Aaron Raimist 7b94e13a84 Merge branch 'develop' into sort-imports
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-12-09 08:34:20 +00:00
J. Ryan Stinnett 8715316a66 Require matrix-widget-api to be 0.1.0-beta.18 2021-12-06 16:38:44 +00:00
RiotRobot 8b82836499 Reset back to develop branch 2021-12-06 15:34:09 +00:00
RiotRobot b856083716 v3.36.0 2021-12-06 15:20:39 +00:00
RiotRobot 906d32aec8 Upgrade matrix-js-sdk to 15.2.0 2021-12-06 15:19:13 +00:00
James Salter 43f264ccfc
Integrate analytics stubs (#7186)
* Add matrix-analytics-events as a dependency
* Make IEvent look like a stub definition
* Update pageview tracking to track screens, using a hypothetical definition of a screen event
* Remove distinction between pseudo and anon tracking, will need to rework it considering stubs
2021-12-06 21:43:42 +11:00
Matthew Hodgson 1262021417
Simple static location sharing (#7135)
Adds maplibre as a dependency, and behind a labs flag, lets users send and receive [MSC3488](https://github.com/matrix-org/matrix-doc/blob/matthew/location/proposals/3488-location.md) style location shares - with backwards compatibility with old school `m.location` `msgtype` location shares too.

For this to work, you have to define a valid maptile server and API in your config.json's `map_style_url`.
2021-12-06 09:45:12 +00:00
J. Ryan Stinnett 16a58ef2da Upgrade matrix-widget-api to 0.1.0-beta.18 2021-12-02 12:41:21 +00:00
RiotRobot ba83f2f1a6 v3.36.0-rc.1 2021-11-30 18:22:22 +00:00
RiotRobot e2ce332830 Upgrade matrix-js-sdk to 15.2.0-rc.1 2021-11-30 18:20:45 +00:00
J. Ryan Stinnett c09e0efdb9
Upgrade allchange to 1.0.6 (#7238) 2021-11-30 17:55:57 +00:00
RiotRobot ea25f74714 Reset matrix-js-sdk back to develop branch 2021-11-22 14:28:13 +00:00
RiotRobot a5f2f4df0a Resetting package fields for development 2021-11-22 14:27:30 +00:00
RiotRobot bb55c76d81 v3.35.1 2021-11-22 14:25:48 +00:00
RiotRobot 74fd21c505 v3.35.0 2021-11-22 13:35:23 +00:00
RiotRobot a434270879 Upgrade matrix-js-sdk to 15.1.1 2021-11-22 13:34:00 +00:00
RiotRobot 525a492ae1 v3.35.0-rc.1 2021-11-17 14:06:59 +00:00
RiotRobot f234d756ad Upgrade matrix-js-sdk to 15.1.1-rc.1 2021-11-17 14:04:01 +00:00
RiotRobot 06e1f8ce85 Resetting package fields for development 2021-11-08 17:54:45 +00:00
RiotRobot 5cd1aaa13b Merge branch 'master' into develop 2021-11-08 17:52:25 +00:00
RiotRobot 27e2faaf64 v3.34.0 2021-11-08 17:43:59 +00:00
RiotRobot d0483bf4b1 Upgrade matrix-js-sdk to 15.1.0 2021-11-08 17:42:01 +00:00
Germain 7a203461f7
Fix TimeZone to be UTC in Jest tests (#7082) 2021-11-04 10:39:49 +00:00
RiotRobot 5040ef951f v3.34.0-rc.1 2021-11-02 14:19:05 +00:00
RiotRobot 4270d9d659 Upgrade matrix-js-sdk to 15.1.0-rc.1 2021-11-02 14:15:52 +00:00
David Baker 1ef8a2c486
Update allchange to 1.0.5 (#7070) 2021-11-02 13:30:42 +00:00
Aaron Raimist bc1dd6fedf Merge branch 'develop' into sort-imports 2021-10-28 19:44:21 -05:00
J. Ryan Stinnett 76254977d6 Upgrade widget API 2021-10-28 11:07:09 +01:00
Aaron Raimist f3867ad0a9 Merge branch 'develop' into sort-imports 2021-10-27 21:50:56 -05:00
RiotRobot fabbf6c48a Reset matrix-js-sdk back to develop branch 2021-10-25 11:36:39 +01:00
RiotRobot 70963e3a21 Resetting package fields for development 2021-10-25 11:35:26 +01:00
RiotRobot cecea8109b Merge branch 'master' into develop 2021-10-25 11:34:33 +01:00
Aaron Raimist 860c0596e1
Add rule to group imports by external and internal
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:21:46 -05:00
Travis Ralston 0d29626163
Update allchange (#6990) 2021-10-19 18:22:04 +01:00
David Baker 2b7ea16c2d Upgrade highlight.js
Major version bump for highlight.js. Update usage of deprecated function & some cleanups.
2021-10-18 19:32:20 +01:00
Dariusz Niemczyk bc336abf47
Fix missing snapshot serializer&enzyme init (#6932) 2021-10-13 11:09:43 +01:00
RiotRobot 193a060ec9 Reset matrix-js-sdk back to develop branch 2021-10-12 09:13:06 +01:00
RiotRobot 89365d943b Resetting package fields for development 2021-10-12 08:48:24 +01:00
RiotRobot b1baa3575a v3.32.1 2021-10-12 08:42:35 +01:00
RiotRobot 6b4bcbd289 Upgrade matrix-js-sdk to 14.0.1 2021-10-12 08:40:57 +01:00
RiotRobot 425eeada6f v3.32.0-rc.1 2021-10-04 12:03:41 +01:00
RiotRobot 7fc4f54ae7 Upgrade matrix-js-sdk to 14.0.0-rc.1 2021-10-04 12:01:31 +01:00
Travis Ralston fe0a68b71e
Merge pull request #6869 from SimonBrandner/task/src-ts
Convert `/src` to TS
2021-09-30 12:48:23 -06:00
Jaiwanth 208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Šimon Brandner de44b3aacc
Convert index to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 18:40:01 +02:00
RiotRobot b635d01779 Reset matrix-js-sdk back to develop branch 2021-09-27 14:33:56 +01:00
RiotRobot 3e2e3fcd20 Resetting package fields for development 2021-09-27 14:33:46 +01:00
RiotRobot dad60804ba v3.31.0 2021-09-27 14:31:26 +01:00
RiotRobot ccfc57657a Upgrade matrix-js-sdk to 13.0.0 2021-09-27 14:27:26 +01:00
RiotRobot a22e2ef874 v3.31.0-rc.2 2021-09-22 14:35:24 +01:00
Jaiwanth 94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
RiotRobot 531622f3b5 v3.31.0-rc.1 2021-09-21 09:41:50 +01:00
RiotRobot 308f6b1d86 Upgrade matrix-js-sdk to 13.0.0-rc.1 2021-09-21 09:39:41 +01:00
David Baker 22500a2e29 yarn upgrade
And also pin @types/react harder because yarn wanted to give
@types/flux a newer version meaning they conflicted.
2021-09-15 16:59:13 +01:00
David Baker 16065e0a8b Pin react too... 2021-09-15 16:14:58 +01:00
David Baker 4e694df6b0 Pin typescript/types version
type: task

Because we have a collection of usages of things and conflicts
that break with the new version: https://github.com/vector-im/element-web/issues?q=is%3Aissue+is%3Aopen+preventing+TypeScript+upgrade
2021-09-15 16:04:26 +01:00
RiotRobot 85fea9cfd0 Merge branch 'master' into develop 2021-09-14 16:02:04 +01:00
RiotRobot c3089a1097 v3.30.0 2021-09-14 15:56:23 +01:00
RiotRobot 4ea0385061 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 15:54:30 +01:00
RiotRobot f9e17621af Merge branch 'master' into develop 2021-09-13 13:00:40 +01:00
RiotRobot df20960ee8 v3.29.1 2021-09-13 12:54:45 +01:00
RiotRobot 2a2c2c19cf Upgrade matrix-js-sdk to 12.4.1 2021-09-13 12:54:01 +01:00
RiotRobot a5e2877862 v3.30.0-rc.2 2021-09-09 18:28:58 +01:00
RiotRobot 71b20608a2 v3.30.0-rc.1 2021-09-07 18:28:33 +01:00
RiotRobot 2cbe35cbd9 Upgrade matrix-js-sdk to 12.5.0-rc.1 2021-09-07 18:26:09 +01:00
David Baker e1fdf7c69d Update changelog generator 2021-09-07 18:01:13 +01:00
Travis Ralston 4b557fe0ad Update widget-api 2021-09-01 13:22:09 -06:00
David Baker 855c3819c1 Reset matrix-js-sdk back to develop branch 2021-09-01 09:52:32 +01:00
RiotRobot 0a09682982 Resetting package fields for development 2021-08-31 13:57:16 +01:00
RiotRobot 417415ab3b Merge branch 'master' into develop 2021-08-31 13:56:00 +01:00
RiotRobot e4f27f04b9 v3.29.0 2021-08-31 13:52:40 +01:00
RiotRobot 09b40870d4 Upgrade matrix-js-sdk to 12.4.0 2021-08-31 13:51:17 +01:00
RiotRobot 54b93f44d0 v3.29.0-rc.3 2021-08-26 14:19:19 +01:00
David Baker 59833d1306 Update changelog generator 2021-08-25 17:21:48 +01:00
RiotRobot ccafcd0d39 v3.29.0-rc.2 2021-08-25 11:46:07 +01:00
RiotRobot b58f7fea57 v3.29.0-rc.1 2021-08-24 17:30:44 +01:00
RiotRobot d4a4ac5680 Upgrade matrix-js-sdk to 12.4.0-rc.1 2021-08-24 17:09:26 +01:00
Dariusz Niemczyk e54191f6b0
Move background-blur to fully css version 2021-08-23 19:26:57 +02:00
Jaiwanth 6a26154271 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-20 15:02:13 +05:30
Dariusz Niemczyk 455a914cf3
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter
* origin/develop: (43 commits)
  Update copy to indicate debug logs contain which UI elements you last interacted with
  Fix name of Netlify workflow
  Add type declarations
  Fix pagination and improve typing
  Fix import
  Reset matrix-js-sdk back to develop branch
  v3.28.1
  Prepare changelog for v3.28.1
  Upgrade matrix-js-sdk to 12.3.1
  Explicitly handle first state change
  Properly listen for call_state
  Proper init in constructors
  Resetting package fields for development
  v3.28.0
  Prepare changelog for v3.28.0
  Fix error on accessing encrypted media without keys
  Fix call tile buttons
  Upgrade matrix-js-sdk to 12.3.0
  Remove test code; good job we have tests
  Fix dates
  ...
2021-08-19 07:11:02 +02:00
James Salter 834f72a9a8 Merge remote-tracking branch 'origin' into sentry-rageshakes 2021-08-17 11:47:00 +01:00
RiotRobot d5ffdf1196 Reset matrix-js-sdk back to develop branch 2021-08-17 09:42:20 +01:00
RiotRobot 0f9e8f280a Merge branch 'master' into develop 2021-08-17 09:41:43 +01:00
RiotRobot 0dd479c466 v3.28.1 2021-08-17 09:40:11 +01:00
RiotRobot 6e82b064ec Upgrade matrix-js-sdk to 12.3.1 2021-08-17 09:29:20 +01:00
RiotRobot 0f382efb46 Resetting package fields for development 2021-08-16 15:02:29 +01:00
RiotRobot c4de03ddb0 v3.28.0 2021-08-16 14:45:13 +01:00
RiotRobot 62e1a30532 Upgrade matrix-js-sdk to 12.3.0 2021-08-16 14:21:59 +01:00
David Baker d0e82ee603 Update changelog generator 2021-08-16 13:18:10 +01:00
Dariusz Niemczyk 5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter
* origin/develop: (1278 commits)
  Add a little padding
  Keep number field in focus when pressing dialpad buttons (#6520)
  Remove old version
  Fix video call persisting when widget removed
  Update link to matrix-js-sdk CONTRIBUTING file (#6557)
  $toast-bg-color -> $system
  $system-... -> $system
  Iterate PR based on feedback
  Remove unnecessary code
  Use AccessibleTooltipButton
  Just upload the PR object itself
  Edit PR Description instead of commenting
  publish the right directory
  Fix Netflify builds from fork PRs
  This doesn't need to be here as it was moved into CallViewButtons
  Make scrollbar dot transparent
  Iterate PR based on feedback
  Don't set hidden RRs labs setting at account level
  Add a comment for weirdly placed div
  Add full class names to animations.scss
  ...
2021-08-13 15:12:07 +02:00
David Baker 34249caa9e Use changelog generator from npm 2021-08-11 21:50:25 +01:00
James Salter de398f46f4 initial spike 2021-08-11 18:00:21 +01:00
RiotRobot 429befac62 v3.28.0-rc.1 2021-08-11 16:02:12 +01:00
RiotRobot 15731848ad Upgrade matrix-js-sdk to 12.3.0-rc.1 2021-08-11 16:00:43 +01:00
Jaiwanth e396dcfb10 Remove @types/streamsaver 2021-08-10 13:22:40 +05:30
Jaiwanth 850b5452a0 Add tests for reply regex 2021-08-09 12:36:06 +05:30
Jaiwanth 45ce352d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:44:13 +05:30
Travis Ralston 9b32a1c609 Appease Jest 2021-08-04 15:23:35 -06:00
David Baker 15d42a2fd2
Merge pull request #6537 from matrix-org/dbkr/allchange
Switch to new changelog generator
2021-08-04 10:02:48 +01:00
James Salter 57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
James Salter 17b935cbc4 Add @sentry/types and rrweb-snapshot as dev dependencies
This is neccessary to resolve re-exported types referred to by posthog-js' type definitions.

This isn't ideal, but

* We intend to start using sentry anyway
* Discussion with posthog maintainers about rrweb-snapshot at https://github.com/PostHog/posthog-js/issues/252, perhaps we can find another solution soon
2021-08-04 09:34:12 +01:00
James Salter 4b78edd652 Remove patch-package and postinstall-postinstall 2021-08-04 09:32:01 +01:00
David Baker 612384a6a3 Switch to new changelog generator
allchange is typescript so has a 'prepare' script to tsc it into
javascript so it can be a binscript - hopefully this won't cause
it to make too much of a pain of itself causing tsc to run on every
yarn add/install
2021-08-03 18:03:46 +01:00
David Baker 28f5dc483b Update eslint plugin & fix silly indenting
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00