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

17593 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
a96df333e9
Merge pull request #3310 from matrix-org/t3chguy/fix_reply_parent_redacted 
Fix showing events which were replied to and then redacted
 2019-08-16 19:19:25 +01:00
David Baker
dbe5c2cb45 Allow password reset without an ID Server 
If the server advertises that it supports doing so

Requires matrix-org/matrix-js-sdk#1018
Requires matrix-org/matrix-js-sdk#1019
Fixes vector-im/riot-web#10572
 2019-08-16 18:11:24 +01:00
Travis Ralston
de3c489fba Fix i18n 2019-08-16 09:41:23 -06:00
Travis Ralston
2456912ec7 Merge remote-tracking branch 'origin/develop' into travis/terms/inline-is-only 2019-08-16 09:41:00 -06:00
David Baker
a87fb7eaa2 also remove from comment 2019-08-16 15:36:41 +01:00
David Baker
3c4c595f79 remove old serverCaps 2019-08-16 15:27:11 +01:00
David Baker
41a9db3224 Use new flag in /versions 2019-08-16 15:07:15 +01:00
Weblate
ba653a30db Merge branch 'origin/develop' into Weblate. 2019-08-16 13:31:42 +00:00
albanobattistella
c917463da8 Translated using Weblate (Italian) 
Currently translated at 97.9% (1696 of 1733 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-08-16 13:31:42 +00:00
Osoitz
c90e4ab4a3 Translated using Weblate (Basque) 
Currently translated at 100.0% (1733 of 1733 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-08-16 13:31:41 +00:00
Travis Ralston
218bee8071
Merge pull request #3316 from matrix-org/travis/terms/inline-im-is 
Prompt for terms of service on integration manager changes
 2019-08-16 07:31:36 -06:00
David Baker
19c7a4627d fix test 2019-08-16 12:24:52 +01:00
David Baker
e705d110af Allow registering with email if no ID Server 
If the server advertises that it supports doing so

This version uses a random me.dbkr prefix until the MSC is
written.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1017
Implements https://github.com/matrix-org/matrix-doc/pull/2233
 2019-08-16 11:57:32 +01:00
Weblate
59fe6c03ae Merge branch 'origin/develop' into Weblate. 2019-08-16 09:56:44 +00:00
Kévin C
9c12791f37 Translated using Weblate (French) 
Currently translated at 100.0% (1732 of 1732 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-16 09:56:44 +00:00
Osoitz
ae9039ab2c Translated using Weblate (Basque) 
Currently translated at 98.4% (1705 of 1732 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-08-16 09:56:44 +00:00
David Baker
cde1944cac
Merge pull request #3314 from matrix-org/dbkr/warn_if_bound_threepids 
Warn on disconnecting from IS
 2019-08-16 10:56:39 +01:00
Travis Ralston
02f8b72533 tfw the linter finds bugs for you 2019-08-15 16:08:18 -06:00
Travis Ralston
9860baf0b4 Prompt for terms of service on identity server changes 
Part of https://github.com/vector-im/riot-web/issues/10539
 2019-08-15 16:02:02 -06:00
Travis Ralston
0acae22527 Merge branch 'travis/terms/inline-im-is' into travis/terms/inline-is-only 2019-08-15 14:41:22 -06:00
Travis Ralston
5fe691cf33 Double equals 2019-08-15 13:33:02 -06:00
Travis Ralston
e2f013ddb4 Appease the linter 
This looks awkward, but should pass.
 2019-08-15 13:31:45 -06:00
Travis Ralston
27504e1578 Prompt for terms of service on integration manager changes 
Part of https://github.com/vector-im/riot-web/issues/10539
 2019-08-15 13:28:23 -06:00
David Baker
7d96cc969a
use original bug 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-08-15 15:39:15 +01:00
Weblate
316ca978c2 Merge branch 'origin/develop' into Weblate. 2019-08-15 14:38:38 +00:00
David Baker
ded2297523
Merge pull request #3315 from matrix-org/dbkr/fix_set_im 
Fix set integration manager tooltip
 2019-08-15 15:38:34 +01:00
Weblate
ea1f80a9c8 Merge branch 'origin/develop' into Weblate. 2019-08-15 14:16:16 +00:00
Nathan Follens
002de2c691 Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1727 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-08-15 14:16:15 +00:00
Kévin C
c926e1a89f Translated using Weblate (French) 
Currently translated at 100.0% (1727 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-15 14:16:14 +00:00
Nathan Follens
2bdce1229c Translated using Weblate (Dutch) 
Currently translated at 100.0% (1727 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-08-15 14:16:13 +00:00
J. Ryan Stinnett
f3e169775a
Merge pull request #3309 from matrix-org/jryans/stun-turn-fallback 
Prompt for ICE server fallback permission
 2019-08-15 15:16:07 +01:00
J. Ryan Stinnett
adc3c69022 Update ICE fallback text 2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
d610bfc5e5 Remove ICE fallback prompt from pre-call path 2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
67b830c48d Improve fallback ICE setting label 2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
d31f556c1f Move ICE fallback prompt to time of placing / answering calls 
This moves the ICE fallback prompt out of session startup and instead it will
now appear contextually when your either place a call with no ICE server from
the homeserver or a call fails (in either direction).

Fixes https://github.com/vector-im/riot-web/issues/10546
 2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
1c6312d999 Store ICE fallback permission in device setting 
This stores the ICE server fallback permission in a device setting so it is
remembered across sessions.

Part of https://github.com/matrix-org/matrix-react-sdk/pull/3309
 2019-08-15 15:04:23 +01:00
J. Ryan Stinnett
c1378f8e0b Prompt for ICE server fallback permission 
This adds a prompt at the start of each session when the homeserver does not
have any ICE servers configured. The fallback ICE server is only used if the
user allows it. The dialog also recommends notifying the homeserver admin to
rectify the issue.

Fixes https://github.com/vector-im/riot-web/issues/10173
 2019-08-15 15:04:23 +01:00
David Baker
40f693d0fc Fix set integration manager tooltip 
The name of the prop changed in the original PR and this one didn't
get updated.
 2019-08-15 14:55:59 +01:00
David Baker
6f07f9157c lint 2019-08-15 13:10:05 +01:00
David Baker
e6c5775d0e Commit the new file 2019-08-15 12:16:59 +01:00
David Baker
54fb1b5302 Unused variables / imports 2019-08-15 12:07:59 +01:00
David Baker
75770f7a4a Warn on disconnecting from IS 
...if the user has bound threepids

Fixes https://github.com/vector-im/riot-web/issues/10550
 2019-08-15 12:04:07 +01:00
Weblate
86ac316350 Merge branch 'origin/develop' into Weblate. 2019-08-15 09:52:31 +00:00
Nathan Follens
e301367655 Translated using Weblate (West Flemish) 
Currently translated at 97.7% (1687 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-08-15 09:52:31 +00:00
Tuomas Hietala
91f544c02e Translated using Weblate (Finnish) 
Currently translated at 98.7% (1704 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-08-15 09:52:30 +00:00
Nathan Follens
b50add3715 Translated using Weblate (Dutch) 
Currently translated at 97.7% (1687 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-08-15 09:52:29 +00:00
Jeff Huang
b1a9fb79f8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1727 of 1727 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-15 09:52:29 +00:00
David Baker
4afed0fab4
Merge pull request #3313 from matrix-org/t3chguy/fix_jitsi_persisted_breaking_randomly 
Fix Persisted Widgets (Jitsi) randomly closing on room change
 2019-08-15 10:52:24 +01:00
Michael Telatynski
6f529852cd Skip forceUpdate in ReplyThread if the redacted event is not relevant 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-14 23:27:04 +01:00
Weblate
4b0a242b16 Merge branch 'origin/develop' into Weblate. 2019-08-14 22:18:47 +00:00