mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
28813 commits 217 branches 561 tags 443 MiB
Commit graph

28813 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
46f6c140e6
Merge pull request #5231 from matrix-org/travis/e2e-default-serverside 
Disable the e2ee toggle when creating a room on a server with forced e2e
 2020-09-18 07:50:45 -06:00
Michael Telatynski
adcb75facb Only show User Info verify button if the other user has e2ee devices 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 14:34:51 +01:00
Weblate
a28baafbb7 Merge branch 'origin/develop' into Weblate. 2020-09-18 11:34:43 +00:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179 
UI Feature Flag: Disable advanced options and tidy up some copy
 2020-09-18 12:34:38 +01:00
Michael Telatynski
d267092b19 Make the upload_file dispatch synchronous to make Firefox happy about it 2020-09-18 12:33:25 +01:00
Michael Telatynski
780aea1a36 Mac sends lowercase event.key even when holding Shift unlike Windows 2020-09-18 12:32:33 +01:00
Michael Telatynski
de1d9e0e09 Fix Search Results Tile undefined variable access regression 2020-09-18 12:15:56 +01:00
Weblate
02d00ab3f1 Merge branch 'origin/develop' into Weblate. 2020-09-18 10:34:57 +00:00
Michael Telatynski
ee4a5b2208
Merge pull request #5228 from matrix-org/t3chguy/15187 
UI Feature Flag: 3PIDs
 2020-09-18 11:34:52 +01:00
Michael Telatynski
9dbc1dbc85 Hide Advanced Appearance Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 11:34:35 +01:00
Michael Telatynski
687a2e56b2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179 
 Conflicts:
	src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-18 11:29:38 +01:00
Michael Telatynski
1a965b1cb7 UIF 3PID implies UIF Identity Server 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 11:15:48 +01:00
Michael Telatynski
598c982f02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-18 11:14:36 +01:00
Weblate
f3060f8602 Merge branch 'origin/develop' into Weblate. 2020-09-18 09:28:40 +00:00
Szimszon
2c4a4a13a4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2376 of 2376 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-09-18 09:28:40 +00:00
Priit Jõerüüt
72d40b604e Translated using Weblate (Estonian) 
Currently translated at 100.0% (2376 of 2376 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-09-18 09:28:40 +00:00
Jeff Huang
3707359ec3 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2376 of 2376 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-09-18 09:28:39 +00:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup 
Defer encryption setup until first E2EE room
 2020-09-18 10:28:33 +01:00
Travis Ralston
38f8c0a835 Disable the e2ee toggle when creating a room on a server with forced e2e 
Fixes https://github.com/vector-im/element-web/issues/15186
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1470
 2020-09-17 22:46:01 -06:00
Travis Ralston
feaa5f31ea Match consistency 2020-09-17 15:00:35 -06:00
Travis Ralston
849a5e4a39 Round the jitsi pip corners 2020-09-17 14:58:48 -06:00
Travis Ralston
f5f48cbc21 Fix indentation 2020-09-17 10:44:58 -06:00
Travis Ralston
4657a34bbb Document some of the magic values 2020-09-17 10:44:18 -06:00
Travis Ralston
14a7b83988 Don't show a bottom border ahead of the date separator 2020-09-17 10:40:48 -06:00
Travis Ralston
55ceb2abd6
speeeeeeling 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2020-09-17 09:33:05 -06:00
Travis Ralston
24d0950b7e Adjust layout and formatting of notifications / file cards 
This follows some polish time with a designer.

The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely. 

We also spent some time making the notifications panel more legible while we wait for the overhaul to land.
 2020-09-17 09:23:06 -06:00
Weblate
6811576c0b Merge branch 'origin/develop' into Weblate. 2020-09-17 14:06:21 +00:00
Michael Telatynski
d59a1fbd80
Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps 
Tidy devDeps, all the webpack stuff lives in the layer above
 2020-09-17 15:06:16 +01:00
Weblate
d75af1d826 Merge branch 'origin/develop' into Weblate. 2020-09-17 13:43:41 +00:00
Michael Telatynski
c6d76f2b55
Merge pull request #5214 from matrix-org/t3chguy/fix/15178 
UI Feature Flag: Hide flair
 2020-09-17 14:43:36 +01:00
Michael Telatynski
c904b4f416 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 14:10:51 +01:00
Weblate
0587e72841 Merge branch 'origin/develop' into Weblate. 2020-09-17 13:08:02 +00:00
Michael Telatynski
53ee5d82c7
Merge pull request #5218 from matrix-org/t3chguy/fix/15181 
UI Feature Flag: Identity server
 2020-09-17 14:07:56 +01:00
Michael Telatynski
25171347a0 i18n 2020-09-17 13:57:47 +01:00
Michael Telatynski
c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181 
 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:55:11 +01:00
Weblate
70fa390cc0 Merge branch 'origin/develop' into Weblate. 2020-09-17 12:51:24 +00:00
Michael Telatynski
5f324b19f0
Merge pull request #5221 from matrix-org/t3chguy/fix/15180 
UI Feature Flag: Share dialog QR code and social icons
 2020-09-17 13:51:19 +01:00
Michael Telatynski
ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:42:27 +01:00
Weblate
198720af36 Merge branch 'origin/develop' into Weblate. 2020-09-17 12:40:11 +00:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188 
UI Feature Flag: Registration, Password Reset, Deactivate
 2020-09-17 13:40:06 +01:00
Weblate
4c37fdaea0 Merge branch 'origin/develop' into Weblate. 2020-09-17 12:34:12 +00:00
Michael Telatynski
1ca20dffc8
Merge pull request #5204 from matrix-org/t3chguy/fix/15164 
Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT
 2020-09-17 13:34:07 +01:00
Michael Telatynski
5bf6697e48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f UI Feature Flag: 3PIDs 2020-09-17 13:25:18 +01:00
Weblate
7d2c1474d1 Merge branch 'origin/develop' into Weblate. 2020-09-17 11:09:14 +00:00
Michael Telatynski
148a57c58e
Merge pull request #5217 from matrix-org/t3chguy/fix/15175 
UI Feature Flag: Disable VoIP
 2020-09-17 12:09:09 +01:00
Michael Telatynski
f52b267bd3 i18n 2020-09-17 12:07:17 +01:00
Michael Telatynski
4213a557f2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01:00
Travis Ralston
e849cd8fe5 Null-check the widget before continuing 
Deleted widgets should return isPinned=false
 2020-09-16 22:51:39 -06:00