Commit Graph

17292 Commits (b1a9fb79f839a7e01e6edbeb5447d6365c93f2cb)

Author SHA1 Message Date
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
Weblate 93ec1b44c1 Merge branch 'origin/develop' into Weblate. 2019-08-13 08:32:30 +00: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
Weblate 3ee91186f1 Merge branch 'origin/develop' into Weblate. 2019-08-12 20:55:27 +00:00
Travis Ralston b8fb283391
Merge pull request #3307 from matrix-org/travis/fix-settings-alignment
Fix alignment of add email/phone number inputs in settings
2019-08-12 14:55:23 -06:00
Travis Ralston 438eba1c46 Fix alignment of add email/phone number inputs in settings 2019-08-12 14:14:17 -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
Weblate d2de260aa7 Merge branch 'origin/develop' into Weblate. 2019-08-12 17:19:15 +00:00
Michael Telatynski e3348c6184
Merge pull request #3306 from matrix-org/t3chguy/react16_2
Bump matrix-react-test-utils for React 16 compatibility
2019-08-12 18:19:11 +01:00
Michael Telatynski 7145d0e1a6 Hit yarn with a hammer until it works
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 18:06:37 +01:00
Michael Telatynski 387fa75da8 Bump matrix-react-test-utils for React 16 compatibility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 17:41:36 +01:00
Weblate 04a52f707e Merge branch 'origin/develop' into Weblate. 2019-08-12 14:58:00 +00: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
Weblate 8e33b52bd2 Merge branch 'origin/develop' into Weblate. 2019-08-12 13:19:21 +00: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
Weblate 9636bc5a33 Merge branch 'origin/develop' into Weblate. 2019-08-12 12:48:47 +00:00
Tuomas Hietala 36a396247a Translated using Weblate (Finnish)
Currently translated at 99.1% (1693 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-08-12 12:48:47 +00: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
David Baker bc088e4472 add comment 2019-08-12 13:31:31 +01:00
David Baker 10b19622db Don't clear field on failure 2019-08-12 13:29:52 +01:00
David Baker bc66545fd0 shorten url by default 2019-08-12 13:11:05 +01:00
David Baker 06905bc5bb Actually appease linter 2019-08-12 12:05:25 +01:00
David Baker bf9caa7fd8 add the rest of the files 2019-08-12 11:51:44 +01:00
David Baker 1067457d63 rerun i18n 2019-08-12 11:51:08 +01:00
David Baker 417d9b6af8 nicer way to appease linter 2019-08-12 11:50:11 +01:00
Jeff Huang 66e6ed2d17 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-08-12 04:07:53 +00:00
Besnik Bleta e346c17006 Translated using Weblate (Albanian)
Currently translated at 99.5% (1701 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-08-12 04:07:52 +00:00
Michael Telatynski 916af736ad Consolidate Themes into ThemeController. Remove hardcoded themes in view
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:43:34 +01:00
Michael Telatynski 3e08bf6ecb Deduplicate code in ModularServerConfig by extending ServerConfig
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:34:12 +01:00
Travis Ralston d2c7a5a979 Also check that the client even exists 2019-08-10 14:59:13 -06:00
Travis Ralston 58ccc7eb0c Don't fetch widgets unless logged in 2019-08-09 18:01:08 -06:00
Travis Ralston 74ce5c3541 Read integration managers from account data
For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161

Relies on the structure defined by [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)

This is just the bit of code to parse the user's widgets (while watching for changes) and allow for it to be the default manager.
2019-08-09 17:35:59 -06:00
Travis Ralston 4c82d16e34 Merge branch 'travis/integs/base' into travis/integs/widgets 2019-08-09 17:20:51 -06:00
Travis Ralston 3a4c6f3eac Appease the linter again 2019-08-09 17:20:37 -06:00
Travis Ralston 018b4f5d41 Use the default integration manager for config options 2019-08-09 17:08:26 -06:00