PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
17267 commits 1 branch 0 tags 338 MiB
Commit graph

17267 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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