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

28522 commits

This branch
This branch
All branches
Author SHA1 Message Date
Priit Jõerüüt
1574dd5510 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-09-18 18:46:57 +00:00
Michael Telatynski
2a46f59a0b
Merge pull request #5216 from matrix-org/t3chguy/fix/15182 
UI Feature Flag: Communities
 2020-09-18 19:46:51 +01:00
Michael Telatynski
ffcdaa55e5 Merge branch 't3chguy/fix/15182' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182 2020-09-18 19:34:59 +01:00
Michael Telatynski
02f58edd74 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182 2020-09-18 19:30:42 +01:00
Michael Telatynski
8e9ff05762
Update src/settings/SettingsStore.ts 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-09-18 19:14:24 +01:00
Michael Telatynski
cf7b4dd311 Add isEnabled comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 19:09:45 +01:00
Weblate
84ee4d57db Merge branch 'origin/develop' into Weblate. 2020-09-18 18:04:40 +00:00
Michael Telatynski
2492041ee4
Merge pull request #5236 from matrix-org/t3chguy/fix/15237 
Rename apps back to widgets
 2020-09-18 19:04:34 +01:00
Travis Ralston
a90cf46fef Appease the linter 2020-09-18 11:39:41 -06:00
Travis Ralston
5630f35715 Add a UI feature to disable advanced encryption options 2020-09-18 11:33:02 -06:00
Michael Telatynski
6f7d6f27f1 move the check 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 18:15:05 +01:00
Travis Ralston
72f53e2cae Merge branch 't3chguy/fix/15182' into travis/uifeat/paranoia 2020-09-18 11:13:43 -06:00
Weblate
0ee210f667 Merge branch 'origin/develop' into Weblate. 2020-09-18 17:11:40 +00:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720 
Adjust layout and formatting of notifications / files cards
 2020-09-18 11:11:35 -06:00
Travis Ralston
189233447b Merge branch 'develop' into t3chguy/fix/15182 2020-09-18 11:06:32 -06:00
Weblate
f479753486 Merge branch 'origin/develop' into Weblate. 2020-09-18 17:03:13 +00:00
Michael Telatynski
84f0a610a9
Merge pull request #5232 from matrix-org/t3chguy/fix/15229 
Fix Search Results Tile undefined variable access regression
 2020-09-18 18:03:08 +01:00
Weblate
e286eb75ef Merge branch 'origin/develop' into Weblate. 2020-09-18 17:03:04 +00:00
Marcelo Filho
7e0b5534e6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.1% (2229 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/pt_BR/
 2020-09-18 17:03:03 +00:00
Michael Telatynski
4d34e40680
Merge pull request #5233 from matrix-org/t3chguy/fix/15231 
Fix Cmd/Ctrl+Shift+U for File Upload
 2020-09-18 18:02:58 +01:00
Travis Ralston
8838bd724b Update copy for files 2020-09-18 10:58:17 -06:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Michael Telatynski
99d4e538b0 Fix New Room List arrow key management 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 17:13:45 +01:00
Michael Telatynski
949b8d9afe Rename apps back to widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 16:35:42 +01:00
Michael Telatynski
004c68b394 Fix Room Directory View & Preview actions for federated joins 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 15:43:08 +01:00
Weblate
146279aafc Merge branch 'origin/develop' into Weblate. 2020-09-18 13:50:53 +00:00
XoseM
e3f7860f30 Translated using Weblate (Galician) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-09-18 13:50:53 +00:00
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
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
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