mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 02:32:27 +03:00
Code Issues Projects Releases Packages Wiki Activity
12423 commits 219 branches 562 tags 474 MiB
Commit graph

3951 commits

Author SHA1 Message Date
Will Hunt
79d467c551 Add button to open devtools in roomsettings 2018-10-24 17:36:58 +01:00
Bruno Windels
e4dfb90b85 basic makeover of member panel with big avatar 2018-10-24 18:23:34 +02:00
Bruno Windels
873ff7fc29 make EntityTile responsive 2018-10-24 18:22:57 +02:00
David Baker
78d8d22457 Fix emoji replacement in composer 
* Re-scan the slate document tree on each emoji replacement since
   doing a replacement will invalidate all the offsets we have.
 * Reset the emoji regex each time we use it.

Fixes https://github.com/vector-im/riot-web/issues/7550
 2018-10-24 16:46:06 +01:00
Bruno Windels
7244d30c9c guard against empty roomId/non-existant room 2018-10-24 16:44:18 +02:00
Bruno Windels
30e6fdc122 fix lint 2018-10-24 14:36:08 +02:00
Bruno Windels
8c62dddb32 one big commit, sorry 
changing looks of input & buttons
changing background color of right panels
moving invite button around
change margins and paddings in memberlist
 2018-10-24 13:50:58 +02:00
Bruno Windels
5425eda438
Merge pull request #2241 from matrix-org/bwindels/redesignicons1 
Redesign: update (most) icons
 2018-10-23 19:40:59 +00:00
Bruno Windels
e479c72e3c Merge branch 'experimental' into bwindels/roomheader1 2018-10-23 21:39:13 +02:00
Bruno Windels
466062e872
Merge pull request #2239 from matrix-org/bwindels/topleftmenu1 
Redesign: 1st go at top left menu & restyling context menus
 2018-10-23 19:37:05 +00:00
Bruno Windels
88df3d2a81
Merge pull request #2238 from matrix-org/bwindels/initialtimelinetweaks 
Redesign: Initial timeline tweaks
 2018-10-23 19:36:19 +00:00
Bruno Windels
eb453f4539 make icons in composer smaller, better spacing 2018-10-23 18:11:15 +02:00
Bruno Windels
18fedb23ec fix basic room header layout 
make room name take as much space as it needs (but not more than width)
put all items apart from right buttons in one flex container
 so name and topic can grow as required
more small tweaks
 2018-10-23 16:57:56 +02:00
Bruno Windels
4b90fd5c11 move TopLeftMenu to context_menus folder 2018-10-23 15:42:28 +02:00
Bruno Windels
eba91d3edc initial restyle of context menus with drop shadow 2018-10-23 15:23:59 +02:00
Bruno Windels
f2efbc15f4 apply color categories to sender profile name 2018-10-23 10:49:44 +02:00
Bruno Windels
2a264f36b7 style date separator 2018-10-23 10:25:04 +02:00
Travis Ralston
78f527cf95 Remove unused classes 2018-10-22 15:14:21 -06:00
Maxwell Kepler
5e9db3647a Fixed minor typo in comment 2018-10-22 21:03:39 +01:00
Maxwell Kepler
54f9231582 Added badge to GIFs (https://github.com/vector-im/riot-web/issues/7344) 2018-10-22 20:57:58 +01:00
David Baker
9976c4eba5
Merge pull request #2231 from matrix-org/travis/dialog-buttons 
Move all dialog buttons to the right and fix their order
 2018-10-22 15:00:35 +01:00
David Baker
c677dd8a24
Merge pull request #2225 from matrix-org/travis/join-room-text 
Add a bit of text to explain the purpose of the RoomPreviewSpinner
 2018-10-22 13:11:09 +01:00
Travis Ralston
7ef08314b8 Redirect widgets to another location before deleting them 
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
 2018-10-19 16:23:19 -06:00
Travis Ralston
c75beb0196 Revert "Redirect widgets to another location before deleting them" 
This reverts commit 275d88dd4f.
 2018-10-19 16:22:48 -06:00
Travis Ralston
275d88dd4f Redirect widgets to another location before deleting them 
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
 2018-10-19 16:22:20 -06:00
Travis Ralston
9582c1e65a Move all dialog buttons to the right and fix their order 
Fixes https://github.com/vector-im/riot-web/issues/5689

Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.

Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
 2018-10-19 15:33:23 -06:00
Travis Ralston
49efefa630 Fix an error where React doesn't like value=null on a select 
This only happens when there are no canonical aliases for a room.
 2018-10-19 14:18:05 -06:00
Bruno Windels
ebd3d34106 make sure no resize handle is put after last sublist 2018-10-19 18:35:27 +02:00
Bruno Windels
c6924c47fa no need for self 2018-10-19 14:43:54 +02:00
Bruno Windels
d48f19bc19 remove alwaysShowHeader, as now onAddRoom prop determines this 2018-10-19 14:43:02 +02:00
Bruno Windels
5091aa3b43 get rid of emptyContent, also cleanup sublist render method 
also assume empty list in css by default and add nonEmpty class
 2018-10-19 14:41:51 +02:00
Bruno Windels
0386a1e048 get rid of obsolete showEmpty prop 2018-10-19 14:32:49 +02:00
Bruno Windels
ae8723451a remove onShowMoreRooms, as room tiles & scrollbar rendered at same level 2018-10-19 14:27:36 +02:00
Bruno Windels
f14c2cf2b2 don't hide empty sections that have a (+) button 2018-10-19 12:46:59 +02:00
Bruno Windels
6af61ebb09 add plus button for rooms and people 2018-10-19 12:07:36 +02:00
Bruno Windels
d264687796 don't scroll sub list header 2018-10-18 16:25:22 +02:00
Bruno Windels
01082c8595 hook up resizer events 2018-10-18 15:51:58 +02:00
Bruno Windels
39ab3d86bd create sizer that sets item size with flex-basis 
works with the flex-grow we set initially for the sub lists
 2018-10-18 15:51:22 +02:00
Bruno Windels
c1e602d56f scrollbars and resize handles around room sub lists 2018-10-18 15:19:45 +02:00
Bruno Windels
99982b1164 put repeated props in process function 2018-10-18 15:15:56 +02:00
Bruno Windels
c12368ea48 process RoomSubList props through function before creating them 
this way, we'll be able to add adjacent resize handles and scroll wrappers
 2018-10-18 15:09:58 +02:00
Bruno Windels
81d0ce2bcf remove sticky header code 2018-10-18 15:08:32 +02:00
Travis Ralston
af8dfda9a7 Add a bit of text to explain the purpose of the RoomPreviewSpinner 
Fixes https://github.com/vector-im/riot-web/issues/5869
 2018-10-17 13:53:12 -06:00
Bruno Windels
6906d5a5f9 remove DND for room tiles 2018-10-17 16:02:35 +02:00
Bruno Windels
8d3347bcfb fix lint 2018-10-17 13:36:15 +02:00
Travis Ralston
b929c36222 Documentation++ 2018-10-16 09:19:36 -06:00
Bruno Windels
cc29dd08da don't always show badge (leftover) 2018-10-16 14:54:14 +02:00
Bruno Windels
01471abdc5 Merge branch 'bwindels/redesign' into bwindels/resizehandles 2018-10-16 11:57:59 +02:00
Bruno Windels
6878ce3c6a Merge branch 'develop' into bwindels/redesign 2018-10-16 11:57:44 +02:00
Travis Ralston
d87ab8aac0 Support m.login.terms during registration 
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
 2018-10-15 16:39:59 -06:00
Aaron Raimist
9f1b1d2028
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:50:24 -05:00
Aaron Raimist
a66dbccef8
Fix lint errors in MessageComposerInput.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:46:55 -05:00
Aaron Raimist
1287d9c49b
Fix lint errors in Notifications.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:44:02 -05:00
Aaron Raimist
d452dd2b74
Fix lint error in LazyLoadingResyncDialog.js 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 22:32:25 -05:00
Aaron Raimist
58488c076e
Fix more lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-11 21:54:55 -05:00
David Baker
9c8e5119ba
Merge pull request #2206 from matrix-org/dbkr/slate_update_fix_quote 
Fix quote post slate update
 2018-10-11 11:09:25 +01:00
David Baker
3efc09586b More API changes 2018-10-11 10:47:36 +01:00
David Baker
4d1f2cdfa9 Fix quote post slate update 
Missed API update
 2018-10-11 10:29:55 +01:00
Bruno Windels
bba04a6820
Merge pull request #2205 from matrix-org/dbkr/lazy_load_check_before_sync 
Handle InvalidStoreError from js-sdk
 2018-10-10 18:35:36 +02:00
David Baker
0abcb5c78d Handle InvalidStoreError from js-sdk 
js-sdk now emits sync state ERROR with an InvalidStoreError if the
store needs to be cleared before it can be used.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/759
 2018-10-10 17:07:17 +01:00
Bruno Windels
dfb4c594a8
Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars 
Fall back to default avatar in RR when member isn't loaded yet
 2018-10-10 16:58:59 +02:00
Bruno Windels
0767c278e7 put userId next to member in read receipt, fall back when member missing 2018-10-10 16:14:09 +02:00
David Baker
97ed4ed0bb
Merge pull request #2202 from matrix-org/dbkr/update_slate 
Update to new version of slate
 2018-10-10 11:10:20 +01:00
David Baker
4e1fabd140 Remove spurious ...atributes in the wrong place 
We already have it above
 2018-10-09 16:05:14 +01:00
David Baker
67e8a6f9dc Recovery key formatting is now done by the js-sdk 2018-10-09 14:01:58 +01:00
David Baker
41bc42e7d7
Merge pull request #2194 from pvagner/more_accessible_buttons 
More accessible buttons - take 2
 2018-10-09 11:04:50 +01:00
David Baker
c1f51a76dd Update to new version of slate 
Lots of fixes here as a lot of the API has changed (eg. anchorKey /
offsetKey are now anchor.key and offset.key, and collapseFocusToThing
is moveFocusToThing).

Also changes the ref to a function (sorry for lumping this into the
same PR).

Hopefully will fix https://github.com/vector-im/riot-web/issues/7105
 2018-10-09 10:55:55 +01:00
Bruno Windels
48299bb154 show warning when LL is disabled but was enabled before 2018-10-08 15:28:00 +02:00
David Baker
387128ed1e Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-05 14:01:50 +01:00
David Baker
8ceca3abe9
Update Pill.js 
Commas are not semicolons
 2018-10-04 10:34:34 +01:00
Will Hunt
17915b5082
Merge branch 'develop' into hs/purge-irc-hack 2018-10-03 19:39:14 +01:00
Will Hunt
fe788486b7 Drop (IRC) suffix hacks 2018-10-03 19:34:06 +01:00
David Baker
849f0f796a js-sdk now handles recovery key formatting 2018-10-03 12:02:50 +01:00
Peter Vágner
2b394c1869
Address review comments and fix lint errors 2018-10-02 20:32:54 +02:00
David Baker
56808077d0 js-sdk now handle recovery key formatting 2018-10-02 19:24:39 +01:00
Peter Vágner
e05ae29146
Also fix accessibility of sticker buttons 2018-10-02 20:19:21 +02:00
David Baker
fa30707eae Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-02 16:59:15 +01:00
Peter Vágner
ded35e43a0
A11y: repurpose more divs into AccessibleButtons. 
With this more of the
controls that look like buttons can be operated via the keyboard and
navigated to by screen reader users. This includes editor buttons such
as File upload, Audio / Video call, Right pannel hide button, Jump to
the bottom timeline button, and some more buttons found in the user
settings.
Also I have added alt texts to some images that in turn label buttons
which these happen to be packed in and removed some untranslated alt
texts from decorative non-actionable images that might add more
verbosity when talking about screen reader user experience.
 2018-10-02 13:55:24 +02:00
David Baker
3751074244
Merge pull request #2180 from matrix-org/travis/3pid-required 
Communicate early that a 3pid is required during registration if needed
 2018-10-01 11:55:53 +01:00
Matthew Hodgson
6652d2b0e6 try to encourage people to attach logs to bugs 2018-09-28 21:05:05 +01:00
Travis Ralston
de132a8f8e Communicate early that a 3pid is required during registration if needed 
Fixes https://github.com/vector-im/riot-web/issues/7297
 2018-09-27 11:53:45 -06:00
Bruno Windels
f4860cfe63 update copyright notice 2018-09-26 18:22:05 +01:00
Bruno Windels
fd2ab406d4 update copy 2018-09-26 16:48:04 +01:00
Bruno Windels
824ad5e318 delete sync data when LL is toggled, show message when enabling 2018-09-26 16:25:21 +01:00
Bruno Windels
928b6d47c8 add resize handles between 3 main app columns 2018-09-24 16:07:42 +01:00
Bruno Windels
91ec96c8d3 Merge branch 'develop' into bwindels/redesign 2018-09-21 12:44:44 +02:00
Matthew Hodgson
0f806d5b99 Merge branch 'develop' into matthew/canonical_aliases 2018-09-20 01:45:08 +01:00
Matthew Hodgson
e9806bb147 autocomplete domains on aliases 2018-09-20 01:38:25 +01:00
Matthew Hodgson
1aa85c69e4 fix vector-im/riot-web#7293 2018-09-20 01:23:29 +01:00
Matthew Hodgson
c6fa8ea24c show canonical aliases in timeline, and set/remove implicit ones 2018-09-20 01:07:01 +01:00
Bruno Windels
920e0d397c Merge branch 'develop' into bwindels/fixstalerr 2018-09-19 12:15:41 +02:00
David Baker
2cef0f7f72 lint 2018-09-18 15:04:51 +01:00
Matthew Hodgson
d39889e2cf
Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases 
Add m.room.aliases to the timeline
 2018-09-18 11:14:44 +01:00
Matthew Hodgson
ece041d059 fix NPE on name (related to LL?) 2018-09-18 00:16:25 +01:00
Bruno Windels
8c4f4765df remove initial parameter and show available members on invite instead 2018-09-17 20:03:01 +02:00
Bruno Windels
0727e0f8d3 mounted can be set straight in componentWillMount 2018-09-17 20:02:15 +02:00
Bruno Windels
e8b4770940 fix lint 2018-09-17 20:01:55 +02:00
Matthew Hodgson
0e1a814d23 remove RoomAliasesEvent in favour of simpler textual event 2018-09-17 18:27:17 +01:00
Bruno Windels
e0a789f77e remove untrue comment, as we only load the members when joining 2018-09-17 19:21:22 +02:00
Bruno Windels
e1b9aa9626 better naming and document method 2018-09-17 19:20:26 +02:00
Matthew Hodgson
dc7212ec2b switch back to simple TextForEvent 
I haven't found anyone who can justify to me why we need
more complicated plurals for i18n (even in Polish) for
%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.
 2018-09-17 18:20:12 +01:00
Bruno Windels
d276b17c2a remove dead code 2018-09-17 19:19:07 +02:00
Bruno Windels
c3914d3493 show empty list as initial state instead of spinner 
the spinner should only be shown when joined
 2018-09-17 19:18:55 +02:00
Bruno Windels
2ed414494f use Room.myMembership event instead of RoomMember.membership for me 
This is more reliable with LL enabled as the syncing user is
only known when it was active in the current timeline
or when the members have been loaded
 2018-09-17 19:14:52 +02:00
David Baker
12d10cccef Show if sig is from this device 2018-09-17 17:14:03 +01:00
David Baker
f507aac3d5 Show if recovery key is valid 2018-09-17 17:05:29 +01:00
David Baker
9a65e6817a Support restoring key backup 2018-09-17 16:00:23 +01:00
Matthew Hodgson
3b868064c7 merge in develop 2018-09-16 19:06:52 +01:00
David Baker
2e6d27717c LIIIIIIIIIIIIIIIINT! 2018-09-14 17:33:25 +01:00
David Baker
d94553bafc UI for whether the key backup is enabled or not 2018-09-14 17:08:02 +01:00
Bruno Windels
27c496aecb remove unneeded async keywords 2018-09-14 13:55:47 +02:00
Bruno Windels
f194f323f4 postpone loading the members until the user joined the room 
when peeking, the members weren't being loaded at all because
the room wasn't available yet,
and the need for loading the members was never re-evaluated after that.

This only loads the members once the user has joined the room,
which also helps to avoid load all the members before an invite
is accepted.
 2018-09-13 18:43:24 +02:00
David Baker
292b1f09af WIP e2e key backups 
Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.

Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh.
 2018-09-13 17:11:46 +01:00
David Baker
59e4879b14 Merge remote-tracking branch 'origin/develop' into matthew/e2e_backups 2018-09-11 13:03:22 +01:00
David Baker
518be24a5b
Merge pull request #2164 from matrix-org/dbkr/dont_exit_fullscreen_when_not 
Don't try to exit fullscreen if not fullscreen
 2018-09-11 13:03:09 +01:00
David Baker
f62e92a07b Merge remote-tracking branch 'origin/develop' into matthew/e2e_backups 2018-09-11 11:37:22 +01:00
David Baker
d3038ea765 Don't try to exit fullscreen if not fullscreen 
This was causing annoying exceptions on latest Chrome. Use
document.fullScreenElement to detect if we're fullscreen and don't
try to exit if we aren't.
 2018-09-11 11:31:24 +01:00
Bruno Windels
ecaabd6b75
Merge pull request #2161 from matrix-org/bwindels/dontupdatememberlistwhileloading 
avoid updating the memberlist while the spinner is shown
 2018-09-11 10:57:29 +02:00
Bruno Windels
2aaf3e6b89 dont assign member in getInitialState 2018-09-10 17:39:03 +02:00
Bruno Windels
92f7e29132 missed one {} -> [], fix e2e tests 2018-09-10 17:32:40 +02:00
Bruno Windels
5044d4f2d6 dont keep the spinner in the memberlist when fetching /members fails 2018-09-10 14:56:10 +02:00
Bruno Windels
0cd222ef0b make users available in member by requesting them from client right before 
before this was already foreseen, but memberDict wasn't being refreshed
as it's only used in roomMembers(), I got rid of memberDict as well
 2018-09-07 23:44:20 +02:00
Bruno Windels
7fe822ca17 Merge branch 'develop' into bwindels/dontupdatememberlistwhileloading 2018-09-07 23:43:25 +02:00
Bruno Windels
467cdd2f1f Merge branch 'develop' into bwindels/optimizememberlist 2018-09-07 18:32:13 +02:00
Bruno Windels
9cc9fbf924 avoid memberlist refresh for events related to rooms other but the current 2018-09-07 14:05:26 +02:00
Bruno Windels
fec7d2ee5f avoid updating the memberlist while the spinner is shown 
the memberlist gets updated constantly while the LL members
are being added to the room state. this slows things down unneed, and is one of the
main cause of dropping frames when member arrive.
 2018-09-07 12:00:19 +02:00
David Baker
c8ab8bf5f8
Merge pull request #2150 from matrix-org/dbkr/disable_ilag_if_unsupported 
Do full registration if HS doesn't support ILAG
 2018-09-06 16:23:32 +01:00
Bruno Windels
26df485607 Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission 2018-09-06 15:35:41 +02:00
David Baker
4c8d2de563
Revert "Revert "Don't rely on room members to query power levels"" 2018-09-06 11:48:23 +01:00
David Baker
9e64a22884 s/DidMount/WillMount/ in MessageComposerInput 
This fixes the tests that broke with https://github.com/matrix-org/matrix-js-sdk/pull/717

This is because of https://github.com/vector-im/riot-web/blob/master/test/app-tests/joining.js#L63
which prevents the DOM nodes from actually ending up in the DOM, even though the react components
get rendered. This means that WillMount and WillUnmount are called, but not DidMount.

Using WillMount is more symmertrical anyway since the resulting teardown code must be in
WillUnmount (since there is no DidUnmount).
 2018-09-06 11:44:13 +01:00
David Baker
27fa21e403 Replace view_set_mxid with require_registration 
To put all the other flows through the to-ilag-or-not-to-ilag flow
 2018-09-05 18:08:49 +01:00
David Baker
34d27954cf
Revert "Don't rely on room members to query power levels" 2018-09-05 18:03:48 +01:00
Bruno Windels
8500a7131f avoid unneeded lookups in memberDict 
have members be an array of RoomMember instead of userId, so
we can avoid multiple lookups when sorting, rendering, ...
 2018-09-05 15:25:08 +02:00
Bruno Windels
50de22fb51
Merge pull request #2145 from matrix-org/bwindels/fixllroompermission 
Don't rely on room members to query power levels
 2018-09-05 13:07:55 +02:00
David Baker
4517eaba6f
Merge pull request #2148 from matrix-org/dbkr/dont_say_email_optional_if_it_isnt 
Correctly mark email as optional
 2018-09-05 11:31:19 +01:00
David Baker
a07799879c Fix tests 2018-09-04 18:50:18 +01:00
David Baker
dc14a42148 Correctly mark email as optional 
Look at the flows to see if there is one we can complete without
an email address. Mark the email address as optional iff there is.
 2018-09-04 18:26:09 +01:00
Bruno Windels
bc97a3efb5
Merge pull request #2143 from matrix-org/bwindels/fixreconnectspinner 
Fix: show spinner again while recovering from connection error
 2018-09-04 16:40:30 +02:00
Bruno Windels
be66f98381 use room method for checking power levels 
as it is always are of the syncing user's membership
in case of lazy loading members
 2018-09-04 15:35:44 +02:00
Bruno Windels
1eabb6012a
Merge pull request #2139 from matrix-org/bwindels/memberlist-spinner 
Show spinner in member list while loading members
 2018-09-03 15:05:27 +02:00
Bruno Windels
cae419e304 avoid rerendering when LL is disabled 2018-09-03 11:13:56 +02:00
Bruno Windels
debcc20604 also show spinner on new CATCHUP state 2018-08-30 15:39:48 +02:00
David Baker
75a2668e42
Merge pull request #2141 from matrix-org/bwindels/fixdmavatar 
Fix DM avatar
 2018-08-30 11:45:54 +01:00
Bruno Windels
d7868dbe33 delegate avatar selection to room for rooms with two members (but not in m.direct) 2018-08-30 10:54:01 +02:00
David Baker
2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone 
Support m.room.tombstone events
 2018-08-29 18:38:48 +01:00
David Baker
6cbe4144d4 unused import 2018-08-29 18:28:16 +01:00
David Baker
c40ac49b2a Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate 2018-08-29 18:18:08 +01:00
David Baker
bd0a9cf3a0 Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade 2018-08-29 15:51:07 +01:00
Bruno Windels
f9c40390e9 set state after setting _showPresence to avoid all members to appear offline on matrix.org 2018-08-29 11:09:55 +02:00
Bruno Windels
e9e5abfcc5 show a spinner in the memberlist while loading the members 2018-08-29 10:30:25 +02:00