mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 23:31:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
17596 commits 219 branches 562 tags 474 MiB
Commit graph

17596 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Weblate
3d3b938d87 Merge branch 'origin/develop' into Weblate. 2019-08-14 15:44:18 +00:00
dccs
0edeae643b Translated using Weblate (German) 
Currently translated at 88.4% (1520 of 1720 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-08-14 15:44:18 +00:00
Jeff Huang
988162e48c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1720 of 1720 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-14 15:44:18 +00: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
Weblate
0fc04f8913 Merge branch 'origin/develop' into Weblate. 2019-08-14 12:26:38 +00:00
Jeff Huang
0da5c45564 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.8% (1716 of 1720 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-14 12:26:38 +00:00
Besnik Bleta
3342aff210 Translated using Weblate (Albanian) 
Currently translated at 99.7% (1715 of 1720 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-08-14 12:26:37 +00: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
Weblate
7b4d1e754d Merge branch 'origin/develop' into Weblate. 2019-08-14 09:23:24 +00: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
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
Travis Ralston
09fce33a8c Merge branch 'develop' into travis/integs/account_set 2019-08-13 13:02:44 -06:00
Weblate
191f90199f Merge branch 'origin/develop' into Weblate. 2019-08-13 19:02:05 +00:00
Travis Ralston
a5cac02910
Merge pull request #3302 from matrix-org/travis/integs/widgets 
Read integration managers from account data (widgets)
 2019-08-13 13:02:00 -06: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
Michael Telatynski
a44d61fb75 add copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-13 18:17:42 +01:00
Michael Telatynski
6589e5dab9 Fix showing events which were replied to and then redacted 2019-08-13 18:13:47 +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
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