mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
20825 commits 216 branches 561 tags 417 MiB
Commit graph

20825 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
c0d034a1c4 Merge branch 'origin/develop' into Weblate. 2020-01-24 09:50:30 +00:00
David Baker
50b05551ba
Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader 
Remove riot logo from the security setup screens
 2020-01-24 09:50:25 +00:00
Weblate
20da361acd Merge branch 'origin/develop' into Weblate. 2020-01-24 09:38:33 +00:00
Kévin C
169852adec Translated using Weblate (French) 
Currently translated at 100.0% (2053 of 2053 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-24 09:38:32 +00:00
David Baker
81caa12b16
Merge pull request #3917 from matrix-org/dbkr/complete_security_detect_success 
Only say the session is verified if it is now verified
 2020-01-24 09:38:25 +00:00
David Baker
99252e08b0 Unintentional commit 2020-01-24 09:37:43 +00:00
David Baker
cd4e75c378 Unnecessary blank line 2020-01-24 09:36:22 +00:00
Weblate
12b8bd7344 Merge branch 'origin/develop' into Weblate. 2020-01-23 23:43:08 +00:00
Travis Ralston
d3960b8c54
Merge pull request #3924 from matrix-org/travis/sso-pw 
Hide password section if you can't change your password
 2020-01-23 16:43:01 -07:00
Travis Ralston
1394331133 Fix booleans 2020-01-23 16:33:33 -07:00
Travis Ralston
c22bfa84b7 Hide password section if you can't change your password 
Fixes https://github.com/vector-im/riot-web/issues/11950
 2020-01-23 16:29:55 -07:00
Weblate
bdcf9452d4 Merge branch 'origin/develop' into Weblate. 2020-01-23 23:02:57 +00:00
Travis Ralston
beb2503542
Merge pull request #3922 from matrix-org/travis/fix-copy 
Ensure a plaintext version of the composer ends up on the clipboard
 2020-01-23 16:02:52 -07:00
Travis Ralston
915c4efeac Ensure a plaintext version of the composer ends up on the clipboard 
Fixes https://github.com/vector-im/riot-web/issues/12018
 2020-01-23 15:53:32 -07:00
Weblate
22a6bcfc17 Merge branch 'origin/develop' into Weblate. 2020-01-23 22:46:16 +00:00
Travis Ralston
40cb9e5dd9
Merge pull request #3920 from matrix-org/travis/fix-build 
Move & upgrade babel runtime into dependencies (like it wants)
 2020-01-23 15:46:11 -07:00
Travis Ralston
4aa3be9b42 Move & upgrade babel runtime into dependencies (like it wants) 
https://babeljs.io/docs/en/babel-runtime
 2020-01-23 15:43:22 -07:00
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
David Baker
74b678d0ff Only say the session is verified if it is now verified 2020-01-23 19:19:12 +00:00
David Baker
a3026277c1 Unused variable 2020-01-23 18:24:03 +00:00
David Baker
5319ee4572 Remove riot logo from the security setup screens 
With a little faff to make the rounded borders consistent again
 2020-01-23 18:14:08 +00: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