Travis Ralston
3228062954
Merge branch 'travis/terms/inline-is-only' into travis/is-account-data
2019-08-16 12:45:40 -06:00
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
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
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
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
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
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
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
Michael Telatynski
4833d4cb23
Merge pull request #3312 from matrix-org/t3chguy/cleanup_legacy_verification
...
Verifying your own device should not ask you to "contact its owner"
2019-08-14 23:18:43 +01:00
Michael Telatynski
7b17ea1fa5
Fix Persisted Widgets (Jitsi) randomly closing on room change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 23:15:49 +01:00
Travis Ralston
f69235b884
Merge pull request #3308 from matrix-org/travis/integs/account_set
...
Support changing your integration manager in the UI
2019-08-14 09:44:13 -06:00
Travis Ralston
b77be2d380
Just use MSC1957
2019-08-14 09:33:02 -06:00
Travis Ralston
8b1c90a01e
Convert to using im.vector.integration_manager for IM widget
...
This avoids us having to throw the entirety of MSC1957 into the queue, particularly when we're only using a third of the MSC.
2019-08-14 08:57:38 -06:00
Travis Ralston
02a4121401
Mixin for field width
2019-08-14 08:55:49 -06:00
Travis Ralston
7a1a245899
Fix i18n
2019-08-14 08:52:05 -06:00
Travis Ralston
beb6ec4327
Merge branch 'develop' into travis/integs/account_set
2019-08-14 08:45:01 -06:00
Michael Telatynski
8186f1be2e
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 14:08:10 +01:00
Michael Telatynski
e8834930f9
Verifying your own device should not ask you to "contact its owner"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 13:58:27 +01:00
Michael Telatynski
088dc7953b
Merge pull request #3311 from matrix-org/t3chguy/delint_languageHandler
...
delint languageHandler
2019-08-14 13:26:33 +01:00
Michael Telatynski
e668b2f8bd
delint languageHandler
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-14 12:29:48 +01:00
David Baker
30681c7150
Merge pull request #3305 from matrix-org/dbkr/disco_is
...
Disconnect from IS Button
2019-08-14 10:23:20 +01:00
David Baker
c74da125b2
i18n
2019-08-14 10:12:39 +01:00
David Baker
be7956db61
Spell out identity server
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:43 +01:00
David Baker
3c3b530e1e
Spell out identity server
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:30 +01:00
David Baker
85497610e3
Spell out identity server
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:15 +01:00
David Baker
0d560108b6
Kill smart quotes
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-14 10:07:50 +01:00
David Baker
b0420c106e
Prepopulate client default on disconnect
2019-08-14 10:06:05 +01:00
David Baker
735c6d73d8
Merge remote-tracking branch 'origin/develop' into dbkr/disco_is
2019-08-14 10:03:32 +01:00
David Baker
e2c5dc6bac
Merge pull request #3300 from matrix-org/dbkr/change_is
...
Add UI in settings to change ID Server
2019-08-14 09:42:20 +01:00
Travis Ralston
09fce33a8c
Merge branch 'develop' into travis/integs/account_set
2019-08-13 13:02:44 -06:00