OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,267 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

14012 Commits (7b4d1e754d940c3e2adb9352aae1e7bb74385607)

Author SHA1 Message Date
Weblate 7b4d1e754d Merge branch 'origin/develop' into Weblate. 2019-08-14 09:23:24 +00: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
Weblate a0e2f07cab Merge branch 'origin/develop' into Weblate. 2019-08-14 08:42:25 +00: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
Weblate 191f90199f Merge branch 'origin/develop' into Weblate. 2019-08-13 19:02:05 +00: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 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 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
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
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