PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
36877 commits 1 branch 0 tags 338 MiB
Commit graph

29173 commits

Author SHA1 Message Date
Tirifto
c4e4b91302 Translated using Weblate (Esperanto) 
Currently translated at 92.7% (2891 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2021-08-12 08:23:40 +00:00
Jeff Huang
dc3fd69736 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3117 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-08-12 08:23:36 +00:00
Šimon Brandner
ccaa69b25b
Remove unnecessary code 
This somehow doesn't seem to be neccessary anymore, I don't really know why but everything seems to work without it

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 08:53:42 +02:00
Šimon Brandner
29d20b8125
Use AccessibleTooltipButton 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 08:11:11 +02:00
Weblate
fe6af71590 Merge branch 'origin/develop' into Weblate. 2021-08-11 22:19:01 +00:00
waclaw66
23b59b15e2 Translated using Weblate (Czech) 
Currently translated at 100.0% (3116 of 3116 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-11 22:19:01 +00:00
Szimszon
7265874217 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3116 of 3116 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-08-11 22:18:59 +00:00
Michael Telatynski
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
Michael Telatynski
69cf64249f add comment 2021-08-11 21:50:26 +01:00
Michael Telatynski
5d98c6f02d Iterate PR based on feedback 2021-08-11 21:45:49 +01:00
Šimon Brandner
012f2c9e7e
This doesn't need to be here as it was moved into CallViewButtons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-11 19:16:55 +02:00
David Baker
abba7983ce
Merge pull request #6578 from SimonBrandner/task/export-call-view-buttons 
Move Call View Buttons into a separate component
 2021-08-11 18:09:48 +01:00
James Salter
cc9ddb351f Remove test error on startup, and send correct user text 2021-08-11 18:01:22 +01:00
James Salter
ba1618812c Send user text as context 2021-08-11 18:00:21 +01:00
James Salter
c6202bf653 lint 2021-08-11 18:00:21 +01:00
James Salter
dface1928d Load all rageshake attributes 2021-08-11 18:00:21 +01:00
James Salter
de398f46f4 initial spike 2021-08-11 18:00:21 +01:00
Travis Ralston
a149108a7d
Merge pull request #6353 from SimonBrandner/feature/improved-composer 
Improve handling of pills in the composer
 2021-08-11 10:55:13 -06:00
Michael Telatynski
54d85a3864 Iterate PR based on feedback 2021-08-11 16:32:48 +01:00
Šimon Brandner
833a5ee182
Don't set hidden RRs labs setting at account level 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-11 14:37:35 +02:00
Dariusz Niemczyk
723400ace6
Add a comment for weirdly placed div 2021-08-11 10:56:36 +02:00
Hubert Chathi
82c34e9ed1
Update src/utils/DecryptFile.ts 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-08-10 19:37:18 -04:00
Hubert Chathi
3b9810719f use the mimetype from the info property rather than the EncryptedFile 
the mimetype in EncryptedFile is undocumented and redundant.
see https://github.com/matrix-org/matrix-doc/pull/2582
 2021-08-10 19:27:24 -04:00
Dariusz Niemczyk
c872609ed3
Modify encrypted images loading for better UX 
Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query.
 2021-08-10 19:24:17 +02:00
David Baker
50aa3d6c46 Upscale thumbnails to the container size 
Force thumbnails to be the size of the container, even if that means
upscaling them. As per comment, this will mean that the thumbnails
will sometimes be larger and a bit blurry rather than small. It looks
like this was probably a source of scroll jumps before.

As per comment, a better fix would be to be be able to know what
size thumbnails the HS will give us so we can size the containers
appropriately.

Type: defect
Regressed by: https://github.com/matrix-org/matrix-react-sdk/pull/6514
Fixes https://github.com/vector-im/element-web/issues/18307
 2021-08-10 15:14:04 +01:00
Michael Telatynski
77cf5bf613 Update space create menu copy and add link to community migrator 2021-08-10 11:30:00 +01:00
Michael Telatynski
d90321d813 Iterate PR, merge types with @types/PushRules 2021-08-10 11:03:03 +01:00
Weblate
a09ebfe2b5 Merge branch 'origin/develop' into Weblate. 2021-08-10 09:34:35 +00:00
Ihor Hordiichuk
49ab42613c Translated using Weblate (Ukrainian) 
Currently translated at 45.8% (1428 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-08-10 09:34:35 +00:00
jelv
a9d3219838 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3115 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-10 09:34:33 +00:00
Michael Telatynski
6877c8fe0c
Merge pull request #6587 from matrix-org/t3chguy/fix/18465 
Fix create room dialog in spaces no longer adding to the space
 2021-08-10 10:34:26 +01:00
Michael Telatynski
cd1b315ed6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/12 2021-08-10 10:21:01 +01:00
Michael Telatynski
b7246404be Fix create room dialog in spaces no longer adding to the space 2021-08-10 10:05:19 +01:00
Michael Telatynski
195b8714fc Iterate PR based on feedback 2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01:00
Michael Telatynski
857bb9db44 Add some treeview labels 2021-08-10 09:46:25 +01:00
想不出网名
3a6bfe3572 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.4% (2973 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-08-09 18:27:43 +00:00
想不出网名
a5921597ed Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.4% (2973 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-08-09 18:16:23 +00:00
random
1b55269c61 Translated using Weblate (Italian) 
Currently translated at 99.9% (3114 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-08-09 16:55:10 +00:00
想不出网名
127c58a10d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.2% (2966 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-08-09 16:55:05 +00:00
jelv
177b34da6b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3115 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-09 16:55:03 +00:00
Glandos
b6f9b6a95f Translated using Weblate (French) 
Currently translated at 99.9% (3112 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-08-09 16:55:00 +00:00
Michael Telatynski
0f49fe92c6 iterate spaces treeview stuff 2021-08-09 14:01:34 +01:00
Michael Telatynski
09f20bcda7 Make space hierarchy a treeview 2021-08-09 10:29:55 +01:00
Germain
298318c0ee
Merge branch 'develop' into i18n-bracket-fix 2021-08-09 09:07:32 +01:00
Weblate
13f84bffce Merge branch 'origin/develop' into Weblate. 2021-08-08 17:55:30 +00:00
Dariusz Niemczyk
6663f01c6c
Merge pull request #6580 from SimonBrandner/fix/reject-modal 
Don't show a modal on call reject/user hangup
 2021-08-08 19:55:27 +02:00
Weblate
55d34b14c2 Merge branch 'origin/develop' into Weblate. 2021-08-08 17:54:47 +00:00
HelaBasa
c719b0e3cc Translated using Weblate (Sinhala) 
Currently translated at 0.3% (10 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/si/
 2021-08-08 17:54:47 +00:00
waclaw66
145f841982 Translated using Weblate (Czech) 
Currently translated at 100.0% (3116 of 3116 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-08 17:54:47 +00:00
想不出网名
4418aa6a4a Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.2% (2966 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-08-08 17:54:44 +00:00
Thibault Martin
26453fdb06 Translated using Weblate (French) 
Currently translated at 99.3% (3094 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-08-08 17:54:42 +00:00
monochromec
4c51c1b339 Translated using Weblate (English (United States)) 
Currently translated at 16.9% (529 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/en_US/
 2021-08-08 17:54:40 +00:00
artevaeckt
cec4a17683 Translated using Weblate (German) 
Currently translated at 96.2% (2999 of 3116 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-08-08 17:54:39 +00:00
Šimon Brandner
96b651e326
Fade buttons after componentDidMount 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 11:26:57 +02:00
Šimon Brandner
eb49960497
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 11:20:52 +02:00
Šimon Brandner
d0e76a0ecd
Use CallViewButtons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 11:20:17 +02:00
Šimon Brandner
9f28c30145
Add CallViewButtons.tsx 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 11:16:55 +02:00
Šimon Brandner
2d5dc6d529
Break instead of return 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 21:30:58 +02:00
Šimon Brandner
78f53b3f6b
Don't show modal on reject/user hangup 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 21:28:35 +02:00
Weblate
06287aefbd Merge branch 'origin/develop' into Weblate. 2021-08-07 15:09:25 +00:00
Travis Ralston
92a60497d2
Merge pull request #6572 from matrix-org/travis/voice-messages/stop-left 
Move stop button to the left of the waveform
 2021-08-07 09:09:21 -06:00
Weblate
70c702945c Merge branch 'origin/develop' into Weblate. 2021-08-07 14:16:01 +00:00
Michael Telatynski
7598ce6ca3
Merge pull request #6576 from SimonBrandner/fix/export-default 
Export components by default
 2021-08-07 15:15:57 +01:00
Besnik Bleta
a88349ea1d Translated using Weblate (Albanian) 
Currently translated at 99.7% (3107 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-08-07 13:50:27 +00:00
Weblate
7db235351c Merge branch 'origin/develop' into Weblate. 2021-08-07 09:21:03 +00:00
XoseM
7e5c9dd92e Translated using Weblate (Galician) 
Currently translated at 100.0% (3115 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-08-07 09:21:03 +00:00
Jeff Huang
7be0a05b36 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3115 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-08-07 09:20:58 +00:00
Nikita Epifanov
095319087c Translated using Weblate (Russian) 
Currently translated at 98.3% (3065 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-08-07 09:20:56 +00:00
Szimszon
7f7536d634 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3115 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-08-07 09:20:52 +00:00
iaiz
b3585c6dee Translated using Weblate (Spanish) 
Currently translated at 99.8% (3111 of 3115 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-08-07 09:20:48 +00:00
Šimon Brandner
d8b492f47d
Correctly hide fullscreen button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 09:38:26 +02:00
Šimon Brandner
63ed852c68
Fix typo which caused the wrong PiP position 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 09:31:32 +02:00
Šimon Brandner
2ce75d45b2
Fix tranlation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 09:16:34 +02:00
Šimon Brandner
5c90736213
Export components by default 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 08:54:40 +02:00
Weblate
fa38d39c70 Merge branch 'origin/develop' into Weblate. 2021-08-06 16:03:35 +00:00
Dariusz Niemczyk
b6f7c4fe95
Merge pull request #6475 from matrix-org/jitsi-picture-in-picture 
Refactor Calls components into smaller pieces for future Widgets work
 2021-08-06 18:03:30 +02:00
Dariusz Niemczyk
b73c73f07c
Fix missing string 2021-08-06 17:47:59 +02:00
Dariusz Niemczyk
ebee78acc8
Fix dangling ';' 2021-08-06 17:45:14 +02:00
Weblate
d2c4018079 Merge branch 'origin/develop' into Weblate. 2021-08-06 15:42:17 +00:00
Travis Ralston
b2a2b35243
Merge pull request #6565 from SimonBrandner/fix/codeblock-expand/18388 
Fix missing expand button on codeblocks
 2021-08-06 09:42:13 -06:00
Weblate
aab81be3f0 Merge branch 'origin/develop' into Weblate. 2021-08-06 15:27:18 +00:00
Travis Ralston
6a9ebc6902
Merge pull request #6390 from SimonBrandner/feature/hidden-rrs 
Support for MSC2285 (hidden read receipts)
 2021-08-06 09:27:14 -06:00
Weblate
a624e24790 Merge branch 'origin/develop' into Weblate. 2021-08-06 15:25:17 +00:00
Nikita Epifanov
ab4cd775a1 Translated using Weblate (Russian) 
Currently translated at 98.3% (3063 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-08-06 15:25:17 +00:00
Travis Ralston
f53451df65
Merge pull request #6349 from SimonBrandner/feature/collapse-pinned-mels/17938 
Group pinned message events with MELS
 2021-08-06 09:25:08 -06:00
Travis Ralston
cab4f2e402 Move stop button to the left of the waveform 
Fixes https://github.com/vector-im/element-web/issues/18416
 2021-08-06 09:00:18 -06:00
Dariusz Niemczyk
7513f5ba7c
Fix types 2021-08-06 16:43:20 +02:00
Dariusz Niemczyk
cba87f433b
Fix merge conflicts 2021-08-06 16:31:04 +02:00
Dariusz Niemczyk
4328083ea7
Rename css 2021-08-06 16:31:04 +02:00
Michael Telatynski
6fddfe0d59 Fix dropdown keyboard selection accessibility 2021-08-06 14:48:46 +01:00
Michael Telatynski
3fd2c00516 Improve aria labels around spaces avatar uploader 2021-08-06 14:46:02 +01:00
Weblate
359d39330d Merge branch 'origin/develop' into Weblate. 2021-08-06 13:45:57 +00:00
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout 2021-08-06 14:45:54 +01:00
Weblate
03eda907fb Merge branch 'origin/develop' into Weblate. 2021-08-06 13:42:41 +00:00
Nikita Epifanov
3dbb72e88c Translated using Weblate (Russian) 
Currently translated at 98.3% (3063 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-08-06 13:42:41 +00:00
Germain
da79581744
Merge pull request #6567 from SimonBrandner/fix/connecting-states/18404 
Don't flash "Missed call" when accepting a call
 2021-08-06 14:42:31 +01:00
Weblate
543238a470 Merge branch 'origin/develop' into Weblate. 2021-08-06 13:34:40 +00:00
Nikita Epifanov
b216e3aa23 Translated using Weblate (Russian) 
Currently translated at 98.3% (3063 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-08-06 13:34:40 +00:00
Germain
40eb9ae452
Merge pull request #6571 from SimonBrandner/fix/reply-whitespace/18327 
Fix clicking whitespaces on replies
 2021-08-06 14:34:31 +01:00
Michael Telatynski
7a11279682 Fix dropdown negative wraparound for keyboard accessibility 2021-08-06 14:21:56 +01:00
Michael Telatynski
54fb24f359 Fix dropdown keyboard accessibility when filter is disabled 2021-08-06 14:21:41 +01:00
Weblate
8b6deace1e Merge branch 'origin/develop' into Weblate. 2021-08-06 13:20:02 +00:00
Travis Ralston
2c601e0ff1
Merge pull request #6562 from matrix-org/travis/voice-messages/disable-composer 
Fix disabled state for voice messages + send button tooltip
 2021-08-06 07:19:58 -06:00
Šimon Brandner
0e041f2e77
Fix clicking whitespaces on replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 15:06:11 +02:00
Weblate
fc9ae859be Merge branch 'origin/develop' into Weblate. 2021-08-06 12:44:23 +00:00
Nikita Epifanov
c49bb453f5 Translated using Weblate (Russian) 
Currently translated at 98.3% (3061 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-08-06 12:44:23 +00:00
Michael Telatynski
81b70c6955
Merge pull request #6570 from SimonBrandner/feature/call-length/18405 2021-08-06 13:44:14 +01:00
Šimon Brandner
8368aa13ca
length -> duration 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 14:38:53 +02:00
Šimon Brandner
43325eb866
date -> delta 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 14:24:14 +02:00
Dariusz Niemczyk
8ac82457e8
Update src/components/views/voip/PictureInPictureDragger.tsx 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 14:10:59 +02:00
Šimon Brandner
c1449ff01a
Show call length 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 13:59:26 +02:00
Weblate
7ed191e729 Merge branch 'origin/develop' into Weblate. 2021-08-06 11:59:19 +00:00
Dariusz Niemczyk
efc63f1f77
Merge pull request #6560 from matrix-org/palid/fix/18384 
Fix [object Object] in Widget Permissions
 2021-08-06 13:59:14 +02:00
Weblate
fb2a85c4b9 Merge branch 'origin/develop' into Weblate. 2021-08-06 11:57:49 +00:00
Priit Jõerüüt
5e1acf22f5 Translated using Weblate (Estonian) 
Currently translated at 98.7% (3075 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-08-06 11:57:49 +00:00
William Weber Berrutti
f58179c9da Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 90.7% (2826 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2021-08-06 11:57:43 +00:00
Nikita Epifanov
08cd95615d Translated using Weblate (Russian) 
Currently translated at 98.3% (3061 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-08-06 11:57:41 +00:00
Šimon Brandner
5a284b62eb
Add formatCallTime 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 13:57:27 +02:00
Jeff Huang
04f6ec1d7c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3113 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-08-06 11:56:49 +00:00
waclaw66
4718861031 Translated using Weblate (Czech) 
Currently translated at 100.0% (3113 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-06 11:56:45 +00:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +01:00
Dariusz Niemczyk
6d4ef6b1a4
Fix [object Object] in Widget Permissions 2021-08-06 13:54:00 +02:00
Michael Telatynski
facc882a11 i18n and add space null guard for home space 2021-08-06 12:50:32 +01:00
Dariusz Niemczyk
f6c4412b5f
Remove old translations 2021-08-06 13:30:20 +02:00
Dariusz Niemczyk
e8762fbe5b
Fix merge conflicts 2021-08-06 13:28:53 +02:00
Michael Telatynski
1a1b1738c1 Add aria label to clickable notification badge on space panel 2021-08-06 12:28:46 +01:00
Michael Telatynski
3895345250 Fix disabled state on AccessibleButton not being exposed via ARIA 2021-08-06 12:28:20 +01:00
Michael Telatynski
d285a45da5 Fix stray tabIndex on AutoHideScrollbar component in FF 2021-08-06 12:28:06 +01:00
Dariusz Niemczyk
35386078a4
Post-merge changes 2021-08-06 13:25:27 +02:00
Dariusz Niemczyk
3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture 
* origin/develop: (100 commits)
  Add comments to isRegionalIndicator
  Stop voice messages that are playing when starting a recording
  Properly set style attribute on shared usercontent iframe
  Fix in-call context menus when in PiP mode (#6552)
  Extract tooltipYOffset to a const
  Increase yOffset by 4px away
  i18n
  Post-merge conflict resolution and improve alignment of tooltips
  Fix image & blurhash info when skipping thumbnail due to thresholds
  Skip sending a thumbnail if it is not a sufficient saving over the original
  Null guard space inviter to prevent the app exploding
  Remove seams from pin icon
  Appease Jest
  Fix worklet reference for new webpack pipeline
  i18n
  Update copy
  Fix wrong cursor being used in PiP
  Fix voice feed cut-off
  Use flex-start as it has more universal support
  Wrap cases in {}
  ...
 2021-08-06 13:25:14 +02:00
Michael Telatynski
f7818e0169 iterate PR based on feedback 2021-08-06 12:05:14 +01:00
Šimon Brandner
6d6fa46541
Add connecting states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 12:42:38 +02:00
Michael Telatynski
64995dfae7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-06 11:39:24 +01:00
Šimon Brandner
b05038ebd5
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:47:59 +02:00
Šimon Brandner
6afd75ac3c
Update/fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:40:26 +02:00
Šimon Brandner
25c6b216b0
Move LayoutSwitcher CSS to a separate file 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:37:42 +02:00
Šimon Brandner
186acf92a9
Wrap in () 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:30:38 +02:00
Šimon Brandner
85f5ec3a94
Move LayoutSwitcher into a separate component 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 10:27:18 +02:00
Šimon Brandner
67fdbf97e5
Round percentageOfViewport 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 09:17:00 +02:00
Šimon Brandner
49f41498ea
Remove dupe import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 08:19:49 +02:00
Šimon Brandner
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 2021-08-06 08:02:28 +02:00
Šimon Brandner
44acded0a0
Use snake case 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:55:08 +02:00
Šimon Brandner
f7e750df60
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:54:56 +02:00
Šimon Brandner
015e0b6d77
Make into a labs feature 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:51:57 +02:00
Šimon Brandner
422c27fcef
Reorder code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:46:01 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:45:17 +02:00
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 07:43:19 +02:00
Weblate
b2be794bfe Merge branch 'origin/develop' into Weblate. 2021-08-05 22:02:05 +00:00
Robin Townsend
fef2d408f6 Add comments to isRegionalIndicator 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-08-05 17:56:16 -04:00
Robin Townsend
4ace2353e3 Merge branch 'develop' into regional-indicators 2021-08-05 17:41:37 -04:00
waclaw66
5194f44370 Translated using Weblate (Czech) 
Currently translated at 100.0% (3113 of 3113 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-05 21:39:20 +00:00
Weblate
c8d34e1624 Merge branch 'origin/develop' into Weblate. 2021-08-05 19:36:22 +00:00
Travis Ralston
3b73c17465
Merge pull request #6181 from pvagner/voip-a11y 
Make call control buttons accessible to screen reader users
 2021-08-05 13:36:17 -06:00
Weblate
09b1ee5505 Merge branch 'origin/develop' into Weblate. 2021-08-05 19:00:15 +00:00
Michael Telatynski
e9b1db6518
Merge pull request #6559 from matrix-org/t3chguy/fix/17906 2021-08-05 20:00:11 +01:00
Weblate
a941f5a574 Merge branch 'origin/develop' into Weblate. 2021-08-05 18:56:52 +00:00
waclaw66
f751bcd690 Translated using Weblate (Czech) 
Currently translated at 100.0% (3102 of 3102 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-05 18:56:52 +00:00
Travis Ralston
17a3dc5e6d Stop voice messages that are playing when starting a recording 
Fixes https://github.com/vector-im/element-web/issues/18410
 2021-08-05 12:44:12 -06:00
Travis Ralston
fea30e5f5f Fix disabled state for voice messages + send button tooltip 
Fixes https://github.com/vector-im/element-web/issues/18413
 2021-08-05 12:38:15 -06:00
Weblate
8f8ab213c4 Merge branch 'origin/develop' into Weblate. 2021-08-05 17:27:36 +00:00
Travis Ralston
81ddaf2efa Properly set style attribute on shared usercontent iframe 
Fixes https://github.com/vector-im/element-web/issues/18414
 2021-08-05 11:21:22 -06:00
Weblate
66c5b857a6 Merge branch 'origin/develop' into Weblate. 2021-08-05 15:33:26 +00:00
Andrew Morgan
df888a1886
Fix in-call context menus when in PiP mode (#6552) 
Mounting them as children when in PiP mode doesn't work. Condition mounting
the context menus as children of the current component based on whether PiP
mode is active.
 2021-08-05 16:33:22 +01:00
Weblate
1d0f78191b Merge branch 'origin/develop' into Weblate. 2021-08-05 14:36:58 +00:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading 
Improve voice messages uploading state
 2021-08-05 08:36:53 -06:00
Weblate
49434b4eb8 Merge branch 'origin/develop' into Weblate. 2021-08-05 14:34:36 +00:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21 
Polish up more of the voice messages UI
 2021-08-05 08:34:31 -06:00
Michael Telatynski
b860acca80 Extract tooltipYOffset to a const 2021-08-05 14:43:44 +01:00
Michael Telatynski
e1b62ae38b Increase yOffset by 4px away 2021-08-05 14:20:31 +01:00
Michael Telatynski
8ae95ddbb7 i18n 2021-08-05 13:50:50 +01:00
Michael Telatynski
a8b050a385 Post-merge conflict resolution and improve alignment of tooltips 2021-08-05 13:37:23 +01:00
Michael Telatynski
54509fae95 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/voip-a11y1 
 Conflicts:
	src/components/views/voip/CallView.tsx
 2021-08-05 13:24:16 +01:00
Michael Telatynski
980b284642 Fix image & blurhash info when skipping thumbnail due to thresholds 2021-08-05 13:12:01 +01:00
Michael Telatynski
99adbfd1ea Skip sending a thumbnail if it is not a sufficient saving over the original 2021-08-05 13:04:20 +01:00
Weblate
2f5455f1c4 Merge branch 'origin/develop' into Weblate. 2021-08-05 11:45:48 +00:00
jelv
2b74ab13a3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3104 of 3104 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-05 11:45:48 +00:00
vicdorke
a0e02ca543 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.4% (2964 of 3104 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-08-05 11:45:46 +00:00
Michael Telatynski
a9d7d01014 Null guard space inviter to prevent the app exploding 2021-08-05 12:30:22 +01:00
Šimon Brandner
9e4f5719a4
Handle narrow layouts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 11:47:58 +02:00
Weblate
25b7a719a7 Merge branch 'origin/develop' into Weblate. 2021-08-05 08:33:56 +00:00
Michael Telatynski
58575c335d
Merge pull request #5510 from SimonBrandner/feature-surround-with 
Add surround with feature
 2021-08-05 09:33:52 +01:00
Jeff Huang
6fe403fe8d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-08-05 08:23:03 +00:00
William Weber Berrutti
bb6c331a66 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.1% (2827 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2021-08-05 08:23:01 +00:00
jelv
2b4a4ecfbb Translated using Weblate (Dutch) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-05 08:22:59 +00:00
Weblate
e01aacd5fa Merge branch 'origin/develop' into Weblate. 2021-08-04 22:02:49 +00:00
Dariusz Niemczyk
7d06507a9c
Merge pull request #6534 from SimonBrandner/fix/ringing-sound/15591 
Make the ringing sound mutable/disablable
 2021-08-05 00:02:44 +02:00
Weblate
cfd2db4e87 Merge branch 'origin/develop' into Weblate. 2021-08-04 21:38:14 +00:00
waclaw66
7cd7df33b2 Translated using Weblate (Czech) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-04 21:38:14 +00:00
Szimszon
22b3dfd0c5 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-08-04 21:38:12 +00:00
Travis Ralston
4d5bdf70b7 Fix worklet reference for new webpack pipeline 2021-08-04 15:08:22 -06:00
Šimon Brandner
b9b98c6a81
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 18:15:11 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Šimon Brandner
ee500ad684
Update copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 18:14:32 +02:00
waclaw66
04fb61f91e Translated using Weblate (Czech) 
Currently translated at 100.0% (3103 of 3103 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-04 15:00:30 +00:00
Šimon Brandner
74e1342fa8
Wrap cases in {} 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 16:35:46 +02:00
Šimon Brandner
023d874949
Add missing ? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 16:34:59 +02:00
Šimon Brandner
881cac0d21
Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 16:30:03 +02:00
Šimon Brandner
79e4a95b13
Move stuff out of if statement for better readability 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 16:25:44 +02:00
Weblate
368d975a0f Merge branch 'origin/develop' into Weblate. 2021-08-04 14:02:50 +00:00
Dariusz Niemczyk
dc88686f9d
Merge pull request #6539 from SimonBrandner/feature/increase-anim-speed/18371 
Increase PiP snapping speed
 2021-08-04 16:02:47 +02:00
Weblate
8f96b4ebb5 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:55:31 +00:00
Šimon Brandner
a04a8006fc
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 15:48:53 +02:00
Weblate
2e1d2f20e6 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:35:20 +00:00
Dariusz Niemczyk
c848b8f486
Merge pull request #6524 from matrix-org/palid/feature-css/hmr 
Add data-mx-theme to theme css for hot-reload
 2021-08-04 15:35:15 +02:00
Weblate
c658d7d834 Merge branch 'origin/develop' into Weblate. 2021-08-04 13:01:37 +00:00
William Weber Berrutti
de78f7273e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 90.9% (2829 of 3110 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2021-08-04 13:01:37 +00:00
Šimon Brandner
f97f410d09
Unused import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 13:16:01 +02:00
Šimon Brandner
9681e0e441
Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 13:15:20 +02:00
Michael Telatynski
2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Besnik Bleta
bdbab07371 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3103 of 3110 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-08-04 11:13:20 +00:00
Šimon Brandner
3232552715
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 13:11:36 +02:00
Šimon Brandner
d05be44113
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 13:07:54 +02:00
Šimon Brandner
4a1789be53
Update copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 13:04:23 +02:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Weblate
a8d6fa96bc Merge branch 'origin/develop' into Weblate. 2021-08-04 09:06:41 +00:00
David Baker
72654f24dc
Merge pull request #6541 from SimonBrandner/fix/indent 
Fix indent in HTMLUtils
 2021-08-04 10:06:38 +01:00
Weblate
9aff4db5f5 Merge branch 'origin/develop' into Weblate. 2021-08-04 08:47:44 +00: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
Weblate
9f82e010d0 Merge branch 'origin/develop' into Weblate. 2021-08-04 08:46:43 +00:00
Andrew Morgan
c9c8177f58
Start a call immediately after creating a room via the dial pad (#6529) 2021-08-04 09:46:39 +01:00
Šimon Brandner
7cb21c845f
Fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 10:34:48 +02:00
Weblate
df3eb57385 Merge branch 'origin/develop' into Weblate. 2021-08-04 07:51:26 +00:00
Germain
a07df5e9d8
Merge pull request #6512 from SimonBrandner/fix/mirroring/5633 2021-08-04 08:51:22 +01:00
Weblate
d01c809a66 Merge branch 'origin/develop' into Weblate. 2021-08-04 07:42:14 +00:00
Germain
94e77e70c6
Merge pull request #6470 from SimonBrandner/feature/incoming-call-toast 2021-08-04 08:42:09 +01:00
Weblate
ee78e3e50c Merge branch 'origin/develop' into Weblate. 2021-08-04 07:32:15 +00:00
Oskars G
575e3d60b6 Translated using Weblate (Latvian) 
Currently translated at 58.2% (1812 of 3112 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lv/
 2021-08-04 07:32:15 +00:00
Germain
d2aa7a3bd6
Merge pull request #6457 from aaronraimist/more-url-schemes 
Allow all of the URL schemes that Firefox allows
 2021-08-04 08:32:08 +01:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 09:21:45 +02:00
Suguru Hirahara
d7da0b4f0c Translated using Weblate (Japanese) 
Currently translated at 72.0% (2242 of 3112 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-08-04 06:56:11 +00:00
William Weber Berrutti
3ca83f0100 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 87.5% (2724 of 3112 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2021-08-04 06:56:09 +00:00
Šimon Brandner
372cbbfe8e
Increase snapping speed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 08:11:05 +02:00
Travis Ralston
1b9fe46733 Remove unnecessary rescaling of voice waveforms 
Fixes https://github.com/vector-im/element-web/issues/18364
 2021-08-03 13:51:11 -06:00
Travis Ralston
18b321f8e8 Improve hover states (tooltips) for voice message interactions 
Fixes https://github.com/vector-im/element-web/issues/18375
 2021-08-03 13:34:04 -06:00
Travis Ralston
32442068cf Use a default waveform when recording to ease component pop-in 
Fixes https://github.com/vector-im/element-web/issues/18225
 2021-08-03 13:26:27 -06:00
Travis Ralston
c4e6cc7973 Remove debugging 2021-08-03 12:57:16 -06:00
Travis Ralston
7b565db02d Update uploading state designs 2021-08-03 12:52:21 -06:00
Weblate
40bd9c3ca5 Merge branch 'origin/develop' into Weblate. 2021-08-03 16:18:31 +00:00
jelv
c2974f8d06 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3112 of 3112 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-03 16:18:31 +00: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
Dariusz Niemczyk
806b36856d
Fix i18n 2021-08-03 18:01:34 +02:00
Dariusz Niemczyk
7487636f90
Fix linter again 2021-08-03 18:00:11 +02:00
Šimon Brandner
65451805a2
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-03 16:06:12 +02:00
Dariusz Niemczyk
b18d03be32
Fix final style issues 2021-08-03 15:21:15 +02:00
Dariusz Niemczyk
8a1def1d26
Update src/components/views/voip/CallView/CallViewHeader.tsx 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
08b27a7c82
Update src/components/views/voip/PictureInPictureDragger.tsx 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
389d0b2d4a
Another fix for indentation 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
466151a10c
Update src/components/views/voip/CallPreview.tsx 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
f592d37f39
Remove widget support for CallViewHeader 2021-08-03 15:21:14 +02:00