Commit graph

18591 commits

Author SHA1 Message Date
Weblate
74d30611b1 Merge branch 'origin/develop' into Weblate. 2019-10-18 15:53:29 +00:00
J. Ryan Stinnett
7ac14e48dc
Merge pull request #3549 from matrix-org/jryans/disconnect-dead-is
Show warning dialog when changing unreachable IS
2019-10-18 16:53:25 +01:00
Weblate
52225b238d Merge branch 'origin/develop' into Weblate. 2019-10-18 15:12:33 +00:00
J. Ryan Stinnett
5333201823 Change back to develop branch for deps 2019-10-18 16:12:20 +01:00
Weblate
7e07c410bc Merge branch 'origin/develop' into Weblate. 2019-10-18 13:49:54 +00:00
Walter
0c6daf4f19 Translated using Weblate (Russian)
Currently translated at 95.2% (1743 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-10-18 13:49:54 +00:00
RiotRobot
d05ef40694 Merge branch 'master' into develop 2019-10-18 14:49:40 +01:00
RiotRobot
86a564b2f0 v1.7.0 2019-10-18 14:48:34 +01:00
RiotRobot
2557d89385 Prepare changelog for v1.7.0 2019-10-18 14:48:33 +01:00
RiotRobot
21bb1dc837 Upgrade to JS SDK v2.4.2 2019-10-18 14:43:08 +01:00
J. Ryan Stinnett
579ada3ca2 Add an overall reachability timeout of 10s
This adds a reachability timeout of 10s when checking the IS for 3PID bindings.
This ensures we stop in a reasonable time, rather than waiting for a long list
of requests to eventually timeout via some general mechanism.

Part of https://github.com/vector-im/riot-web/issues/10909
2019-10-18 12:40:50 +01:00
Weblate
c93b321080 Merge branch 'origin/develop' into Weblate. 2019-10-17 16:24:48 +00:00
Sava Radoš
e0d534e8e4 Translated using Weblate (Serbian (latin))
Currently translated at 3.9% (72 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr_Latn/
2019-10-17 16:24:48 +00:00
random
86dad09b36 Translated using Weblate (Italian)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-17 16:24:46 +00:00
Szimszon
9c3b85b9ee Translated using Weblate (Hungarian)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-17 16:24:46 +00:00
J. A. Durieux
86d3c5e56a Translated using Weblate (Dutch)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-10-17 16:24:45 +00:00
Osoitz
1586ed85f1 Translated using Weblate (Basque)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2019-10-17 16:24:44 +00:00
Travis Ralston
96db855e48
Merge pull request #3551 from maunium/fix-edit-reply-fallback
Fix reply fallback being included in edit m.new_content
2019-10-17 18:24:33 +02:00
Aleksei Perepelkin
0d7e9bb9c7 Translated using Weblate (Russian)
Currently translated at 93.8% (1718 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-10-14 07:18:42 +00:00
Aleksei Perepelkin
4273d5e9a9 Translated using Weblate (Russian)
Currently translated at 93.8% (1718 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-10-14 07:09:51 +00:00
Aleksei Perepelkin
adbb20f47f Translated using Weblate (Russian)
Currently translated at 93.5% (1712 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-10-14 06:22:16 +00:00
Aleksei Perepelkin
c0dab5c3cc Translated using Weblate (Russian)
Currently translated at 93.4% (1711 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2019-10-14 06:16:38 +00:00
Nils J. Haugen
07dd088c10 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 62.3% (1141 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2019-10-13 10:53:22 +00:00
Szimszon
4d505900d4 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-13 10:53:20 +00:00
Jeff Huang
c41d17bb44 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-13 10:53:20 +00:00
Tulir Asokan
2555fcb38f Fix reply fallback being included in edit m.new_content
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-13 13:32:09 +03:00
Weblate
3153c22126 Merge branch 'origin/develop' into Weblate. 2019-10-11 15:08:33 +00:00
Bruno Windels
385e83fdbc
Merge pull request #3548 from matrix-org/bwindels/composer-features-doc
Document composer features
2019-10-11 15:08:29 +00:00
J. Ryan Stinnett
e6a81c5733 Show warning dialog when changing unreachable IS
If the IS is unreachable, this handles the error by showing a warning
encouraging the user to check after their personal data and resolve the
situation, but still allows them to continue if they want.

Fixes https://github.com/vector-im/riot-web/issues/10909
2019-10-11 15:57:12 +01:00
Weblate
a975ecb009 Merge branch 'origin/develop' into Weblate. 2019-10-11 14:54:19 +00:00
송태섭
cb11182e20 Translated using Weblate (Korean)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-11 14:54:19 +00:00
Kévin C
03d1454ee7 Translated using Weblate (French)
Currently translated at 100.0% (1831 of 1831 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-11 14:54:18 +00:00
Travis Ralston
e0ce844f58
Merge pull request #3547 from matrix-org/travis/fix-unban
Correctly update the banned users list when a user is unbanned
2019-10-11 15:54:13 +01:00
J. Ryan Stinnett
d7631ed9f8 Catch errors in Settings when IS is unreachable
A few bits of Settings try to talk to the IS when Settings is opened. This
changes them to handle failure by logging warnings to the console.
2019-10-11 15:52:15 +01:00
Bruno Windels
52dbcdb701 add readme explaining the purpose of this directory 2019-10-11 14:21:46 +02:00
Bruno Windels
a6892e7bac document the composer features 2019-10-11 14:19:00 +02:00
Travis Ralston
61cc6c8293 Correctly update the banned users list when a user is unbanned
Fixes https://github.com/vector-im/riot-web/issues/11123

Error wasn't actually the user being unbanned twice - it was a React error about "cannot call enqueueForceUpdate of undefined", which was a binding problem with onUnbanned. However, fixing that didn't do the intended thing - the user was still shown in the settings. We now just listen for membership and  fix it that way.
2019-10-11 12:56:48 +01:00
Weblate
ab05e9eaf7 Merge branch 'origin/develop' into Weblate. 2019-10-11 08:53:32 +00:00
Kaa Jii
df01af0f66 Translated using Weblate (Italian)
Currently translated at 100.0% (1830 of 1830 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-11 08:53:32 +00:00
Michael Telatynski
6e33cc0650
Merge pull request #3433 from matrix-org/t3chguy/nvl/react16/EventListSummary
Summarise state events after room creation
2019-10-11 09:53:26 +01:00
Weblate
91925781a7 Merge branch 'origin/develop' into Weblate. 2019-10-10 16:52:15 +00:00
Michael Telatynski
dcc948f43d
Merge pull request #3543 from matrix-org/t3chguy/timeline_keyboard_focus
Don't intercept TAB on the app outside of the composer, fix tabIndex > 0
2019-10-10 17:52:10 +01:00
David Baker
c663a57dff Add some type checking on event body 2019-10-10 17:49:21 +01:00
Weblate
557c78af27 Merge branch 'origin/develop' into Weblate. 2019-10-10 16:46:31 +00:00
David Baker
c2a5253479
Merge pull request #3546 from matrix-org/dbkr/malformed_events
Add some type checking on event body
2019-10-10 17:46:26 +01:00
Bruno Windels
7900e2292d
Merge pull request #3545 from matrix-org/bwindels/fix-edit-unmount-when-no-selection-release
Fix: edit unmount when no selection
2019-10-10 16:45:44 +00:00
David Baker
847acff894 Add some type checking on event body 2019-10-10 17:36:22 +01:00
Bruno Windels
004c3900a9 don't persist caret when selection is missing
so caret will be put back at end of editor when remounting
2019-10-10 18:35:04 +02:00
Bruno Windels
9dd93c52b0 safeguard if the offsetnode is null when determining caret position 2019-10-10 18:35:04 +02:00
Weblate
0d350c92ef Merge branch 'origin/develop' into Weblate. 2019-10-10 14:57:25 +00:00