OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,406 Commits
203 Branches
553 Tags
457 MiB
Commit Graph

17406 Commits (7b3282185ab2a82bd2508a585f91e234d1d593b5)

Author SHA1 Message Date
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
Weblate 5b93d4b817 Merge branch 'origin/develop' into Weblate. 2019-08-13 15:00:26 +00:00
dccs 5bc9636e28 Translated using Weblate (German) 
Currently translated at 88.9% (1519 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-08-13 15:00:26 +00: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 7a9246533d Hack to ignore @define-mixin 
as per bug in comment
 2019-08-13 15:40:03 +01:00
David Baker 050766e7bb selector ordering 2019-08-13 15:19:39 +01: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 e07c22a78d Make mixin for fields in settings that need to be the same width 
and make that width narrower so we can fit a tooltip in the left
hand side (they were a little too wide anyway for the kind of data
being entered, even on a narrow window).
 2019-08-13 12:53:14 +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
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