Commit graph

18138 commits

Author SHA1 Message Date
Zoe
ea99eebb7b Report to the user when a key signature upload fails 2020-03-17 11:45:27 +00:00
J. Ryan Stinnett
59b1cbd4b2 Add default on config setting to control call button in composer
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
2020-03-17 11:33:10 +00:00
Weblate
4bbcb485f6 Merge branch 'origin/develop' into Weblate. 2020-03-17 10:55:42 +00:00
Bruno Windels
e8c77543f9
Merge pull request #4221 from matrix-org/bwindels/aliaslipstick
Fix: make alternative addresses UX less confusing
2020-03-17 10:55:36 +00:00
Bruno Windels
010661249b run i18n 2020-03-17 11:47:56 +01:00
Bruno Windels
1f4e92885b
Update src/components/views/room_settings/AliasSettings.js
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-03-17 10:43:01 +00:00
Weblate
65f4856f28 Merge branch 'origin/develop' into Weblate. 2020-03-17 10:32:32 +00:00
David Baker
5de93d0fee
Merge pull request #4222 from matrix-org/dbkr/wait_for_verify
Wait for verification request on login
2020-03-17 10:32:26 +00:00
Weblate
6d525baf5e Merge branch 'origin/develop' into Weblate. 2020-03-17 10:32:26 +00:00
Mejans
2ef53cb50a Translated using Weblate (Occitan)
Currently translated at 2.2% (48 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/oc/
2020-03-17 10:32:26 +00:00
call_xz
e3ce197145 Translated using Weblate (Japanese)
Currently translated at 56.5% (1216 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-03-17 10:32:23 +00:00
Tirifto
76703d99f5 Translated using Weblate (Esperanto)
Currently translated at 99.8% (2148 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-17 10:32:23 +00:00
Michael Telatynski
44b0aa2d88 Remove remainders of gemini-scrollbar and react-gemini-scrollbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:31:45 +00:00
Michael Telatynski
8dfc15a328 Migrate TagPanel away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:23:12 +00:00
Michael Telatynski
43f0013dda Migrate GroupView away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:09:47 +00:00
Damir Jelić
997a179e69 Merge branch 'poljar/shutdown' into develop 2020-03-17 10:15:12 +01:00
Damir Jelić
029624cbec Merge branch 'poljar/delete-events' into develop 2020-03-17 10:15:05 +01:00
J. Ryan Stinnett
c245c6932c Restore key backup in background after complete security
We were blocking the complete security flow on waiting for a key backup restore
to complete, which could take multiple minutes with no visible progress.

Fixes https://github.com/vector-im/riot-web/issues/12426
2020-03-16 23:30:24 +00:00
Hubert Chathi
f7dddfc1a7 show encryption upgrade when SSSS needs upgrading 2020-03-16 17:31:26 -04:00
Hubert Chathi
7b6a78bfb8 don't check public key if there is none 2020-03-16 17:31:06 -04:00
Mejans
d30618fe0e Added translation using Weblate (Occitan) 2020-03-16 20:14:10 +00:00
J. Ryan Stinnett
cc27894fc9 Fix key backup trust text for cross-signing
This fixes the key backup panel to use the correct object when checking whether
a device is verified or unverified via cross-signing trust.
2020-03-16 18:59:07 +00:00
David Baker
6c8bfe3293 Lint 2020-03-16 17:58:37 +00:00
David Baker
6c4b572c7e Wait for verification request on login
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
2020-03-16 17:47:56 +00:00
Bruno Windels
3253d0b93d more margin between published and local addresses 2020-03-16 18:30:40 +01:00
Bruno Windels
d6ddc5096f tweak labels, etc 2020-03-16 18:25:13 +01:00
Bruno Windels
78fb95aa9e change <details> appearance for local aliases 2020-03-16 18:24:49 +01:00
Bruno Windels
db10fcd2b7 make editable list look like something closer to design 2020-03-16 17:29:35 +01:00
Bruno Windels
31cb257eb9 add headers and copy to lessen confusion of new alias workings 2020-03-16 17:28:45 +01:00
Bruno Windels
26f6203985 move room publish toggle below canonical alias
also to own component to not contaminate alias settings too much
with this
2020-03-16 17:27:06 +01:00
Weblate
c995de7951 Merge branch 'origin/develop' into Weblate. 2020-03-16 15:49:37 +00:00
Jan Renz
639f20e37a Translated using Weblate (German)
Currently translated at 77.6% (1669 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-16 15:49:37 +00:00
Michael Albert
5d5d28df40 Translated using Weblate (German)
Currently translated at 77.6% (1669 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-16 15:49:34 +00:00
Damir Jelić
a7d6b9e48e Merge branch 'poljar/seshat-403-checkpoint' into develop 2020-03-16 16:48:24 +01:00
Weblate
d189cb19b5 Merge branch 'origin/develop' into Weblate. 2020-03-16 13:27:27 +00:00
Besnik Bleta
7239f5149a Translated using Weblate (Albanian)
Currently translated at 99.7% (2145 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-16 13:27:26 +00:00
J. Ryan Stinnett
0f0671dd84
Merge pull request #4216 from matrix-org/jryans/jump-shifted-char
Move to composer when typing letters with Shift held
2020-03-16 13:27:18 +00:00
Michael Telatynski
78543da7f4 Fix missed copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-16 12:28:20 +00:00
Michael Telatynski
eabaf58013 Add local-echo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-16 12:20:52 +00:00
Michael Telatynski
82a37ba0ad Fix styling of NetworkDropdown dialogs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-16 12:00:56 +00:00
Michael Telatynski
6f27c4c17a s/Server address/Server name/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-16 11:45:51 +00:00
call_xz
7510ac72f5 Translated using Weblate (Japanese)
Currently translated at 56.4% (1214 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-03-16 10:01:48 +00:00
Jeff Huang
acd3087b0f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2152 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-16 10:01:44 +00:00
Weblate
684c908ac7 Merge branch 'origin/develop' into Weblate. 2020-03-15 22:32:18 +00:00
call_xz
a19b67b970 Translated using Weblate (Japanese)
Currently translated at 54.6% (1176 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-03-15 22:32:18 +00:00
random
7eb9f205e5 Translated using Weblate (Italian)
Currently translated at 100.0% (2152 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-15 22:32:17 +00:00
Szimszon
c2e2894ab2 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2152 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-15 22:32:16 +00:00
Jan Renz
edff8a916c Translated using Weblate (German)
Currently translated at 77.4% (1666 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-15 22:32:15 +00:00
Jean-Abou-Samra
d06fa6693f Translated using Weblate (French)
Currently translated at 99.9% (2150 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-15 22:32:15 +00:00
Tuomas Hietala
f91ab660fd Translated using Weblate (Finnish)
Currently translated at 90.7% (1951 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-03-15 22:32:13 +00:00
Tirifto
b2258ab159 Translated using Weblate (Esperanto)
Currently translated at 99.8% (2148 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-15 22:32:10 +00:00
Jeff Huang
e1b2272a93 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2152 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-15 22:32:09 +00:00
Evilham
9cd7a94e82 Translated using Weblate (Catalan)
Currently translated at 34.9% (750 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2020-03-15 22:32:09 +00:00
Adrià
099e56cd6b Translated using Weblate (Catalan)
Currently translated at 34.9% (750 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2020-03-15 22:32:09 +00:00
tsdgeos
b331cb4202 Translated using Weblate (Catalan)
Currently translated at 34.9% (750 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2020-03-15 22:32:08 +00:00
Aaron Raimist
06fce7158a
Rename Review Devices to Review Sessions
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-15 13:47:25 -05:00
Madison Scott-Clary
ca78337d20 Translated using Weblate (Esperanto)
Currently translated at 99.8% (2148 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-15 18:21:27 +00:00
Tirifto
1942150436 Translated using Weblate (Esperanto)
Currently translated at 99.8% (2148 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-15 18:21:27 +00:00
Michael Telatynski
b68d4583d1 migrate UnknownDeviceDialog away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:49:28 +00:00
Michael Telatynski
c77ba71f89 migrate EmbeddedPage away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:39:42 +00:00
Michael Telatynski
30d971b819 migrate MyGroups away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:36:52 +00:00
Michael Telatynski
a9f414dafe Remove unused SearchableEntityList.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:23:23 +00:00
Michael Telatynski
1347d61671 Remove low hanging Gemini consumers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:22:13 +00:00
J. Ryan Stinnett
e927ab6ad4 Move to composer when typing letters with Shift held
We already jump to the composer for unshifted typing, but we should also do so
with Shift as well.

Fixes https://github.com/vector-im/riot-web/issues/12734
2020-03-13 22:21:34 +00:00
Weblate
d52db4bc05 Merge branch 'origin/develop' into Weblate. 2020-03-13 17:59:32 +00:00
Besnik Bleta
714f9dbfcb Translated using Weblate (Albanian)
Currently translated at 99.7% (2145 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-13 17:59:31 +00:00
Michael Telatynski
61539a5be7
Merge pull request #4215 from matrix-org/t3chguy/fixes1
Fix typo in tabIndex to make React happy
2020-03-13 17:59:24 +00:00
Michael Telatynski
6137e5d5d8 Fix typo in tabIndex to make React happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 17:52:06 +00:00
Michael Telatynski
ee1659625c Add Field validation to TextInputDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 17:32:02 +00:00
Weblate
2facf18c1c Merge branch 'origin/develop' into Weblate. 2020-03-13 15:26:13 +00:00
Travis Ralston
f5f433b347
Merge pull request #4148 from matrix-org/travis/poc/theme-command
Proof of concept for custom theme adding
2020-03-13 09:26:07 -06:00
Michael Telatynski
84332184b5 no need to await here as settings take a while to effect, we watch them elsewhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 14:50:41 +00:00
Michael Telatynski
401d85ea6f delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 14:42:19 +00:00
Michael Telatynski
af368a4736 Improve accessibility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 14:38:36 +00:00
Damir Jelić
cb368a0601 EventIndex: Remove a checkpoint if the HTTP request returns a 403.
This fixes https://github.com/vector-im/riot-web/issues/12722.
2020-03-13 14:13:33 +01:00
Damir Jelić
a612a66b69 EventIndex: Properly await the index closing. 2020-03-13 11:33:58 +01:00
Weblate
13fd21ed2b Merge branch 'origin/develop' into Weblate. 2020-03-13 09:47:59 +00:00
Jeff Huang
480dbad887 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2146 of 2146 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-13 09:47:58 +00:00
Bruno Windels
949ac2953e pass current server as via server to join room 2020-03-13 10:21:37 +01:00
Michael Telatynski
5a27fa7d97 fix styling of server name in handle
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:18:53 +00:00
Michael Telatynski
dd4dc054ae i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:06:41 +00:00
Michael Telatynski
86e53ea2c3 Initial attempt to redesign explore servers in room directory
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:02:50 +00:00
Weblate
be38c94376 Merge branch 'origin/develop' into Weblate. 2020-03-12 20:15:18 +00:00
Szimszon
35b673ce9b Translated using Weblate (Hungarian)
Currently translated at 100.0% (2146 of 2146 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-12 20:15:18 +00:00
J. Ryan Stinnett
d6d686622c
Merge pull request #4206 from matrix-org/jryans/xsign-robust-login
Test for cross-signing homeserver support during login, toasts
2020-03-12 20:15:11 +00:00
J. Ryan Stinnett
b5d532b8cd Test for cross-signing homeserver support during login, toasts
This adds more checking of homeserver support for cross-signing at login and in
toasts.

Fixes https://github.com/vector-im/riot-web/issues/12228
2020-03-12 18:08:51 +00:00
Weblate
046af5dd22 Merge branch 'origin/develop' into Weblate. 2020-03-12 11:30:27 +00:00
Bruno Windels
b8f30f55fa
Merge pull request #4202 from matrix-org/bwindels/devicelegacyverif
Send verification request to a single device in a way compatible with non-cross-signing
2020-03-12 11:30:21 +00:00
Weblate
c8d7835db8 Merge branch 'origin/develop' into Weblate. 2020-03-12 11:29:43 +00:00
random
255e57963e Translated using Weblate (Italian)
Currently translated at 100.0% (2145 of 2145 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-12 11:29:43 +00:00
Szimszon
6bcf929fce Translated using Weblate (Hungarian)
Currently translated at 100.0% (2145 of 2145 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-12 11:29:41 +00:00
Jeff Huang
6a3a93bf55 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2145 of 2145 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-12 11:29:39 +00:00
Bruno Windels
6b552e5ce8
Merge pull request #4199 from matrix-org/bwindels/aliasrefinements
Fixes for removing local alias
2020-03-12 11:29:33 +00:00
Damir Jelić
25568fa15c EventIndex: More lint fixes. 2020-03-12 12:20:46 +01:00
Damir Jelić
c02e839e9d EventIndex: Use a const instead of a let binding. 2020-03-12 12:15:46 +01:00
Damir Jelić
cd515f1922 EventIndex: Add support to delete events from the index. 2020-03-12 12:01:50 +01:00
Travis Ralston
cccd27fe84 Convert TabbedView to TypeScript to prove it works 2020-03-11 18:03:43 -06:00
Travis Ralston
7dd7417f12 Enable support for TypeScript in components
Includes: compilation, translations, IDE support (use .tsx not .ts), typings, and other build tools.

TypeScript component have to import PropTypes and React with `import * as React from 'react';`
2020-03-11 18:03:43 -06:00
Travis Ralston
d470f9649d
Merge pull request #4183 from aaronraimist/room-name-change-ev
When room name is changed, show both the old and new name
2020-03-11 11:08:52 -06:00
Bruno Windels
e373dbd616 use new legacy verif method for a single device 2020-03-11 15:52:48 +01:00
David Baker
80e7cbf2e1 Translated using Weblate (Russian)
Currently translated at 83.2% (1783 of 2144 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-03-11 14:34:18 +00:00
Weblate
526136cc67 Merge branch 'origin/develop' into Weblate. 2020-03-11 11:30:21 +00:00
Bruno Windels
138e663498
Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq
Revert "enable 4s when accepting a verification request"
2020-03-11 11:30:15 +00:00
Bruno Windels
cccf7cd07f specific error for lack of permissions when trying to delete an alias 2020-03-11 12:13:28 +01:00
Bruno Windels
3baaaaab07 use splice correctly after removing a local alias 2020-03-11 12:03:16 +01:00
Weblate
1157e2866d Merge branch 'origin/develop' into Weblate. 2020-03-11 09:21:07 +00:00
Michael Telatynski
f9954a668c
Merge pull request #4197 from matrix-org/t3chguy/dont_remount_main_split
Don't remount main split children on rhs collapse
2020-03-11 09:21:01 +00:00
Bruno Windels
13a4f4190f Revert "also enable 4s when accepting a verification request"
This reverts commit ab2e3a3465.
2020-03-11 10:11:54 +01:00
Weblate
8dab4667f7 Merge branch 'origin/develop' into Weblate. 2020-03-11 09:04:19 +00:00
Bruno Windels
1ae4a1cd5b
Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent
Add fallback label for canonical alias events that dont change anything
2020-03-11 09:04:14 +00:00
Weblate
50d1b58d6b Merge branch 'origin/develop' into Weblate. 2020-03-11 09:03:44 +00:00
catborise
8e647e539f Translated using Weblate (Turkish)
Currently translated at 78.3% (1678 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-11 09:03:43 +00:00
Kévin C
58d3ad515f Translated using Weblate (French)
Currently translated at 100.0% (2143 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-11 09:03:41 +00:00
Jeff Huang
73980422e6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2143 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-11 09:03:40 +00:00
Bruno Windels
27db5d68be
Merge pull request #4196 from matrix-org/bwindels/verifdialogpromise
Immediately switch to verification dialog when clicking [Continue] from new session dialog
2020-03-11 09:03:31 +00:00
Michael Telatynski
5c582037ce Tweak padding to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 23:11:48 +00:00
Michael Telatynski
78ffb3ddf4 Don't remount main split children on rhs collapse
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 20:09:40 +00:00
Weblate
d219e989ac Merge branch 'origin/develop' into Weblate. 2020-03-10 18:03:09 +00:00
Bruno Windels
f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify
Enable 4S if needed when trying to verify or accepting verification
2020-03-10 18:03:02 +00:00
Bruno Windels
91de7fd7b6 also allow passing a promise to a verif request to the verification dialog 2020-03-10 18:59:45 +01:00
Bruno Windels
5d7f2f96e7 add fallback label for canonical alias events that dont change anything 2020-03-10 18:45:51 +01:00
Bruno Windels
1eb5bdf847 use USK as we'll only have that around when using key sharing 2020-03-10 18:40:24 +01:00
Weblate
e6e253d13c Merge branch 'origin/develop' into Weblate. 2020-03-10 17:29:12 +00:00
Besnik Bleta
84f6bf06dd Translated using Weblate (Albanian)
Currently translated at 99.7% (2133 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-10 17:29:12 +00:00
Travis Ralston
f33c930c41 Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom"
This reverts commit 191abb5b0d.
2020-03-10 11:28:52 -06:00
Weblate
cdb14f38b3 Merge branch 'origin/develop' into Weblate. 2020-03-10 15:59:49 +00:00
Travis Ralston
a808b05026
Merge pull request #4193 from MarcoZehe/FixExtraneousTabStopOnTree
Remove extraneous tab stop from room tree view.
2020-03-10 09:59:44 -06:00
Bruno Windels
e34a37102a move i18n strings around as script desires 2020-03-10 16:56:20 +01:00
Bruno Windels
ab2e3a3465 also enable 4s when accepting a verification request 2020-03-10 16:54:49 +01:00
Bruno Windels
ddbfe4e1fa enable 4S if needed when trying to verify 2020-03-10 16:31:40 +01:00
Weblate
4bb05e8dec Merge branch 'origin/develop' into Weblate. 2020-03-10 15:30:29 +00:00
Travis Ralston
9b62cc964b
Merge pull request #4191 from matrix-org/travis/remove-v1-identity
Remove v1 identity server fallbacks
2020-03-10 09:30:24 -06:00
Marco Zehe
3bff5c55cf Remove extraneous tab stop from room tree view.
This was introduced some time ago when the room list became scrollable. Divs with overflow:scroll; become focusable for the keyboard in Firefox, but since we have keyboard handling for the whole compound widget, we don't need that tab stop on the tree view container div. Putting tabindex="-1" on it fixes it.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-03-10 16:24:42 +01:00
Weblate
9d19f0f34c Merge branch 'origin/develop' into Weblate. 2020-03-10 12:45:21 +00:00
Bruno Windels
c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases
Allow editing of alt_aliases according to MSC2432
2020-03-10 12:45:16 +00:00
Weblate
6eea3d4641 Merge branch 'origin/develop' into Weblate. 2020-03-10 12:43:20 +00:00
Bruno Windels
db9895f223
Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline
Update timeline rendering of aliases
2020-03-10 12:43:14 +00:00
Travis Ralston
4cdfda3c7d Remove v1 identity server fallbacks
For https://github.com/vector-im/riot-web/issues/10443
2020-03-09 17:05:13 -06:00
Bruno Windels
378939bed7 add timeline text descriptions for modifying alt_aliases 2020-03-09 18:24:48 +01:00
Bruno Windels
0d8b4ac194 remove timeline tiles for m.room.aliases events 2020-03-09 18:23:32 +01:00
Weblate
dc8e9cfb10 Merge branch 'origin/develop' into Weblate. 2020-03-09 16:27:12 +00:00
David Baker
b1ad0b8d77
Merge pull request #4188 from matrix-org/dbkr/remove_version_link
Un-linkify version in settings
2020-03-09 16:27:07 +00:00
David Baker
650d3d0e2d Un-linkify version in settings
Probably a bit confusing while our changelogs are mostly in react-sdk,
and ended up linking to version 0.0.0 in nightly builds.
2020-03-09 16:17:25 +00:00
Weblate
f100eeac6f Merge branch 'origin/develop' into Weblate. 2020-03-09 16:15:45 +00:00
catborise
5d9f9db3fa Translated using Weblate (Turkish)
Currently translated at 77.3% (1655 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-09 16:15:45 +00:00
Tirifto
bc34dfa60a Translated using Weblate (Esperanto)
Currently translated at 86.1% (1845 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-09 16:15:44 +00:00
J. Ryan Stinnett
d2cd64d9d3
Merge pull request #4186 from matrix-org/jryans/mjolnir-stop
Make Mjolnir stop more robust
2020-03-09 16:15:32 +00:00
Bruno Windels
9961f810f1 update i18n 2020-03-09 16:54:00 +01:00
Bruno Windels
dcbbf31f04 fix lint 2020-03-09 16:50:34 +01:00
Bruno Windels
f7cb633e3d only load local aliases on mount when you can edit the canonical alias 2020-03-09 16:43:52 +01:00
Bruno Windels
053ba1110a make pressing enter not reload riot when editable list is in form 2020-03-09 16:32:31 +01:00
Bruno Windels
7079d70f18 hide local aliases by default 2020-03-09 16:32:13 +01:00
Bruno Windels
08a31886a7 make domain postfix optional (not needed for alt aliases) 2020-03-09 16:31:30 +01:00
Bruno Windels
eb539537f2 add recommendations for alt aliases 2020-03-09 16:31:07 +01:00
Bruno Windels
38e99f3a68 add editable list for alt aliases 2020-03-09 16:29:04 +01:00
Bruno Windels
ee9558cb0b change state from domainToAliases to local and alt aliases 2020-03-09 16:28:33 +01:00
J. Ryan Stinnett
c425d7f02f Make Mjolnir stop more robust
Since Mjolnir is a shared instance, we need to be a bit more careful about
clearing internal state than we do for components. This clears watcher and
dispatcher refs in case `stop` is called multiple times (which can happen in
prod as well as tests).
2020-03-09 15:24:56 +00:00
Weblate
da13b8a9be Merge branch 'origin/develop' into Weblate. 2020-03-09 13:48:19 +00:00
random
2377405773 Translated using Weblate (Italian)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-03-09 13:48:19 +00:00
J. Ryan Stinnett
47b1552ccc Fix secret sharing names to match spec
When sharing keys, we should use `m.cross_signing` prefix.

Part of https://github.com/vector-im/riot-web/issues/12661
2020-03-09 13:36:02 +00:00
Weblate
5beeb4805c Merge branch 'origin/develop' into Weblate. 2020-03-09 09:55:44 +00:00
Zoe
49fe1887df
Merge pull request #4172 from matrix-org/foldleft/secret-requests
Share secrets with another device on request
2020-03-09 09:55:38 +00:00
Weblate
81bbc1f5bf Merge branch 'origin/develop' into Weblate. 2020-03-09 08:35:30 +00:00
catborise
0c4aac91a4 Translated using Weblate (Turkish)
Currently translated at 77.0% (1650 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-03-09 08:35:30 +00:00
@a2sc:matrix.org
291e5152e8 Translated using Weblate (German)
Currently translated at 78.2% (1674 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-09 08:35:26 +00:00
Tentarial
0cf5594b97 Translated using Weblate (German)
Currently translated at 78.2% (1674 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-09 08:35:26 +00:00
Kévin C
b6a0921bff Translated using Weblate (French)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-09 08:35:25 +00:00
Nathan Follens
0e7428f44c Translated using Weblate (Dutch)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-03-09 08:35:24 +00:00
Stanislav Lukeš
7cf4b1238d Translated using Weblate (Czech)
Currently translated at 99.9% (2141 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-03-09 08:35:24 +00:00
Jeff Huang
84f7dc9660 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-09 08:35:23 +00:00
Bruno Windels
1e95048018
Merge pull request #4181 from matrix-org/bwindels/bringbacklegacyverififnoxsignkeys
Fall back to to_device verification if other user hasn't uploaded cross-signing keys
2020-03-09 08:35:13 +00:00
Aaron Raimist
f9f87defa4 Only show old room name if it exists 2020-03-07 12:36:24 -06:00
@a2sc:matrix.org
212c970d91 Translated using Weblate (German)
Currently translated at 77.5% (1659 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:43:12 +00:00
Tentarial
f2f8e5e2f6 Translated using Weblate (German)
Currently translated at 77.5% (1659 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:43:11 +00:00
@a2sc:matrix.org
36de51d034 Translated using Weblate (German)
Currently translated at 77.4% (1657 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:31 +00:00
Tentarial
47d73e3a64 Translated using Weblate (German)
Currently translated at 77.4% (1657 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:31 +00:00
@a2sc:matrix.org
356120f0da Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:16 +00:00
natowi
dd0d98b997 Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:15 +00:00
Krombel
69bfabdcf8 Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:15 +00:00
Bamstam
c0abae2928 Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:14 +00:00
Tentarial
832f904cdb Translated using Weblate (German)
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-07 09:41:14 +00:00
Aaron Raimist
7850c506b7
When room name is changed, show both the old and new name
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-06 22:21:38 -06:00
Travis Ralston
661508ddf8 Order theme names in the dropdown 2020-03-06 17:52:16 -07:00
Travis Ralston
6aeca7b853 UX polish for custom themes 2020-03-06 17:43:10 -07:00
Travis Ralston
65d7bb2ef9 Merge branch 'develop' into travis/poc/theme-command 2020-03-06 17:33:22 -07:00
Weblate
584fb4e905 Merge branch 'origin/develop' into Weblate. 2020-03-06 21:35:07 +00:00
MamasLT
0be4a15bb2 Translated using Weblate (Lithuanian)
Currently translated at 43.5% (932 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-03-06 21:35:07 +00:00
Szimszon
b138f1921f Translated using Weblate (Hungarian)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-06 21:35:05 +00:00
Osoitz
7a640522fe Translated using Weblate (Basque)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-03-06 21:35:05 +00:00
Travis Ralston
e4d323d2f2 Disable edits on redacted events
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
Weblate
c8b815d27f Merge branch 'origin/develop' into Weblate. 2020-03-06 16:47:24 +00:00
Besnik Bleta
a8a499ce7d Translated using Weblate (Albanian)
Currently translated at 99.7% (2135 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-06 16:47:23 +00:00
Bruno Windels
4fd1d8a5e7
Merge pull request #4180 from matrix-org/bwindels/toastwithoutxsign
Use crypto.verification.request even when xsign is disabled
2020-03-06 16:47:17 +00:00
Bruno Windels
b312e73510 Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys 2020-03-06 17:44:23 +01:00
Bruno Windels
1f9bd55f3b revert to legacy user verification (over to_device) without xsign keys 2020-03-06 17:37:01 +01:00
Bruno Windels
b0617f10e8 stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail 2020-03-06 17:22:56 +01:00
Bruno Windels
f8ef5bb6a5 check .started first as it can be both .started and pending 2020-03-06 17:20:08 +01:00
Bruno Windels
a7de575316 use crypto.verification.request even when xsign is disabled 2020-03-06 16:50:39 +01:00
Weblate
e435f46993 Merge branch 'origin/develop' into Weblate. 2020-03-06 15:28:37 +00:00
Kévin C
778251680d Translated using Weblate (French)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-06 15:28:37 +00:00
Nathan Follens
38ee5c09e4 Translated using Weblate (Dutch)
Currently translated at 99.9% (2141 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-03-06 15:28:37 +00:00
Jeff Huang
02d76bdef5 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-06 15:28:36 +00:00
Damir Jelić
69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit.
This reflects now the latests design on Figma.
2020-03-06 16:07:10 +01:00
Damir Jelić
364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. 2020-03-06 15:44:23 +01:00
Damir Jelić
bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms."
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
2020-03-06 15:44:23 +01:00
Damir Jelić
8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. 2020-03-06 15:44:23 +01:00
Weblate
eeef56c22d Merge branch 'origin/develop' into Weblate. 2020-03-06 00:24:59 +00:00
Szimszon
e900fe04e8 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-06 00:24:59 +00:00
Besnik Bleta
a275d296fe Translated using Weblate (Albanian)
Currently translated at 99.7% (2135 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-06 00:24:58 +00:00
Travis Ralston
1975a8e082 Merge branch 'develop' into move-read-receipts-to-bottom 2020-03-05 17:13:24 -07:00
Weblate
3fbdf567be Merge branch 'origin/develop' into Weblate. 2020-03-05 18:01:18 +00:00
Travis Ralston
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button
Include a mark as read X under the scroll to unread button
2020-03-05 11:01:12 -07:00
Weblate
a524f76a08 Merge branch 'origin/develop' into Weblate. 2020-03-05 17:38:06 +00:00
Travis Ralston
3527fae275
Merge pull request #4178 from n0emis/crosssigning-presence
Show the room presence indicator, even when cross-singing is enabled
2020-03-05 10:38:01 -07:00
Weblate
d54abc0c86 Merge branch 'origin/develop' into Weblate. 2020-03-05 17:09:50 +00:00
Besnik Bleta
597343018d Translated using Weblate (Albanian)
Currently translated at 99.7% (2134 of 2141 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-05 17:09:50 +00:00
Travis Ralston
e9657cea70 Merge branch 'develop' into travis/poc/theme-command 2020-03-05 09:49:32 -07:00
Bruno Windels
7d051d6a1d await request promise inside encryption panel to show spinner 2020-03-05 17:44:35 +01:00
Weblate
96b8a6160e Merge branch 'origin/develop' into Weblate. 2020-03-05 14:47:09 +00:00
J. Ryan Stinnett
3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link
link to matrix.org/security-disclosure-policy in help screen
2020-03-05 14:47:02 +00:00
Ben Parsons
d28d330b33 run yarn i18n 2020-03-05 14:33:40 +00:00
Ben Parsons
ce84967225 update Security Disclosure Policy link text 2020-03-05 14:18:12 +00:00
Zoe
26177a19d5 access cross-signing callbacks via method 2020-03-05 10:49:06 +00:00
Weblate
2ae881237e Merge branch 'origin/develop' into Weblate. 2020-03-05 09:24:15 +00:00
Jeff Huang
cc26dc157b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-05 09:24:15 +00:00
Bruno Windels
5df35ea432
Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys
only show verify button if user has uploaded cross-signing keys
2020-03-05 09:24:09 +00:00
Bruno Windels
a5cd0a7d5f indent by 4 spaces 2020-03-05 11:09:45 +01:00
Weblate
76de422803 Merge branch 'origin/develop' into Weblate. 2020-03-04 22:35:39 +00:00
Travis Ralston
9836a7a655
Merge pull request #4176 from matrix-org/travis/linkify-rooms
Fix room alias references in topics
2020-03-04 15:35:34 -07:00
Weblate
bc9ea1de39 Merge branch 'origin/develop' into Weblate. 2020-03-04 22:35:33 +00:00
Simeon Keske
cf1d9cc8b5
make the linter happy 2020-03-04 22:46:07 +01:00
Simeon Keske
98f0a2ab67
show the room presence indicator, even when cross-singing is enabled 2020-03-04 22:30:24 +01:00
Travis Ralston
4a976acb84 Add a null check to getUniqueRoomsWithIndividuals
Fixes https://github.com/vector-im/riot-web/issues/12611
2020-03-04 14:18:56 -07:00
Travis Ralston
c6af591c6e Ensure linkified topics in the room directory also work
We weren't passing the options object down to linkifyString.

Fixes https://github.com/vector-im/riot-web/issues/12606
2020-03-04 14:14:03 -07:00
Travis Ralston
d820356990 Convert alias links in room header topics to local permalinks
Fixes https://github.com/vector-im/riot-web/issues/12605
2020-03-04 13:56:58 -07:00
Weblate
ab20600f9d Merge branch 'origin/develop' into Weblate. 2020-03-04 19:59:14 +00:00
Travis Ralston
7aba168c34
Merge pull request #4170 from matrix-org/travis/sso-register-dev
Disable registration flows on SSO servers
2020-03-04 12:59:08 -07:00
Travis Ralston
2204785026 Simplify SSO step checking 2020-03-04 12:26:08 -07:00
Weblate
7ea9f5e3cd Merge branch 'origin/develop' into Weblate. 2020-03-04 19:24:37 +00:00
Travis Ralston
68258d8e89
Merge pull request #4160 from matrix-org/travis/filter-blank
Don't group blank membership changes
2020-03-04 12:24:31 -07:00
Weblate
ee42f35f09 Merge branch 'origin/develop' into Weblate. 2020-03-04 19:24:04 +00:00
Besnik Bleta
830c6e7cc8 Translated using Weblate (Albanian)
Currently translated at 99.5% (2129 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-04 19:24:04 +00:00
Travis Ralston
8e3fea9d0f Use an algorithmic comparator for room list ops
Not all algorithms are timestamp based.
2020-03-04 12:09:05 -07:00
Travis Ralston
80b44f0292 Always calculate the category of a room
All the update triggers for the RoomListStore go through the `setRoomCategory` function, so by returning early we're not actually calculating where a room should be in the list.
2020-03-04 12:05:47 -07:00
Travis Ralston
b06a82ee80 Use textForEvent to determine if an event is worth rendering 2020-03-04 11:44:12 -07:00
Travis Ralston
3842bce74d Fix SSO for new approach 2020-03-04 11:41:16 -07:00
Bruno Windels
8a964dbff0 avoid ref by getting count in setter callback 2020-03-04 17:19:54 +01:00
Bruno Windels
afc7273d10 use pendingUpdateCount rather, so we don't show multiple spinners 2020-03-04 16:58:04 +01:00
Bruno Windels
29af8add5d only show verify button if user has uploaded cross-signing keys 2020-03-04 16:10:06 +01:00
Zoe
4396d85d1f Share secrets with another device on request 2020-03-04 14:58:42 +00:00