J. Ryan Stinnett
99559c5121
Update backup restore paths for SSSS
...
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
2020-01-03 13:33:36 +00:00
Weblate
b0e71daa61
Merge branch 'origin/develop' into Weblate.
2020-01-03 13:08:52 +00:00
David Baker
bcece7dc10
Merge pull request #3793 from matrix-org/dbkr/keyreq_dont_crash_if_removed
...
Don't crash if a keyshare request is removed
2020-01-03 13:08:47 +00:00
Weblate
831ad3ba33
Merge branch 'origin/develop' into Weblate.
2020-01-03 13:08:40 +00:00
catborise
c8f9df691b
Translated using Weblate (Turkish)
...
Currently translated at 50.8% (1017 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-03 13:08:40 +00:00
Slavi Pantaleev
b6572f7042
Translated using Weblate (Bulgarian)
...
Currently translated at 97.4% (1948 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-03 13:08:35 +00:00
David Baker
c2723176e4
Convert /verify to checkDeviceTrust
...
Also de-promiseify the code a bit
2020-01-03 12:08:35 +00:00
David Baker
557669b08e
Don't crash if a keyshare request is removed
...
...during the time the dialog is displayed.
Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully)
2020-01-03 11:12:55 +00:00
Travis Ralston
3488eaba3c
Appease the linter
2020-01-02 17:44:19 -07:00
Travis Ralston
4de0f7257a
Initial implementation of FTUE user lists design
...
This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.
Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.
Closes https://github.com/vector-im/riot-web/issues/11197
2020-01-02 17:40:18 -07:00
Weblate
015bca32ac
Merge branch 'origin/develop' into Weblate.
2020-01-02 17:16:30 +00:00
David Baker
560cff0ae1
Merge pull request #3791 from matrix-org/dbkr/remove_e2etile_onclick
...
Remove E2eIcon onClick
2020-01-02 17:16:25 +00:00
David Baker
89ac476281
Unused import
2020-01-02 16:59:46 +00:00
David Baker
39777620a3
order copyright lines by date
2020-01-02 16:58:00 +00:00
David Baker
ffba19bd61
Remove E2eIcon onClick
...
It displayed the Encrypted Event Info dialog, but this full of
super advanced debug information and base64 strings that no normal
users should ever have to see. It's still accessible via the comtext
menu (ie. the same place as 'View Source').
2020-01-02 16:52:25 +00:00
Weblate
2c126f3588
Merge branch 'origin/develop' into Weblate.
2020-01-02 16:19:10 +00:00
Slavi Pantaleev
31367bac57
Translated using Weblate (Bulgarian)
...
Currently translated at 93.5% (1870 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-01-02 16:19:10 +00:00
Travis Ralston
c88efa5c2c
Merge pull request #3778 from bit/master
...
support channel names with slash in name/alias
2020-01-02 09:19:02 -07:00
Volodymyr Kostyrko
2bfe1e6be3
Translated using Weblate (Ukrainian)
...
Currently translated at 28.9% (578 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2020-01-01 11:47:53 +00:00
strix aluco
827ddaf7df
Translated using Weblate (Ukrainian)
...
Currently translated at 28.6% (572 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2019-12-31 10:47:54 +00:00
catborise
44c181576e
Translated using Weblate (Turkish)
...
Currently translated at 47.9% (959 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-31 10:47:52 +00:00
Osoitz
d7a680db71
Translated using Weblate (Basque)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2019-12-31 10:47:49 +00:00
Will Hunt
fb94be4abd
No trailing space
2019-12-30 16:11:59 +00:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info
2019-12-30 17:09:05 +01:00
Will Hunt
b1c2887087
line length
2019-12-30 16:08:24 +00:00
j
9eed423994
support channel names with slash in name/alias
...
Signed-off-by: Jan Gerber <j@mailb.org>
2019-12-29 12:10:31 +01:00
Michael Telatynski
4489b5a21a
Escape HTML in og:description and render any html &-encoded entities
2019-12-28 20:05:55 +00:00
Michael Telatynski
705bfcd20d
fix RoomViewStore import in UserInfo
2019-12-28 17:54:46 +00:00
Michael Telatynski
a0cb6ce302
User Info fetch latest RoomMember instead of showing historical data
2019-12-28 17:51:38 +00:00
Weblate
dc607fbda9
Merge branch 'origin/develop' into Weblate.
2019-12-27 18:37:44 +00:00
Travis Ralston
98571d706f
Fix NPE when searching for rooms
...
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
2019-12-27 11:31:15 -07:00
Weblate
737e049af2
Merge branch 'origin/develop' into Weblate.
2019-12-27 17:19:31 +00:00
Michael Telatynski
e9658a9e9e
Merge pull request #3782 from matrix-org/t3chguy/room_settings_alias_input
...
Turn RoomAliasField into properly controlled and use in RoomSettings
2019-12-27 17:19:26 +00:00
Weblate
bab89fbfaf
Merge branch 'origin/develop' into Weblate.
2019-12-27 17:19:25 +00:00
random
957b1efc00
Translated using Weblate (Italian)
...
Currently translated at 99.9% (2000 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-27 17:19:25 +00:00
Michael Telatynski
eac66f020f
Merge pull request #3783 from matrix-org/t3chguy/fuzzy_sort_memberlist
...
fuzzy-sort MemberList
2019-12-27 17:19:19 +00:00
Michael Telatynski
aa990462ce
delint
2019-12-27 17:05:51 +00:00
Michael Telatynski
f9e386adaa
Improve SORT_REGEX
2019-12-27 17:04:14 +00:00
Weblate
85159c3651
Merge branch 'origin/develop' into Weblate.
2019-12-27 16:58:47 +00:00
Michael Telatynski
c79bd791d6
Merge pull request #3786 from matrix-org/t3chguy/serialize_file_uploads
...
Serialize file uploads into room to match confirmation dialog order
2019-12-27 16:58:42 +00:00
Weblate
b19cb2df10
Merge branch 'origin/develop' into Weblate.
2019-12-27 16:53:01 +00:00
Michael Telatynski
05911881c2
Merge pull request #3785 from matrix-org/t3chguy/search_unread_messages
...
Do not show Top Unread Messages Bar and Jump to bottom button if searching
2019-12-27 16:52:56 +00:00
Weblate
008a394af2
Merge branch 'origin/develop' into Weblate.
2019-12-27 16:52:51 +00:00
Michael Telatynski
2b39f3bdf1
Merge pull request #3784 from matrix-org/t3chguy/fix_stickerPickerChevronOffset
...
Fix sticker picker chevron offset calculation
2019-12-27 16:52:46 +00:00
Weblate
7f2a13d47b
Merge branch 'origin/develop' into Weblate.
2019-12-27 16:52:29 +00:00
Michael Telatynski
4984dd6f92
Merge pull request #3781 from matrix-org/t3chguy/user_info
...
Fix not being able to promote others to the same power level as your own
2019-12-27 16:52:23 +00:00
Weblate
a2104972a3
Merge branch 'origin/develop' into Weblate.
2019-12-27 16:50:32 +00:00
strix aluco
145741d168
Translated using Weblate (Ukrainian)
...
Currently translated at 27.1% (542 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2019-12-27 16:50:31 +00:00
Stanislav Lukeš
6f7ddc3713
Translated using Weblate (Czech)
...
Currently translated at 98.8% (1976 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-12-27 16:50:31 +00:00
Michael Telatynski
9bdadd2103
Merge pull request #3751 from matrix-org/t3chguy/react16_contexts_online_dot
...
Room Tile DMs online/active green dot
2019-12-27 16:50:21 +00:00
Michael Telatynski
9f948b5da3
Serialize file uploads into room to match confirmation dialog order
2019-12-27 13:59:57 +00:00
Michael Telatynski
e9ebfa100f
Do not show Top Unread Messages Bar and Jump to bottom button if searching
2019-12-26 20:32:25 +00:00
Michael Telatynski
ed24f19a3f
Fix stick picker chevron offset calculation
2019-12-26 20:12:50 +00:00
Michael Telatynski
ab12288979
Add more punctuation to regex
2019-12-26 19:29:25 +00:00
Michael Telatynski
e320f64ba1
fuzzy-sort MemberList
2019-12-26 19:27:04 +00:00
Michael Telatynski
ebf7eb698d
Turn RoomAliasField into properly controlled and use in RoomSettings
2019-12-26 18:52:57 +00:00
Michael Telatynski
e95b67e101
Only show it if exactly 2 members, until we get Canonical DMs
2019-12-26 18:15:08 +00:00
Michael Telatynski
22fe0add3c
Make UserOnlineDot more generic
2019-12-26 18:14:46 +00:00
ferhad.necef
c1c0c36008
Translated using Weblate (Azerbaijani)
...
Currently translated at 22.4% (448 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2019-12-26 18:05:53 +00:00
Michael Telatynski
73800c9a92
Fix UserInfo promote user inverted buttons
2019-12-26 18:04:58 +00:00
Weblate
2a36bdf1eb
Merge branch 'origin/develop' into Weblate.
2019-12-25 22:16:28 +00:00
catborise
7043453d3e
Translated using Weblate (Turkish)
...
Currently translated at 44.7% (894 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-25 22:16:27 +00:00
ferhad.necef
a0e816d134
Translated using Weblate (Russian)
...
Currently translated at 90.8% (1816 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-12-25 22:16:19 +00:00
Szimszon
5e4f341cd8
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-25 22:16:18 +00:00
Samu Voutilainen
b8dbd32363
Translated using Weblate (Finnish)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-12-25 22:16:18 +00:00
Jeff Huang
b4a569dfc7
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-25 22:16:15 +00:00
ferhad.necef
abb5ea2df8
Translated using Weblate (Azerbaijani)
...
Currently translated at 22.3% (447 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2019-12-25 22:16:15 +00:00
Travis Ralston
58f169be92
Merge pull request #3769 from matrix-org/travis/babel7-wp-lang-dropdown
...
Define getLanguageFromBrowser() for LanguageDropdown
2019-12-25 15:15:55 -07:00
Travis Ralston
92ea1157be
Reintroduce working resizer code for right panel
...
Fixes https://github.com/vector-im/riot-web/issues/11674
This re-introduces and adapted version of what was there before, but fixed for the new collapsed logic: https://github.com/matrix-org/matrix-react-sdk/pull/3703/files#diff-633a0248e235d7446a8868a9145efce2L77-L93
We no longer have a collapsedRhs variable and only set the panel when it is opened, so we can accurately track expanded/collapsed state through presence of a panel.
2019-12-23 19:26:59 -07:00
Weblate
602aee02f6
Merge branch 'origin/develop' into Weblate.
2019-12-23 19:40:08 +00:00
Michael Telatynski
25d864c39d
Fix wrong scope binding on openHelp for TopLeftMenu
2019-12-23 19:29:43 +00:00
Weblate
6a148050e3
Merge branch 'origin/develop' into Weblate.
2019-12-23 18:33:11 +00:00
Michael Telatynski
23b9b98f7b
Merge pull request #3774 from matrix-org/t3chguy/userinfo_tweaks
...
UserInfo hide kick/mute buttons if they make no sense
2019-12-23 18:33:05 +00:00
Michael Telatynski
0497ef228d
UserInfo hide kick/mute buttons if they make no sense
2019-12-23 18:20:59 +00:00
Weblate
746522358f
Merge branch 'origin/develop' into Weblate.
2019-12-23 18:10:56 +00:00
Kévin C
178dbdca5b
Translated using Weblate (French)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-23 18:10:56 +00:00
Michael Telatynski
659644e612
Merge pull request #3773 from matrix-org/t3chguy/fix_incoming_call_dup
...
Fix duplicate Incoming Call prompt on Community Invite sublist
2019-12-23 18:10:51 +00:00
Michael Telatynski
e552195701
Fix duplicate Incoming Call prompt on Community Invite sublist
2019-12-23 17:57:53 +00:00
Weblate
566e825e0b
Merge branch 'origin/develop' into Weblate.
2019-12-23 17:18:13 +00:00
Michael Telatynski
6e9791c950
Merge pull request #3755 from matrix-org/t3chguy/tags_changes
...
Apply new design to highlighted tags and add toggle mechanic
2019-12-23 17:18:07 +00:00
Weblate
da37d02215
Merge branch 'origin/develop' into Weblate.
2019-12-23 17:16:53 +00:00
Michael Telatynski
1098fc939a
Merge pull request #3771 from matrix-org/t3chguy/ReactDOM.findDOMNode
...
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 17:16:47 +00:00
Weblate
398f772e6c
Merge branch 'origin/develop' into Weblate.
2019-12-23 17:16:11 +00:00
catborise
131ecfe912
Translated using Weblate (Turkish)
...
Currently translated at 36.8% (736 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-23 17:16:11 +00:00
random
4d61e0bbe7
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1999 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-23 17:16:07 +00:00
Samu Voutilainen
e47ac5fbb5
Translated using Weblate (Finnish)
...
Currently translated at 97.0% (1940 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-12-23 17:16:06 +00:00
Michael Telatynski
1da55c530b
Merge pull request #3772 from matrix-org/t3chguy/alts
...
Add alt="" to presentational images
2019-12-23 17:15:58 +00:00
Michael Telatynski
8018097e56
Add alt="" to presentational images
2019-12-23 14:13:56 +00:00
Michael Telatynski
207045e979
fix ReadReceiptMarker ref
2019-12-23 12:54:31 +00:00
Michael Telatynski
17f5849985
stop using ReactDOM.findDOMNode in componentWillUnmount, use refs
2019-12-23 12:24:49 +00:00
Michael Telatynski
661701f7ca
Merge branches 'develop' and 't3chguy/tags_changes' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/tags_changes
...
Conflicts:
src/components/views/elements/TagTile.js
2019-12-23 11:00:42 +00:00
Travis Ralston
3eb3be45d1
Fix import of language index
...
This is a similar fix to 18ac2db2ea
2019-12-22 21:44:29 -07:00
Travis Ralston
56adb8244b
Add a bit of debugging to incorrect components in the Skinner
2019-12-22 21:41:01 -07:00
Travis Ralston
cfa21cbb8c
Define getLanguageFromBrowser() for LanguageDropdown
...
Without it we can't compile, so we should define it. It looks like it's never been defined, and LanguageDropdown seems to use it as a last resort - it should be safe to land.
2019-12-22 21:38:44 -07:00
Travis Ralston
539a33c722
Fix naming conflict in VectorConferenceHandler
2019-12-22 21:26:10 -07:00
Travis Ralston
18ac2db2ea
Fix Notifier imports in NotificationControllers
...
require() is a bit weird for riot-web's webpack, so we fork it out to its own function to reduce the weirdness.
The added weirdness is that require() is sync though exports a module instead. If we use import(), we get a promise which doesn't help us here. We therefore have to require() and pull out the default export, though this is only a problem for webpack - babel (our chosen compiler for exporting ES6) doesn't need this, hence the if statement.
2019-12-22 21:25:47 -07:00
Travis Ralston
615648af13
Fix tabbed view export for component index
2019-12-22 21:23:14 -07:00
Travis Ralston
0d2cb6e731
Import haveTileForEvent() from the right place
2019-12-22 21:23:07 -07:00
Travis Ralston
d002c2ccde
Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6
2019-12-22 21:20:13 -07:00
Travis Ralston
f1ac3d2f64
Convert imports to ES6 from CommonJS
...
This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
2019-12-22 21:16:06 -07:00
Travis Ralston
042bd35d79
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
Travis Ralston
806d728d59
Import from the js-sdk's src/ directory
...
Because ES6 and such.
2019-12-22 21:14:33 -07:00
Travis Ralston
be4eeb5e07
Fix js-sdk imports for new module
2019-12-22 21:10:26 -07:00
Travis Ralston
d56f0f2a25
Convert many imports to handle ES6 exports
...
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
Travis Ralston
4aec432b30
Convert the more complicated CommonJS exports to ES6-style
2019-12-22 21:01:03 -07:00
Travis Ralston
344dac4fb9
Convert CommonJS exports to ES6-compatible exports
...
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
2019-12-22 21:01:02 -07:00
Travis Ralston
0b0fe92b17
Convert resizer to ES6
2019-12-22 20:57:46 -07:00
Weblate
245d83af43
Merge branch 'origin/develop' into Weblate.
2019-12-21 20:59:35 +00:00
Michael Telatynski
0b62f8a62f
Merge pull request #3759 from matrix-org/t3chguy/fix_room_list_filtering
...
Fix room list filtering weird case sensitivity
2019-12-21 20:59:29 +00:00
Michael Telatynski
24a1017d6d
Fix typo in comment
2019-12-21 20:26:32 +00:00
Weblate
69a077df29
Merge branch 'origin/develop' into Weblate.
2019-12-21 17:41:10 +00:00
Weblate
652998245c
Merge branch 'origin/develop' into Weblate.
2019-12-21 17:41:08 +00:00
catborise
3dcef53b93
Translated using Weblate (Turkish)
...
Currently translated at 33.8% (677 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2019-12-21 17:41:08 +00:00
Peter Vágner
9a51b41846
Translated using Weblate (Slovak)
...
Currently translated at 77.8% (1556 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-12-21 17:41:03 +00:00
Szimszon
fef19c510c
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2000 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-21 17:40:59 +00:00
Kévin C
0e7949d73e
Translated using Weblate (French)
...
Currently translated at 100.0% (2000 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-21 17:40:57 +00:00
Jeff Huang
21dcf65858
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2000 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-21 17:40:57 +00:00
Michael Telatynski
e936f7eb09
Fix room list filtering weird case sensitivity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-12-21 11:13:37 +00:00
David Baker
376bf7e213
i18n
2019-12-20 16:56:38 +00:00
David Baker
a928b33f27
Don't show the 'verify' button if the user is verified
...
Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
2019-12-20 16:51:50 +00:00
David Baker
b998e6ffe8
Switch to using checkDeviceTrust
...
In the UserInfo panel. This means we now use cross-signing
verifications in the UserInfoPanel so we can see our cross-signing
verifications working!
Lots more to do here: the remaining device.isVerified() calls in
UserInfoPanel are where it needs to be switched to verifying users
rather than devices, and of course we need to replace all the calls
to device.isVerified() with checkDeviceTrust everywhere else.
2019-12-20 11:31:11 +00:00
Michael Telatynski
3a36d61fab
delint
2019-12-19 21:10:22 +00:00
Michael Telatynski
d9ea9b4ad3
Iterate to match design on Zeplin
2019-12-19 20:53:34 +00:00
Weblate
970f16df3d
Merge branch 'origin/develop' into Weblate.
2019-12-19 20:32:18 +00:00
Michael Telatynski
24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts
...
Migrate away from React Legacy contexts API
2019-12-19 20:32:11 +00:00
Weblate
5914553718
Merge branch 'origin/develop' into Weblate.
2019-12-19 20:18:34 +00:00
David Baker
a21fdb17fd
Merge pull request #3749 from matrix-org/dbkr/keybackup_migrate
...
Migrate key backups to SSSS
2019-12-19 20:18:28 +00:00
Michael Telatynski
b2249d0561
Initial rejig
2019-12-19 20:09:05 +00:00
David Baker
b98058fc3c
Add bug for removing temporary srceen
2019-12-19 19:54:44 +00:00
David Baker
822762f014
add todo
2019-12-19 19:49:36 +00:00
Weblate
93c252fd02
Merge branch 'origin/develop' into Weblate.
2019-12-19 19:25:57 +00:00
Kévin C
372512b0c4
Translated using Weblate (French)
...
Currently translated at 100.0% (1998 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-19 19:25:57 +00:00
Michael Telatynski
a410cc004f
Merge pull request #3745 from matrix-org/t3chguy/get_rid_of_emoji_stripped_data
...
Get rid of stripped-emoji.json in favour of an in-memory single source of truth
2019-12-19 19:25:50 +00:00
David Baker
48b166f451
Pass the key backup into the right thing
2019-12-19 17:28:32 +00:00
Weblate
f716f673a8
Merge branch 'origin/develop' into Weblate.
2019-12-19 17:27:46 +00:00
David Baker
290df9f50e
Merge pull request #3753 from matrix-org/dbkr/combine_cross_sig_dm_verif_feature_flags
...
Combine cross signing and verification over DM feature flags
2019-12-19 17:27:41 +00:00
Michael Telatynski
a25bc94343
remove unused, commented line of code
2019-12-19 17:22:02 +00:00
Weblate
86af43da6d
Merge branch 'origin/develop' into Weblate.
2019-12-19 17:16:15 +00:00
Michael Telatynski
ba2078e262
Merge pull request #3754 from matrix-org/t3chguy/fuzzy_filter_room_list
...
apply unhomoglyph when filtering room list to fuzzify it
2019-12-19 17:16:09 +00:00
Weblate
4ee879ec08
Merge branch 'origin/develop' into Weblate.
2019-12-19 16:58:40 +00:00
Michael Telatynski
f3802bfd05
Merge pull request #3746 from matrix-org/t3chguy/emoji_picker
...
Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed
2019-12-19 16:58:34 +00:00
Michael Telatynski
1c31fd3413
Apply new design to highlighted tags and add toggle mechanic
2019-12-19 16:54:30 +00:00
Weblate
f80d6e2877
Merge branch 'origin/develop' into Weblate.
2019-12-19 16:27:24 +00:00
Michael Telatynski
a13ee490e8
Merge pull request #3750 from matrix-org/t3chguy/m_too_large
...
Internationalise M_TOO_LARGE error from Synapse
2019-12-19 16:27:17 +00:00
Michael Telatynski
e54429680b
tidy up
2019-12-19 15:28:11 +00:00
David Baker
c5e7594fe9
i18n
2019-12-19 15:27:29 +00:00
Michael Telatynski
26980e2ad5
apply unhomoglyph when filtering room list to fuzzify it
2019-12-19 15:26:04 +00:00
David Baker
3d8422c88a
Combine cross signing and verification over DM feature flags
...
This means we can just make the new member info panel support
cross-signing exclusively rather than having to try & make it
temporarily support both
2019-12-19 15:23:32 +00:00
Michael Telatynski
709b2eed7c
Add bunch of null-guards and similar to fix React Errors/complaints
2019-12-19 15:10:54 +00:00
Weblate
07761c6813
Merge branch 'origin/develop' into Weblate.
2019-12-19 14:39:24 +00:00
Peter Vágner
00b66b4877
Translated using Weblate (Slovak)
...
Currently translated at 75.0% (1498 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-12-19 14:39:23 +00:00
random
1010c0a27b
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1997 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-19 14:39:19 +00:00
Samu Voutilainen
3f7ea3bc66
Translated using Weblate (Finnish)
...
Currently translated at 95.5% (1909 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-12-19 14:39:17 +00:00
Michael Telatynski
db069b9602
delint
2019-12-19 14:33:46 +00:00
Michael Telatynski
6c1944359e
Add RoomTile online indicator to DMs
2019-12-19 14:29:46 +00:00
Michael Telatynski
3678e64f5d
Internationalise M_TOO_LARGE error from Synapse
2019-12-19 13:25:43 +00:00
Michael Telatynski
66783dff9e
Fix scaling of the avatar in UserInfo
2019-12-19 12:27:25 +00:00
David Baker
6851ad04b6
Migrate key backups to SSSS
...
If there's a key backup set up when we bootstrap SSSS, use its key
for SSSS and add the key backup key as a passthrough secret.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1128
Fixes https://github.com/vector-im/riot-web/issues/11210
2019-12-19 11:26:20 +00:00
Michael Telatynski
affc8b8459
Merge branches 'develop' and 't3chguy/jest' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/jest
...
Conflicts:
yarn.lock
2019-12-19 10:50:14 +00:00
Michael Telatynski
3196655524
Replace UserInfo avatar with <MemberAvatar/> for fallback logic
2019-12-19 10:42:47 +00:00
Michael Telatynski
a1df87a375
Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed
2019-12-19 07:23:05 +00:00
David Baker
a5d5569af4
Translated using Weblate (Japanese)
...
Currently translated at 59.3% (1184 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2019-12-18 21:46:59 +00:00
Michael Telatynski
d35b01b63a
Get rid of stripped-emoji.json in favour of an in-memory single truth source
2019-12-18 15:40:19 +00:00
Travis Ralston
38e75aaae0
Merge pull request #3722 from matrix-org/travis/babel7
...
[BREAKING] Refactor the entire build process for babel@7 and TypeScript (chunk 1 of many)
2019-12-17 10:44:20 -07:00
Weblate
ce995d1a1e
Merge branch 'origin/develop' into Weblate.
2019-12-17 17:39:47 +00:00
Michael Telatynski
f30e919f9e
Merge pull request #3741 from matrix-org/t3chguy/dropdown_keyboard_propagation
...
Dropdown stop keyboard propagation if key handled
2019-12-17 17:39:41 +00:00
Michael Telatynski
da4d72b3c4
delint
2019-12-17 17:34:03 +00:00
Michael Telatynski
b094f0fe47
delint
2019-12-17 17:31:29 +00:00
Michael Telatynski
937b32663c
Migrate away from Legacy React Contexts
2019-12-17 17:26:12 +00:00
Weblate
7811bd8859
Merge branch 'origin/develop' into Weblate.
2019-12-17 17:02:41 +00:00
Travis Ralston
1a44f01f0a
Merge pull request #3742 from matrix-org/travis/rp-memberinfo
...
Fix right panel for multiple member info viewings
2019-12-17 10:02:35 -07:00
Michael Telatynski
2e8d66fa36
Null-guard member mention pills for rooms you have left (notif panel)
2019-12-17 16:54:59 +00:00
Travis Ralston
16181ff0ed
Fix right panel for multiple member info viewings
...
Fixes https://github.com/vector-im/riot-web/issues/11663
Member info is special because it has parameters associated with it. What was happening was the RightPanelStore was seeing that it was already on member info and deciding to hide the pane instead. What we do now is consider any phase change with parameters (such as the user to pass to member info) as a proper phase change.
2019-12-17 09:47:06 -07:00
Weblate
069129507f
Merge branch 'origin/develop' into Weblate.
2019-12-17 16:45:54 +00:00
Michael Telatynski
3f5dc4fcdc
Merge pull request #3740 from matrix-org/t3chguy/field_validation_async_tooltip_sticks
...
Fix Field validation tooltip sticking if blurred before async validation resolved
2019-12-17 16:45:48 +00:00
Weblate
1d9d812b04
Merge branch 'origin/develop' into Weblate.
2019-12-17 15:14:04 +00:00
Michael Telatynski
7f78f55c94
Dropdown stop keyboard propagation if key handled
2019-12-17 15:14:01 +00:00
Michael Telatynski
0c89ab9fb5
Merge pull request #3738 from matrix-org/t3chguy/null-guard-useIsEncrypted
...
Fix UserInfo exploding without a room being passed to it
2019-12-17 15:13:59 +00:00
Weblate
b4f9b88025
Merge branch 'origin/develop' into Weblate.
2019-12-17 15:07:19 +00:00
Travis Ralston
590ef79300
Merge pull request #3737 from matrix-org/travis/room-dir
...
Fix room directory maintaining and error state
2019-12-17 08:07:12 -07:00
Michael Telatynski
0e86c2648d
improve comment
2019-12-17 14:36:20 +00:00
Michael Telatynski
213bc4c3ac
Fix Field validation tooltip sticking if blurred before async validation resolved
2019-12-17 14:28:18 +00:00
Michael Telatynski
c1133ebfc6
null-guard useIsEncrypted
2019-12-17 14:05:51 +00:00
Michael Telatynski
e6d8487302
Fix more tests
2019-12-17 11:47:01 +00:00
Michael Telatynski
ab3fb6581b
Down to 7 test failures
2019-12-17 11:24:37 +00:00
Weblate
c0f3db1678
Merge branch 'origin/develop' into Weblate.
2019-12-17 10:07:18 +00:00
Michael Telatynski
17463c401f
post-merge fix
2019-12-17 09:58:04 +00:00
Weblate
285667d653
Merge branch 'origin/develop' into Weblate.
2019-12-17 09:55:22 +00:00
Szimszon
a7a7a9cb23
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1998 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-17 09:55:22 +00:00
Jeff Huang
284a1fdde7
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1998 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-17 09:55:21 +00:00
Michael Telatynski
3a8ab6ec2b
Merge pull request #3736 from matrix-org/t3chguy/stop_using_deprecated_keyCode
...
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-17 09:55:13 +00:00
Travis Ralston
b2a1a40961
Fix room directory maintaining and error state
...
Fixes https://github.com/vector-im/riot-web/issues/11665
We weren't clearing the error from a previous lookup, which effectively prevented the UI from working after an error happened.
2019-12-16 16:47:33 -07:00
Travis Ralston
9865ce899b
Add a bunch of docs
...
We're making an assumption here that the decorator is actually all over the app when it's not.
2019-12-16 16:34:46 -07:00
Travis Ralston
0a9985fb48
Rename decorator for clarity
2019-12-16 16:10:11 -07:00
Travis Ralston
434570eca9
Explain why MatrixClientPeg is the way it is
2019-12-16 16:07:58 -07:00
Weblate
b7e2acc5f0
Merge branch 'origin/develop' into Weblate.
2019-12-16 17:25:34 +00:00
Kévin C
eb5ebaf754
Translated using Weblate (French)
...
Currently translated at 100.0% (2001 of 2001 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-16 17:25:34 +00:00
Michael Telatynski
3b0f8233e8
delint
2019-12-16 17:22:00 +00:00
Michael Telatynski
d28a892bb0
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-16 17:14:03 +00:00
Michael Telatynski
bf06b1f379
Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0
...
Conflicts:
res/css/views/settings/_ProfileSettings.scss
2019-12-16 16:23:25 +00:00
Michael Telatynski
5ab98e9899
open ImageView when clicking on a set avatar
2019-12-16 15:21:05 +00:00
Michael Telatynski
9fa2680dc6
Implement new design for uploading/removing avatars
2019-12-16 14:58:12 +00:00
Michael Telatynski
85ade7e1a1
Switch to react-focus-lock for it to comprehend Portals
2019-12-16 12:16:41 +00:00
Michael Telatynski
2569b78db3
Merge pull request #3729 from matrix-org/t3chguy/aria_dropdown
...
Make combobox dropdown keyboard and screen reader accessible
2019-12-16 11:14:46 +00:00
David Baker
be914c7b0c
Merge pull request #3728 from matrix-org/jryans/verify-users
...
Verify users when cross-signing enabled
2019-12-16 10:12:46 +00:00
Michael Telatynski
9c4eb1d649
clean up new code
2019-12-16 10:03:40 +00:00
random
ed5bfb7acf
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1993 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-16 09:57:03 +00:00
Stanislav Lukeš
671ec51c01
Translated using Weblate (Czech)
...
Currently translated at 98.4% (1962 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-12-16 09:57:02 +00:00
Jeff Huang
460d4fc150
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1994 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-16 09:57:02 +00:00
Osoitz
6dedc8d7bb
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1994 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2019-12-16 09:57:01 +00:00
Michael Telatynski
224ee05b62
this is a combobox, HOME/END should pertain to the input, not selection
2019-12-15 15:07:49 +00:00
Michael Telatynski
cecf581e04
Make Combobox dropdown keyboard and screen reader accessible
2019-12-15 15:04:57 +00:00
Michael Telatynski
f67eedf843
Fix keyboard handling including scroll into view, add aria roles
2019-12-15 14:24:56 +00:00
Szimszon
ad6329a0b0
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1994 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-15 09:46:48 +00:00
Kévin C
5f8647ab8a
Translated using Weblate (French)
...
Currently translated at 100.0% (1994 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-15 09:46:45 +00:00
J. Ryan Stinnett
2df72bfde2
Update room / user decoration for cross-signing
2019-12-13 17:57:26 +00:00
Weblate
a4c277f387
Merge branch 'origin/develop' into Weblate.
2019-12-13 17:53:35 +00:00
Michael Telatynski
9f0e2412c7
Merge pull request #3727 from matrix-org/t3chguy/unignore_a11y
...
Improve a11y of the unignore button in Settings
2019-12-13 17:53:30 +00:00
Weblate
300db712a0
Merge branch 'origin/develop' into Weblate.
2019-12-13 17:53:27 +00:00
Michael Telatynski
2313285be2
Merge pull request #3726 from matrix-org/t3chguy/fix_ToggleSwitch_a11y
...
Fix ToggleSwitch A11Y (trapping tab and switch v. checkbox)
2019-12-13 17:53:21 +00:00
Weblate
a382836ae3
Merge branch 'origin/develop' into Weblate.
2019-12-13 17:19:42 +00:00
random
71a5cf6616
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1992 of 1993 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-13 17:19:42 +00:00
Szimszon
d4c6b0cb9b
Translated using Weblate (Hungarian)
...
Currently translated at 99.7% (1988 of 1993 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-13 17:19:38 +00:00
Kévin C
f0147f5517
Translated using Weblate (French)
...
Currently translated at 100.0% (1993 of 1993 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-13 17:19:35 +00:00
Jeff Huang
5eec97830f
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1993 of 1993 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-13 17:19:34 +00:00
Michael Telatynski
0bc02564bc
Improve a11y of the unignore button in Settings
2019-12-13 14:31:34 +00:00
Michael Telatynski
9d0bf13ca0
Fix ToggleSwitch A11Y (trapping tab and switch v. checkbox)
2019-12-13 14:18:41 +00:00
Michael Telatynski
17a42cd287
Make LInkPreviewWidget close button Keyboard & SR Accessible
2019-12-13 14:02:50 +00:00
J. Ryan Stinnett
3ac0deebab
Use static modals for verification
...
Verification with cross-signing may requiring asking for your secret storage
passphrase, which is displayed in it's own modal on top of flows. For now while
verification takes in modals also, mark the verification ones as static so they
don't lose state when secret storage appears on top mid-flow.
2019-12-13 13:55:28 +00:00
Travis Ralston
20a615396b
Implementation of new potential skinning mechanism
...
With a switch to Only One Webpack™ we need a way to help developers generate the component index without a concurrent watch task. The best way to do this is to have developers import their components, but how do they do that when we support skins? The answer in this commit is to change skinning.
Skinning now expects to receive your list of overrides instead of the react-sdk+branded components. For Riot this means we send over *only* the Vector components and not Vector+react-sdk.
Components can then be annotated with the `replaceComponent` decorator to have them be skinnable. The decorator must take a string with the dot path of the component because we can't reliably calculate it ourselves, sadly.
The decorator does a call to `getComponent` which is where the important part of the branded components not including the react-sdk is important: if the branded app includes the react-sdk then the decorator gets executed before the skin has finished loading, leading to all kinds of fun errors. This is also why the skinner lazily loads the react-sdk components to avoid importing them too early, breaking the app.
The decorator will end up receiving null for a component because of the getComponent loop mentioned: the require() call is still in progress when the decorator is called, therefore we can't error out. All usages of getComponent() within the app are safe to not need such an error (the return won't be null, and developers shouldn't use getComponent() after this commit anyways).
The AuthPage, being a prominent component, has been converted to demonstrate this working. Changes to riot-web are required to have this work.
The reskindex script has also been altered to reflect these skinning changes - it no longer should set the react-sdk as a parent. The eventual end goal is to get rid of `getComponent()` entirely as it'll be easily replaced by imports.
2019-12-12 19:48:45 -07:00
Travis Ralston
225695ab5c
Fix exports for rate limited functions and MatrixClientPeg
...
MatrixClientPeg in particular doesn't work very well with this.
2019-12-12 19:33:08 -07:00
Travis Ralston
a5dadda63b
Convert SdkConfig to TypeScript as a proof of concept
2019-12-12 14:37:32 -07:00
Weblate
8f89e97f86
Merge branch 'origin/develop' into Weblate.
2019-12-12 17:33:19 +00:00
J. Ryan Stinnett
b7fe06706d
Merge pull request #3720 from matrix-org/jryans/4s-new-key-backup
...
Create new key backups using secret storage
2019-12-12 17:33:11 +00:00
Weblate
199af37bf0
Merge branch 'origin/develop' into Weblate.
2019-12-12 17:03:51 +00:00
random
aa92327165
Translated using Weblate (Italian)
...
Currently translated at 98.8% (1960 of 1983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-12 17:03:50 +00:00
Szimszon
084a6feb3b
Translated using Weblate (Hungarian)
...
Currently translated at 98.9% (1962 of 1983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-12-12 17:03:46 +00:00
Kévin C
9eb9921ed0
Translated using Weblate (French)
...
Currently translated at 100.0% (1983 of 1983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-12-12 17:03:44 +00:00
Stanislav Lukeš
e1ad4b25ce
Translated using Weblate (Czech)
...
Currently translated at 99.1% (1966 of 1983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-12-12 17:03:38 +00:00
Jeff Huang
7e383b771a
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 98.9% (1961 of 1983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-12-12 17:03:21 +00:00
J. Ryan Stinnett
38ee1aed09
Replace sign-ins with sessions
...
The designs were changed to use the term "sessions" instead of "sign-ins".
2019-12-12 16:35:02 +00:00
J. Ryan Stinnett
3cbb3c12cd
Update cross-signing details on trust changes
2019-12-12 15:42:27 +00:00
J. Ryan Stinnett
6338ee9683
Only allow key caching inside the access helper
2019-12-12 15:34:01 +00:00
J. Ryan Stinnett
458cc9598d
Support restoring key backup with stored secret
2019-12-12 15:18:36 +00:00
J. Ryan Stinnett
e87ff54eee
Clean up cross-signing debug panel
2019-12-12 14:27:57 +00:00
J. Ryan Stinnett
4417235d9e
Show whether backup key is stored
2019-12-12 14:06:44 +00:00
J. Ryan Stinnett
d2f2d3b344
Handle cross-singing sigs in key backup details
2019-12-12 13:51:45 +00:00
Weblate
47c6023b1a
Merge branch 'origin/develop' into Weblate.
2019-12-11 17:50:53 +00:00
Travis Ralston
7230d51cca
Merge pull request #3703 from matrix-org/travis/right-panel-v2
...
Refactor RightPanel to match expected behaviour
2019-12-11 10:50:45 -07:00
Weblate
e4134a485b
Merge branch 'origin/develop' into Weblate.
2019-12-11 17:50:43 +00:00