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

20805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
d807a1b21e Merge branch 'origin/develop' into Weblate. 2020-01-23 22:09:15 +00:00
Travis Ralston
ed93761b00
Merge pull request #3918 from matrix-org/travis/aliases 
Don't list every single alias when there's many
 2020-01-23 15:09:08 -07:00
Travis Ralston
18f8f8858c Don't list every single alias when there's many 2020-01-23 15:00:18 -07:00
Weblate
adb3066567 Merge branch 'origin/develop' into Weblate. 2020-01-23 22:00:13 +00:00
Travis Ralston
1ac82a9f16 Revert "Don't list every single alias when there's many" 
This reverts commit 6fc647c3d9.
 2020-01-23 15:00:02 -07:00
Weblate
813947fbde Merge branch 'origin/develop' into Weblate. 2020-01-23 22:00:02 +00:00
Travis Ralston
6fc647c3d9 Don't list every single alias when there's many 2020-01-23 14:59:52 -07:00
Weblate
af70fb7e28 Merge branch 'origin/develop' into Weblate. 2020-01-23 21:49:35 +00:00
catborise
4cff50a11e Translated using Weblate (Turkish) 
Currently translated at 72.9% (1494 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-23 21:49:34 +00:00
Travis Ralston
6be0cb92ff
Merge pull request #3907 from matrix-org/travis/user-lists-suggestions 
Try to populate user IDs even when the server's directory fails us
 2020-01-23 14:49:27 -07:00
Weblate
041dfe265e Merge branch 'origin/develop' into Weblate. 2020-01-23 17:02:06 +00:00
Bruno Windels
ce32c12303
Merge pull request #3912 from matrix-org/bwindels/verifyowndevicechecks 
Remove .event property on verification request
 2020-01-23 17:02:00 +00:00
Weblate
0190d785ba Merge branch 'origin/develop' into Weblate. 2020-01-23 16:28:04 +00:00
Michael Telatynski
661b2415d6
Merge pull request #3911 from matrix-org/t3chguy/a11y_tweak 
Attempt to fix Safari + VoiceOver misunderstanding the timeline list
 2020-01-23 16:27:58 +00:00
Weblate
f071f05c01 Merge branch 'origin/develop' into Weblate. 2020-01-23 16:24:04 +00:00
J. Ryan Stinnett
e3027d3086
Merge pull request #3913 from matrix-org/jryans/negotiate-e2e-dms 
Enable encryption in DMs with device keys
 2020-01-23 16:23:59 +00:00
Weblate
407f144247 Merge branch 'origin/develop' into Weblate. 2020-01-23 16:04:46 +00:00
Travis Ralston
a566c74e39
Merge pull request #3905 from matrix-org/travis/user-lists-final 
Fix scrollable area and padding in user lists dialog
 2020-01-23 09:04:40 -07:00
J. Ryan Stinnett
1e25b32ba3 Enable encryption in DMs with device keys 
When the cross-signing lab is enabled, this changes DMs to use encryption as
long as all invited users have uploaded device keys (which we're using as a
proxy for "has some client that understands E2E").

Fixes https://github.com/vector-im/riot-web/issues/12005
 2020-01-23 16:03:42 +00:00
Weblate
cbe8190f15 Merge branch 'origin/develop' into Weblate. 2020-01-23 14:59:26 +00:00
Michael Telatynski
26aa4bb4f3
Merge pull request #3909 from matrix-org/t3chguy/invite_reject_ignore 
Add Reject & Ignore user button to invites view
 2020-01-23 14:59:19 +00:00
Bruno Windels
8a523fbb59 remove this log line, so we can remove the .event property 
this is likely the error Dave hit last week, because there was
no .request event set yet for some other reasons that have
been fixed already (the event being put in the wrong map, theirs
instead of us) in the VerificationRequest object.
 2020-01-23 15:53:54 +01:00
Michael Telatynski
604e244265 Attempt to fix Safari + VoiceOver misunderstanding the timeline list 2020-01-23 14:53:41 +00:00
J. Ryan Stinnett
2b16b650fe Add encryption option to createRoom 2020-01-23 14:05:38 +00:00
J. Ryan Stinnett
c25c1878b8 Move control of room initial state into createRoom 
This changes `createRoom` so it has more control of the room's initial state,
and appends state for different features, rather resetting the entire state
array. This makes room for also controlling encryption state in the next change.
 2020-01-23 13:54:43 +00:00
Weblate
e4ce5c41cc Merge branch 'origin/develop' into Weblate. 2020-01-23 13:31:18 +00:00
Michael Telatynski
d7a4698db8
Merge pull request #3891 from matrix-org/t3chguy/fix_multi_paragraph_formatting 
Fix paragraph-awareness of the composer formatting features
 2020-01-23 13:31:12 +00:00
Michael Telatynski
30bfd4046d improve spacing of buttons on RoomPreviewBar 2020-01-23 12:27:25 +00:00
Michael Telatynski
1747a62118 add missing awaits 2020-01-23 11:55:08 +00:00
Weblate
7396430c46 Merge branch 'origin/develop' into Weblate. 2020-01-23 11:51:37 +00:00
David Baker
8d59cb4632
Merge pull request #3903 from matrix-org/dbkr/bootstrap_visuals_1 
Updated visuals for cross-signing bootstrap
 2020-01-23 11:51:32 +00:00
Michael Telatynski
873952a83e delint 2020-01-23 11:51:31 +00:00
Michael Telatynski
6c3ac2d0c4 Add Reject & Ignore user button to invites view 2020-01-23 11:50:59 +00:00
Michael Telatynski
13bb719a89 Add comment for operations loop 2020-01-23 11:22:22 +00:00
David Baker
10db79bb93 Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1 2020-01-23 11:05:21 +00:00
Weblate
f3a846dfff Merge branch 'origin/develop' into Weblate. 2020-01-23 11:04:58 +00:00
Balázs Meskó
5d8249507c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-23 11:04:57 +00:00
Kévin C
f7ca8a1b84 Translated using Weblate (French) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-23 11:04:56 +00:00
Jeff Huang
8218962c37 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2042 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-23 11:04:56 +00:00
David Baker
442b8be459
Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui 
Implement some parts of new cross signing bootstrap UI
 2020-01-23 11:04:49 +00:00
David Baker
c0b7132404 Different copy on done screen if we setup from scratch 2020-01-23 10:18:08 +00:00
Travis Ralston
e41f94bdb7 Try to populate user IDs even when the server's directory fails us 
Fixes https://github.com/vector-im/riot-web/issues/11943
 2020-01-22 22:33:50 -07:00
Travis Ralston
054ebb9458 Fix scrollable area and padding in user lists dialog 2020-01-22 21:07:29 -07:00
Weblate
c86f0795bd Merge branch 'origin/develop' into Weblate. 2020-01-23 01:06:48 +00:00
J. Ryan Stinnett
1fdd155dd2
Merge pull request #3904 from matrix-org/jryans/report-admin-external-links 
Treat links as external in report content admin message
 2020-01-23 01:06:42 +00:00
J. Ryan Stinnett
a504faa2f6 Treat links as external in report content admin message 
This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab.
 2020-01-22 22:08:37 +00:00
Weblate
d2d5c446e7 Merge branch 'origin/develop' into Weblate. 2020-01-22 21:14:31 +00:00
Michael Telatynski
7a028af359
Merge pull request #3902 from matrix-org/t3chguy/free_the_svg 
Be consistent about our settings svg, free the other one
 2020-01-22 21:14:25 +00:00
Weblate
523e6c7509 Merge branch 'origin/develop' into Weblate. 2020-01-22 20:57:27 +00:00
catborise
78ed8019d4 Translated using Weblate (Turkish) 
Currently translated at 72.6% (1482 of 2042 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-22 20:57:27 +00:00