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 |
|
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
|
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
|
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 |
|
David Baker
|
f88349530a
|
rerun i18n
|
2019-08-13 18:41:18 +01:00 |
|
David Baker
|
7c35107a37
|
Update 3pids section visibility when id server set / unset
|
2019-08-13 18:40:27 +01:00 |
|
David Baker
|
c80c8dcf24
|
prefill id server box with default if there isn't one
|
2019-08-13 17:55:10 +01:00 |
|
David Baker
|
596ff93049
|
unused import
|
2019-08-13 16:38:46 +01:00 |
|
David Baker
|
2539da0dfa
|
Use fetch instead of browser-request
|
2019-08-13 16:37:56 +01:00 |
|
David Baker
|
31fd36efba
|
use accessiblebutton
|
2019-08-13 16:20:30 +01:00 |
|
Travis Ralston
|
d4bbed31d5
|
Merge branch 'develop' into travis/integs/account_set
|
2019-08-13 09:03:50 -06:00 |
|
Travis Ralston
|
24ac1d1547
|
Merge branch 'develop' into travis/integs/widgets
|
2019-08-13 09:02:52 -06:00 |
|
Travis Ralston
|
831da696ad
|
Merge pull request #3301 from matrix-org/travis/integs/base
Refactor integration manager handling into a common place
|
2019-08-13 09:00:22 -06:00 |
|
David Baker
|
02504b9959
|
make it work again
|
2019-08-13 12:59:34 +01:00 |
|
David Baker
|
e5f913bc11
|
Merge remote-tracking branch 'origin/develop' into dbkr/change_is
|
2019-08-13 12:56:58 +01:00 |
|
David Baker
|
7afaba3bf1
|
link to doc issue
|
2019-08-13 11:05:41 +01:00 |
|
David Baker
|
860a9dbc82
|
s/tooltip/tooltipContent/
|
2019-08-13 11:01:04 +01:00 |
|
David Baker
|
c36c3a9b33
|
other general grammar
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-08-13 10:51:26 +01:00 |
|
David Baker
|
934b711936
|
write Identity Server out in full to be less confusing
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-08-13 10:48:56 +01:00 |
|
David Baker
|
c732ae3aa9
|
Correct license header
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-08-13 10:46:42 +01:00 |
|
David Baker
|
12eeb20574
|
Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent
Fix wrong default-letter-avatar for RoomAvatarEvent
|
2019-08-13 09:32:26 +01:00 |
|
Travis Ralston
|
03d735f4ed
|
Support changing your integration manager in the UI
Part of https://github.com/vector-im/riot-web/issues/10161
|
2019-08-12 15:40:50 -06:00 |
|
Travis Ralston
|
e21c12c2c9
|
Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set
|
2019-08-12 13:06:36 -06:00 |
|
Travis Ralston
|
ef33adce01
|
Merge branch 'travis/integs/widgets' into travis/integs/account_set
|
2019-08-12 13:02:23 -06:00 |
|
Travis Ralston
|
60778d843d
|
Merge branch 'travis/integs/base' into travis/integs/account_set
|
2019-08-12 13:02:19 -06:00 |
|
Michael Telatynski
|
bb23374b8a
|
Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings
Consolidate Themes into ThemeController. Remove hardcoded themes in view
|
2019-08-12 15:57:56 +01:00 |
|
David Baker
|
b694a56689
|
i18n
|
2019-08-12 14:48:02 +01:00 |
|
David Baker
|
0c4b29faa9
|
Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is
|
2019-08-12 14:47:40 +01:00 |
|
David Baker
|
4d33438acb
|
c+p fail
|
2019-08-12 14:46:04 +01:00 |
|
David Baker
|
0b51a5f452
|
c+p fail
|
2019-08-12 14:45:15 +01:00 |
|
David Baker
|
115e4c0370
|
Remove IS access token too
|
2019-08-12 14:40:11 +01:00 |
|
David Baker
|
ebc84b4445
|
Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is
|
2019-08-12 14:39:46 +01:00 |
|
David Baker
|
f358b6162d
|
Remove the access token for the old IS
Pretty important that we don't send that to the new IS...
|
2019-08-12 14:38:49 +01:00 |
|
David Baker
|
384f07adb2
|
Disconnect from IS button
|
2019-08-12 14:36:48 +01:00 |
|
Michael Telatynski
|
7bdac85a2a
|
Break themes out into a separate file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-08-12 14:24:12 +01:00 |
|
Michael Telatynski
|
691b9145ee
|
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig
Deduplicate code in ModularServerConfig by extending ServerConfig
|
2019-08-12 14:19:17 +01:00 |
|
Michael Telatynski
|
76f5977a2a
|
Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field
RegistrationForm: the Fields are controlled, fix default values
|
2019-08-12 13:48:42 +01:00 |
|