mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 08:11:29 +03:00
Code Issues Projects Releases Packages Wiki Activity
37900 commits 219 branches 562 tags 474 MiB
Commit graph

29952 commits

Author SHA1 Message Date
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
2a8e8b93aa add comment 2021-09-10 09:48:46 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Weblate
9951f541e7 Merge branch 'origin/develop' into Weblate. 2021-09-09 21:43:40 +00:00
Glandos
13fd5c6555 Translated using Weblate (French) 
Currently translated at 99.9% (3155 of 3158 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-09 21:43:40 +00:00
Robin Townsend
def1c68c16 Fix message bubble corners being wrong in the presence of hidden events 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-09 16:11:36 -04:00
Weblate
602468ccfb Merge branch 'origin/develop' into Weblate. 2021-09-09 17:56:53 +00:00
Germain
051e166c68
Merge pull request #6772 from matrix-org/gsouquet/fix-18947 2021-09-09 18:56:49 +01:00
Weblate
d279490d23 Merge branch 'origin/develop' into Weblate. 2021-09-09 17:49:42 +00:00
Germain
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00
Weblate
890b40f056 Merge branch 'origin/develop' into Weblate. 2021-09-09 17:24:13 +00:00
David Baker
3f28454a8e
Merge pull request #6771 from matrix-org/dbkr/debounce_read_marker_update 
Debounce read marker update on scroll
 2021-09-09 18:24:08 +01:00
David Baker
bd5d02d690
Update comment too 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-09-09 18:15:51 +01:00
Weblate
c053c83709 Merge branch 'origin/develop' into Weblate. 2021-09-09 16:42:43 +00:00
Travis Ralston
a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776 
Render guest settings only in public rooms/spaces
 2021-09-09 10:42:38 -06:00
Weblate
85058f997e Merge branch 'origin/develop' into Weblate. 2021-09-09 16:38:25 +00:00
Priit Jõerüüt
2e290b2e9d Translated using Weblate (Estonian) 
Currently translated at 99.9% (3149 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-09 16:38:25 +00:00
jelv
74a67ab2b6 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-09 16:38:22 +00:00
Travis Ralston
bdb29e96fa
Merge pull request #6766 from matrix-org/travis/measure-encryption-perf 
Add config option to turn on in-room event sending timing metrics
 2021-09-09 10:38:15 -06:00
Germain Souquet
672dab1998 Force refresh threads timeline 
Fixes vector-im/element-web#18947

In the absence of a proper pending events / remote echo setup it seems fairly difficult to get the timeline to update

Adding a temporary helper to force refresh the timeline and not swallow local events when sending a message from the thread sidebar
 2021-09-09 17:31:05 +01:00
David Baker
a4aa6dfcd7 Debounce read marker update on scroll 
Reverts https://github.com/matrix-org/matrix-react-sdk/pull/6751 in
favour of debouncing the updates to read markers, because it seems
allowing the scroll to be 1px away from the bottom was important for
some browsers and meant they never got to the bottom.

We can fix the problem instead by debouncing the update to read
markers, because the scroll state gets reset back to the bottom when
componentDidUpdate() runs which happens after the read marker code
does a setState(). This should probably be debounced anyway since
it doesn't need to be run that frequently.

Fixes https://github.com/vector-im/element-web/issues/18961
Type: bugfix
 2021-09-09 15:58:19 +01:00
iaiz
03160a968d Translated using Weblate (Spanish) 
Currently translated at 99.9% (3150 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-09 12:53:50 +00:00
Germain Souquet
b5bed32973 Fix i18n 2021-09-09 13:40:07 +01:00
Germain Souquet
07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00
Germain Souquet
aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +01:00
Michael Telatynski
329bc8a89e Move unsent event badge handling into RoomNotificationState 2021-09-09 13:14:05 +01:00
Michael Telatynski
630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-09-09 11:01:11 +01:00
Michael Telatynski
2eb64de508 Tweak edge case behaviour 2021-09-09 10:54:31 +01:00
Michael Telatynski
fa60b24a9f fix react error in console 2021-09-09 10:50:12 +01:00
Besnik Bleta
2e4fca1414 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3144 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-09 09:10:18 +00:00
random
1159aa4037 Translated using Weblate (Italian) 
Currently translated at 99.9% (3151 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-09 09:10:15 +00:00
waclaw66
05f8960170 Translated using Weblate (Czech) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-09 08:30:45 +00:00
Jeff Huang
48b3009c73 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-09 08:30:43 +00:00
sr093906
1ad653e6cc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-09 08:30:41 +00:00
Szimszon
e14caf8084 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-09 08:30:39 +00:00
Weblate
43799167ac Merge branch 'origin/develop' into Weblate. 2021-09-08 22:00:07 +00:00
Michael Telatynski
e17a5328d2
Merge pull request #6764 from matrix-org/t3chguy/fix/18677 2021-09-08 23:00:01 +01:00
Weblate
06de309e57 Merge branch 'origin/develop' into Weblate. 2021-09-08 21:59:58 +00:00
Weblate
8b68f92664 Merge branch 'origin/develop' into Weblate. 2021-09-08 21:59:56 +00:00
waclaw66
d87a1967a8 Translated using Weblate (Czech) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-08 21:59:55 +00:00
Ihor Hordiichuk
5bd369f8d4 Translated using Weblate (Ukrainian) 
Currently translated at 52.7% (1664 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-08 21:59:54 +00:00
Michael Telatynski
d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528 
Improve tooltips on space quick actions and explore button
 2021-09-08 22:59:52 +01:00
Szimszon
f634e6544d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-08 21:59:52 +00:00
Michael Telatynski
086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018 
Make space members and user info behave more expectedly
 2021-09-08 22:59:44 +01:00
Travis Ralston
b4f42e1103 Appease the linter 2021-09-08 11:35:25 -06:00
Travis Ralston
70e28e7e13 Move fields into consistent location for js-sdk to target 2021-09-08 11:31:37 -06:00
Travis Ralston
21e33362e5 Add config option to turn on in-room event sending timing metrics 
This is intended to be hooked up to an external system. 

Due to the extra events and metadata concerns, this is only available if turned on from the config.

See `sendTimePerformanceMetrics.ts` for event schemas.
 2021-09-08 11:28:19 -06:00
Michael Telatynski
22c5902ae4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18677 2021-09-08 17:21:42 +01:00
Michael Telatynski
17e0a4b3d7 iterate PR based on feedback 2021-09-08 17:14:51 +01:00
Weblate
0821e30b1e Merge branch 'origin/develop' into Weblate. 2021-09-08 16:09:25 +00:00
sr093906
6119ec1751 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3152 of 3152 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-08 16:09:25 +00:00
Michael Telatynski
2c134b2dfd
Merge pull request #6763 from matrix-org/t3chguy/ts1234 
Improve types based on new TS in js-sdk
 2021-09-08 17:09:17 +01:00
Michael Telatynski
600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Weblate
28accfbf1b Merge branch 'origin/develop' into Weblate. 2021-09-08 13:37:31 +00:00
Michael Telatynski
d4bac4752d Make space members and user info behave more expectedly 2021-09-08 13:34:26 +01:00
Michael Telatynski
83912daced Improve the upgrade for restricted user experience 2021-09-08 13:16:31 +01:00
Michael Telatynski
1da65d459c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18597 2021-09-08 12:57:37 +01:00
Weblate
1fcfd3e858 Merge branch 'origin/develop' into Weblate. 2021-09-08 11:55:50 +00:00
Michael Telatynski
0d0eea392c
Merge pull request #6746 from matrix-org/t3chguy/fix/10935 2021-09-08 12:55:45 +01:00
Weblate
35a0541ddf Merge branch 'origin/develop' into Weblate. 2021-09-08 11:55:40 +00:00
Michael Telatynski
075b0613a5
Merge pull request #6761 from matrix-org/t3chguy/fix/18781 
Fix regressed tab view buttons in space update toast
 2021-09-08 12:55:36 +01:00
Michael Telatynski
467fb55e8e improve typing & comment 2021-09-08 12:53:13 +01:00
Michael Telatynski
f3abb13dc9 Convert crypto/verification/* to Typescript 2021-09-08 12:34:44 +01:00
Michael Telatynski
0caca49ec0 Fix regressed tab view buttons in space update toast 2021-09-08 10:26:23 +01:00
Michael Telatynski
8bd1f384b9 Improve tooltips on space quick actions and explore button 2021-09-08 10:16:20 +01:00
Weblate
ec711f53b2 Merge branch 'origin/develop' into Weblate. 2021-09-08 09:04:15 +00:00
Ihor Hordiichuk
1583a6203b Translated using Weblate (Ukrainian) 
Currently translated at 52.8% (1664 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-08 09:04:15 +00:00
Michael Telatynski
92ad81ed76
Merge pull request #6744 from matrix-org/t3chguy/fix/18892 2021-09-08 10:04:07 +01:00
Weblate
181ecfdc83 Merge branch 'origin/develop' into Weblate. 2021-09-07 18:32:04 +00:00
Ihor Hordiichuk
0d4455551c Translated using Weblate (Ukrainian) 
Currently translated at 52.8% (1664 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-07 18:32:03 +00:00
Travis Ralston
3217ab26ff
Merge pull request #5759 from panoschal/fix/call-search-areas 
Compact call area, better ui when in call & searching messages
 2021-09-07 12:31:56 -06:00
Weblate
22daa249ed Merge branch 'origin/develop' into Weblate. 2021-09-07 17:58:15 +00:00
David Baker
9533f7c04c Fix types in release mode again 2021-09-07 18:49:31 +01:00
Ihor Hordiichuk
b7490f6a8a Translated using Weblate (Ukrainian) 
Currently translated at 52.6% (1660 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-07 17:10:42 +00:00
Germain Souquet
bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
Weblate
655498b12e Merge branch 'origin/develop' into Weblate. 2021-09-07 14:45:45 +00:00
David Baker
495b6dcd97
Merge pull request #6705 from SimonBrandner/fix/call-tile-dispatch/18825 
Use disptacher to answer/reject calls in call tiles
 2021-09-07 15:45:40 +01:00
Germain Souquet
2d45bfb976 Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-07 15:39:32 +01:00
Weblate
5a159edf76 Merge branch 'origin/develop' into Weblate. 2021-09-07 14:26:33 +00:00
Simó Albert i Beltran
792d1cd377 Translated using Weblate (Catalan) 
Currently translated at 23.9% (756 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ca/
 2021-09-07 14:26:33 +00:00
Germain
94cef3bf13
Merge pull request #6755 from matrix-org/gsouquet/fix-thread-creation 2021-09-07 15:26:28 +01:00
Weblate
11d2a65a9b Merge branch 'origin/develop' into Weblate. 2021-09-07 13:27:58 +00:00
Michael Telatynski
9d1e6dc18a
Merge pull request #6756 from matrix-org/t3chguy/ts/123 
fix typing of olmVersion in settings
 2021-09-07 14:27:54 +01:00
Weblate
d3acb0297b Merge branch 'origin/develop' into Weblate. 2021-09-07 13:11:33 +00:00
Besnik Bleta
4f1c16873a Translated using Weblate (Albanian) 
Currently translated at 99.6% (3141 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-07 13:11:33 +00:00
random
0794bc0185 Translated using Weblate (Italian) 
Currently translated at 99.9% (3150 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-07 13:11:31 +00:00
Ihor Hordiichuk
bff80cae0f Translated using Weblate (Ukrainian) 
Currently translated at 51.5% (1624 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-07 13:11:27 +00:00
Germain
42f5efaa28
Merge pull request #6750 from matrix-org/gsouquet/migrate-messageactionbar 2021-09-07 14:11:20 +01:00
Michael Telatynski
93af6aafce fix typing of olmVersion in settings 2021-09-07 13:28:51 +01:00
Олег Корапарара
4126d7ec69 Translated using Weblate (Ukrainian) 
Currently translated at 51.5% (1624 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-07 12:00:40 +00:00
Michael Telatynski
f4f4686270 tidy up code 2021-09-07 12:07:18 +01:00
Michael Telatynski
6cbdb58341 add comment 2021-09-07 12:01:18 +01:00
Michael Telatynski
51f1d21464
Merge pull request #6748 from matrix-org/t3chguy/fix/18764 
Fix Space creation wizard go to my first room button behaviour
 2021-09-07 11:08:53 +01:00
Michael Telatynski
8cab86e58b fix typing of firstRoomId 2021-09-07 11:02:38 +01:00
David Baker
f25be9770e Translated using Weblate (Albanian) 
Currently translated at 99.7% (3142 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-07 09:28:16 +00:00
Germain Souquet
6c60e4c306 Fix thread creation 2021-09-07 09:57:49 +01:00
Weblate
1f015a64b4 Merge branch 'origin/develop' into Weblate. 2021-09-07 08:48:21 +00:00
David Baker
404ddad961
Merge pull request #6751 from matrix-org/dbkr/fix_stuck_scroll 
Fix scroll being stuck at bottom
 2021-09-07 09:48:17 +01:00
XoseM
459f603f17 Translated using Weblate (Galician) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-09-07 08:40:43 +00:00
jelv
571e7de795 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-07 08:40:38 +00:00
Germain Souquet
9cbf8717e2 Add comments for missing types in MessageActionBar 2021-09-07 09:12:38 +01:00
Weblate
95ebd9d2c7 Merge branch 'origin/develop' into Weblate. 2021-09-07 04:43:31 +00:00
Travis Ralston
78617c01a8
Merge pull request #6742 from matrix-org/travis/fix-oidc-dialog 
Convert widget OIDC exchange dialog to TS (fixing it)
 2021-09-06 22:43:27 -06:00
Travis Ralston
615a432eda Add missing type 2021-09-06 22:37:21 -06:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer"" 2021-09-06 22:11:35 -06:00
Weblate
2869a802ec Merge branch 'origin/develop' into Weblate. 2021-09-07 04:09:05 +00:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer" 2021-09-06 22:08:50 -06:00
Weblate
8ce3c168ca Merge branch 'origin/develop' into Weblate. 2021-09-07 04:07:11 +00:00
Ihor Hordiichuk
54b466a97f Translated using Weblate (Ukrainian) 
Currently translated at 51.5% (1624 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-07 04:07:11 +00:00
Jeff Huang
7099d35439 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-07 04:07:08 +00:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533 2021-09-07 05:07:00 +01:00
David Baker
6468ce68a2 Fix scroll being stuck at bottom 
The check for whether we're at the bottom or not allowed for a
difference of 1 to account for fractional scroll values, but
allowed the difference of exactly 1 too, meaning we'd consider
the timeline to be at the bottom if you were scrolled up by exactly
a single pixel. If your scrolling was set up to be precise enough and
the event handlers fired fast enough that they'd evaluate each time
you scrolled up by a single pixel, it would reset you back to the bottom
each time and you'd never be able to scroll up.

Fixes https://github.com/vector-im/element-web/issues/18903
 2021-09-06 18:59:47 +01:00
Weblate
f0a1719fd1 Merge branch 'origin/develop' into Weblate. 2021-09-06 15:53:19 +00:00
Alexandre Franke
e450750700 Translated using Weblate (French) 
Currently translated at 99.9% (3148 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-06 15:53:19 +00:00
Michael Telatynski
a4c0fa8046
Merge pull request #6745 from matrix-org/t3chguy/fix/18796 
Prefer matrix.to alias links over room id in spaces & share
 2021-09-06 16:53:11 +01:00
Weblate
7cf5920042 Merge branch 'origin/develop' into Weblate. 2021-09-06 15:21:02 +00:00
Priit Jõerüüt
b4b3a4bc17 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3148 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-06 15:21:02 +00:00
waclaw66
da0714917f Translated using Weblate (Czech) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-06 15:20:59 +00:00
Germain Souquet
01d61786f1 Update return type for getThread prop 2021-09-06 16:18:35 +01:00
Germain Souquet
4b96a81bbe Migrate MessageActionBar to TypeScript 2021-09-06 16:15:50 +01:00
Germain Souquet
385222719c Fix replies not appearing in timeline 2021-09-06 15:53:18 +01:00
Michael Telatynski
43868c4539 Fix Space creation wizard go to my first room button behaviour 2021-09-06 15:17:09 +01:00
Michael Telatynski
68836b9c68 hide no-op m.room.encryption events and better word param changes 2021-09-06 14:59:30 +01:00
Michael Telatynski
c915288044 Respect m.space.parent relations if they hold valid permissions 2021-09-06 14:34:06 +01:00
Weblate
bb1b079506 Merge branch 'origin/develop' into Weblate. 2021-09-06 12:06:49 +00:00
Thibault Martin
8ee49129b8 Translated using Weblate (French) 
Currently translated at 99.9% (3148 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-06 12:06:49 +00:00
Szimszon
6e57d06bb4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-06 12:06:46 +00:00
sr093906
582d12b5cd Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-06 12:06:43 +00:00
David Baker
18b5b18f7c
Merge pull request #6740 from matrix-org/dbkr/debug_stuck_toast 
Add logging to debug stuck toast bug
 2021-09-06 13:06:36 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Weblate
28db6d6a03 Merge branch 'origin/develop' into Weblate. 2021-09-06 10:40:59 +00:00
Michael Telatynski
6801ec76a7
Merge pull request #6738 from matrix-org/t3chguy/fix/18780 2021-09-06 11:40:55 +01:00
Michael Telatynski
fc84682c81 i18n 2021-09-06 11:35:02 +01:00
Michael Telatynski
e252c5553e Prefer matrix.to alias links over room id in spaces & share 2021-09-06 11:27:15 +01:00
Weblate
0be86b2961 Merge branch 'origin/develop' into Weblate. 2021-09-06 08:56:14 +00:00
Besnik Bleta
080b545f7e Translated using Weblate (Albanian) 
Currently translated at 99.7% (3141 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-06 08:56:14 +00:00
waclaw66
5c14f629f6 Translated using Weblate (Czech) 
Currently translated at 100.0% (3149 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-06 08:56:10 +00:00
Ihor Hordiichuk
df5503a99d Translated using Weblate (Ukrainian) 
Currently translated at 51.4% (1620 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-06 08:56:07 +00:00
Jeff Huang
c2d8d6fe09 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3149 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-06 08:55:44 +00:00
sr093906
f09f89dd3d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3149 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-06 08:55:41 +00:00
LinAGKar
7b9e11e378 Translated using Weblate (Swedish) 
Currently translated at 100.0% (3149 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-09-06 08:55:39 +00:00
jelv
5ecf0510b7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3149 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-06 08:55:35 +00:00
Szimszon
1d132f1436 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3149 of 3149 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-06 08:55:33 +00:00
Dariusz Niemczyk
1e50246a78
Merge pull request #6636 from matrix-org/palid/fix/forgot-password-ux 
Make ForgotPassword UX slightly more user friendly
 2021-09-06 10:55:25 +02:00
Michael Telatynski
898de13ca7 Consolidate roving tab index controls in the space panel buttons with dnd 2021-09-06 08:54:08 +01:00
Germain Souquet
085d8b46a7 fix i18n 2021-09-06 08:31:54 +01:00
Germain Souquet
f549c1d52b Code style updates 2021-09-06 08:14:49 +01:00
Travis Ralston
b9001c3e11 Convert widget OIDC exchange dialog to TS (fixing it) 
Fixes https://github.com/vector-im/element-web/issues/15631

The `super` call was the primary issue, but a log line in the `onPermissionSelection` was also using the wrong property. Both issues have been fixed as part of the TS conversion in order to make the thing compile, conveniently fixing the bugs.
 2021-09-03 22:31:29 -06:00
Weblate
09fc5977e2 Merge branch 'origin/develop' into Weblate. 2021-09-03 19:35:03 +00:00
Travis Ralston
9dee3eb0e1
Merge pull request #6728 from matrix-org/travis/voice-messages/interrupt-text 
Stop automatic playback of voice messages if a non-voice message is encountered
 2021-09-03 13:34:58 -06:00
Weblate
ee1c47fd38 Merge branch 'origin/develop' into Weblate. 2021-09-03 19:27:57 +00:00
iaiz
8203d13488 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3145 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-03 19:27:57 +00:00
Travis Ralston
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages 
When pinning or unpinning messages, link to the specific message
 2021-09-03 13:27:49 -06:00
Weblate
50dab4ade4 Merge branch 'origin/develop' into Weblate. 2021-09-03 16:17:44 +00:00
David Baker
de01dcfd26
Merge pull request #6700 from SimonBrandner/feature/call-timer/18566 
Show call length during a call
 2021-09-03 17:17:36 +01:00
Weblate
b717b33717 Merge branch 'origin/develop' into Weblate. 2021-09-03 15:30:23 +00:00
Michael Telatynski
b5abaffbd1
Merge pull request #6737 from matrix-org/t3chguy/fix/18789 
Serialize and retry mass-leave when leaving space
 2021-09-03 16:30:19 +01:00
Weblate
1c1d5ee6b0 Merge branch 'origin/develop' into Weblate. 2021-09-03 15:26:23 +00:00
Michael Telatynski
0b07a70b15
Merge pull request #6730 from matrix-org/t3chguy/fix/17974 
Don't context switch room on SpaceStore ready as it can break permalinks
 2021-09-03 16:26:19 +01:00
Weblate
73da3b31b1 Merge branch 'origin/develop' into Weblate. 2021-09-03 15:18:29 +00:00
Michael Telatynski
f7e491f713
Merge pull request #6729 from matrix-org/t3chguy/fix/18762 
Fix explore rooms button not working during space creation wizard
 2021-09-03 16:18:25 +01:00
Weblate
0d6c109471 Merge branch 'origin/develop' into Weblate. 2021-09-03 15:13:02 +00:00
jelv
7130a45536 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-03 15:13:01 +00:00
Michael Telatynski
2faa2e12c6
Merge pull request #6739 from matrix-org/t3chguy/fix/18775 2021-09-03 16:12:54 +01:00
David Baker
90824d32c9 Add logging to debug stuck toast bug 
For https://github.com/vector-im/element-web/issues/18603
 2021-09-03 15:14:44 +01:00
Michael Telatynski
6a40dfea40 Fix keyboard dnd messing with roving tabindex 2021-09-03 15:10:51 +01:00
Michael Telatynski
40f9302ec9 Space panel fix aria-expanded being set to false on nodes without children 2021-09-03 14:24:02 +01:00
Weblate
4409b6718f Merge branch 'origin/develop' into Weblate. 2021-09-03 12:47:28 +00:00
Szimszon
a09f9312d7 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-03 12:47:28 +00:00
Glandos
c314ad527f Translated using Weblate (French) 
Currently translated at 99.9% (3143 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-03 12:47:25 +00:00
Germain
bfad9c0599
Merge pull request #6736 from matrix-org/gsouquet/fix-18876 
Fix ProfileSettings when avatarUrl is null
 2021-09-03 13:47:14 +01:00
Michael Telatynski
cc40df298b Improve form handling in and around space creation 2021-09-03 13:34:09 +01:00
Michael Telatynski
419eb63e51 Add missing pluralisation i18n strings for Spaces 2021-09-03 13:20:35 +01:00
Michael Telatynski
acb89d3447 Serialize and retry mass-leave when leaving space 2021-09-03 12:56:09 +01:00
Germain Souquet
3c36b3c2c0 Fix ProfileSettings when avatarUrl is null 2021-09-03 12:50:42 +01:00
Germain Souquet
997f43cb82 Implement new narrow mode UI 2021-09-03 12:03:19 +01:00
Weblate
2f21f05f08 Merge branch 'origin/develop' into Weblate. 2021-09-03 11:01:58 +00:00
David Baker
25fb243d0b
Merge pull request #6731 from matrix-org/dbkr/prevent_multiple_calls 
Fix bug where one party's media would sometimes not be shown
 2021-09-03 12:01:54 +01:00
Weblate
469251648e Merge branch 'origin/develop' into Weblate. 2021-09-03 10:08:37 +00:00
David Baker
7b52cca8d3
Formatting 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-03 10:38:39 +01:00
Germain Souquet
475ef66c58 Fix state initialisation for DevicesPanel 2021-09-03 10:25:45 +01:00
Germain Souquet
6d80976eae Merge branch 'develop' into gsouquet/compact-composer-18533 2021-09-03 09:20:38 +01:00
Weblate
7d193be1b5 Merge branch 'origin/develop' into Weblate. 2021-09-03 07:47:22 +00:00
Szimszon
d73943ad37 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (3142 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-03 07:47:22 +00:00
Germain
e16921e1f1
Merge pull request #6619 from matrix-org/gsouquet/ts-components-migration 2021-09-03 08:47:12 +01:00
Weblate
05d287968e Merge branch 'origin/develop' into Weblate. 2021-09-03 04:03:48 +00:00
Adrian Środoń
33087f261f Translated using Weblate (Polish) 
Currently translated at 66.4% (2089 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-09-03 04:03:48 +00:00
Jeff Huang
0634fb8f78 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-03 04:03:46 +00:00
sr093906
fa49905464 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-03 04:03:44 +00:00
Dariusz Niemczyk
781662ded7
Merge pull request #6732 from matrix-org/palid/fix/blurhash-being-stuck-forever 
Fix unnecessary blurhash rendering
 2021-09-03 06:03:36 +02:00
Weblate
aca2a932a7 Merge branch 'origin/develop' into Weblate. 2021-09-02 22:02:16 +00:00
Travis Ralston
6590572124 Improve performance of widget startup slightly 
See https://github.com/matrix-org/matrix-react-sdk/pull/6733#pullrequestreview-745513275
 2021-09-02 15:24:23 -06:00
Weblate
ad0c7a68b2 Merge branch 'origin/develop' into Weblate. 2021-09-02 21:02:58 +00:00
Priit Jõerüüt
85d80aa891 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3143 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-02 21:02:58 +00:00
waclaw66
c54760cb12 Translated using Weblate (Czech) 
Currently translated at 100.0% (3146 of 3146 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-02 21:02:55 +00:00
Travis Ralston
57aa045195 Don't rely on rooms having timelines to use when checking widgets 2021-09-02 14:27:20 -06:00
Dariusz Niemczyk
40cb8e8fc6
Fix unnecessary blurhash rendering 2021-09-02 21:10:21 +02:00
David Baker
1a0365f528 i18n 2021-09-02 19:00:30 +01:00
David Baker
f2758f9ce5 Fix glare 2021-09-02 18:41:26 +01:00
Travis Ralston
b2cb944d73 Merge branch 'develop' into travis/voice-messages/interrupt-text 2021-09-02 11:21:12 -06:00
Weblate
02b98db2e7 Merge branch 'origin/develop' into Weblate. 2021-09-02 16:40:48 +00:00
Dariusz Niemczyk
99a0bd935b
Merge pull request #6726 from SimonBrandner/feature/autoplay-split 
Split autoplay GIFs and videos into different settings
 2021-09-02 18:40:42 +02:00
Šimon Brandner
367049bd08
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-02 17:52:00 +02:00
Šimon Brandner
c246b027be
Add missing space 
Co-authored-by: Dariusz Niemczyk <3636685+Palid@users.noreply.github.com>
 2021-09-02 17:39:13 +02:00
David Baker
cd8e7e3076 Move error dialog to the new check 
So we just check for an existing call in one place where it doesn't race
 2021-09-02 15:51:44 +01:00
Weblate
add4c05f9d Merge branch 'origin/develop' into Weblate. 2021-09-02 14:06:27 +00:00
jelv
088fa1aaae Translated using Weblate (Dutch) 
Currently translated at 100.0% (3145 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-02 14:06:26 +00:00
Travis Ralston
c749492b9c
Merge pull request #6710 from matrix-org/travis/voice-messages/audio-queue 
Add autoplay for voice messages
 2021-09-02 08:06:17 -06:00
David Baker
edf6d13818 Prevent multiple calls for the same room 2021-09-02 14:41:10 +01:00
Michael Telatynski
44b4561b8b Don't context switch room on SpaceStore ready as it can break permalinks 2021-09-02 13:40:48 +01:00
Šimon Brandner
2f1ee610d9
Use source id directly 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-02 14:27:55 +02:00
Michael Telatynski
aed835554c Fix explore rooms button not working during space creation wizard 2021-09-02 12:30:49 +01:00
Weblate
f0ca83ebb5 Merge branch 'origin/develop' into Weblate. 2021-09-02 11:17:26 +00:00
Besnik Bleta
6673bbcdfa Translated using Weblate (Albanian) 
Currently translated at 99.7% (3137 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-02 11:17:26 +00:00
random
6767f15239 Translated using Weblate (Italian) 
Currently translated at 99.9% (3144 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-02 11:17:23 +00:00
Michael Telatynski
daba23d1bf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18760 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
 2021-09-02 12:10:20 +01:00
Germain Souquet
bb87834dc8 Appease linter 2021-09-02 10:06:09 +01:00
Weblate
cb56c01497 Merge branch 'origin/develop' into Weblate. 2021-09-02 07:43:10 +00:00
Graeme Power
d6f823d4b9 Translated using Weblate (Irish) 
Currently translated at 25.4% (801 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-02 07:43:10 +00:00
waclaw66
e4d0d0308b Translated using Weblate (Czech) 
Currently translated at 100.0% (3145 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-02 07:43:06 +00:00
Jeff Huang
d6dd81253c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3145 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-02 07:43:04 +00:00
sr093906
e237e13c4c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3145 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-02 07:43:02 +00:00
Germain
9be9e75c13
Merge pull request #6720 from matrix-org/gsouquet/replies-fix-18717 2021-09-02 08:42:54 +01:00
Germain Souquet
2ce8647120 Prevent unstable property to be sent with all events 2021-09-02 08:36:20 +01:00
Germain Souquet
e416952c90 Merge branch 'develop' into gsouquet/compact-composer-18533 2021-09-02 08:31:29 +01:00
Travis Ralston
91d0b55fd0 Stop automatic playback if a non-voice message is encountered 
Fixes https://github.com/vector-im/element-web/issues/18850
 2021-09-01 16:14:44 -06:00
Travis Ralston
d7426b9b5b Merge branch 'travis/voice-messages/audio-queue' into travis/voice-messages/interrupt-text 2021-09-01 16:08:20 -06:00
Graeme Power
abc79ec82c Translated using Weblate (Irish) 
Currently translated at 24.6% (775 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-01 20:50:01 +00:00
Weblate
3c60dc8a1d Merge branch 'origin/develop' into Weblate. 2021-09-01 20:46:59 +00:00
Graeme Power
4b7d922a69 Translated using Weblate (Irish) 
Currently translated at 24.6% (775 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-01 20:46:59 +00:00
Travis Ralston
5692b74b28
Merge pull request #6703 from nordeck/nic/feat/invite-reason-formatting 
Allow to use basic html to format invite messages
 2021-09-01 14:46:54 -06:00
Steffen Kolmer
c32a77c3b2 Use helper function to get event content 2021-09-01 22:40:42 +02:00
Weblate
1d06728f4f Merge branch 'origin/develop' into Weblate. 2021-09-01 20:28:19 +00:00
Graeme Power
92c974294a Translated using Weblate (Irish) 
Currently translated at 24.6% (774 of 3145 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-01 20:28:19 +00:00
Travis Ralston
f0cf00433b
Merge pull request #6702 from nordeck/nic/fix/even-tile-preview 
Replace fake username in EventTilePreview with a proper loading state
 2021-09-01 14:28:12 -06:00
Weblate
d8772d8b8d Merge branch 'origin/develop' into Weblate. 2021-09-01 19:28:36 +00:00
Priit Jõerüüt
35a8f443f8 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3140 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-01 19:28:35 +00:00
Graeme Power
6a85fc89e1 Translated using Weblate (Irish) 
Currently translated at 24.6% (774 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-01 19:28:33 +00:00
Travis Ralston
3046f0ed85
Merge pull request #6684 from matrix-org/travis/cross-room 
Add support for MSC2762's timeline functionality
 2021-09-01 13:28:26 -06:00
Weblate
da83e5379b Merge branch 'origin/develop' into Weblate. 2021-09-01 19:16:58 +00:00
Graeme Power
1c1218e8b2 Translated using Weblate (Irish) 
Currently translated at 24.3% (765 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-01 19:16:58 +00:00
Graeme Power
fd90dffc4d Translated using Weblate (Spanish) 
Currently translated at 100.0% (3143 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-01 19:16:56 +00:00
Travis Ralston
bf5fe29448
Merge pull request #6695 from matrix-org/travis/keep-old-out 
Don't send prehistorical events to widgets during decryption at startup
 2021-09-01 13:16:47 -06:00
Travis Ralston
b86a0dcc15 Merge branch 'develop' into travis/cross-room 2021-09-01 11:29:20 -06:00
Weblate
56312310c5 Merge branch 'origin/develop' into Weblate. 2021-09-01 17:26:29 +00:00
Graeme Power
d55c78020b Translated using Weblate (Irish) 
Currently translated at 23.9% (752 of 3143 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ga/
 2021-09-01 17:26:29 +00:00
Travis Ralston
3ed76f5de7
Merge pull request #6719 from matrix-org/travis/widgets/no-limits 
Remove arbitrary limits from send/receive events for widgets
 2021-09-01 11:26:15 -06:00