mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 21:18:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
25122 commits 208 branches 547 tags 609 MiB
Commit graph

25122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
2bf74c0229 Merge branch 'origin/develop' into Weblate. 2020-06-04 20:12:26 +00:00
Travis Ralston
3fff46b0c7
Merge pull request #4709 from matrix-org/travis/later 
Fix not being able to dismiss new login toasts
 2020-06-04 14:12:21 -06:00
Travis Ralston
dc23dd637c Revert "Add a warning for dismissing invalid toasts" 
This reverts commit 3674b6446e.
 2020-06-04 14:07:06 -06:00
Travis Ralston
3674b6446e Add a warning for dismissing invalid toasts 2020-06-04 13:53:09 -06:00
Travis Ralston
c667ea69af Fix not being able to dismiss new login toasts 
`toastKey` is a thing.

Fixes https://github.com/vector-im/riot-web/issues/13923
 2020-06-04 13:48:35 -06:00
Weblate
f72e331d99 Merge branch 'origin/develop' into Weblate. 2020-06-04 18:30:01 +00:00
David Baker
ddc9c67a8b
Merge pull request #4708 from matrix-org/dbkr/bind_tooltip_render 
Fix exceptions from Tooltip
 2020-06-04 19:29:56 +01:00
David Baker
5e569d75b6 Fix exceptions from Tooltip 
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.

Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
 2020-06-04 17:54:18 +01:00
Weblate
73ba31a438 Merge branch 'origin/develop' into Weblate. 2020-06-04 16:41:21 +00:00
Michael Telatynski
88c325afa4
Merge pull request #4707 from tulir/patch-1 
Stop removing variation selector from quick reactions
 2020-06-04 17:41:15 +01:00
Tulir Asokan
46b282142f
Stop removing variation selector from quick reactions 
Fixes vector-im/riot-web#13926

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2020-06-04 18:58:13 +03:00
Weblate
1f9face6cd Merge branch 'origin/develop' into Weblate. 2020-06-04 14:14:43 +00:00
RiotRobot
3c73930e9a Reset matrix-js-sdk back to develop branch 2020-06-04 15:14:34 +01:00
Weblate
d62417dda2 Merge branch 'origin/develop' into Weblate. 2020-06-04 14:14:07 +00:00
XoseM
47df8f2ac0 Translated using Weblate (Galician) 
Currently translated at 53.5% (1208 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-04 14:14:07 +00:00
RiotRobot
260d448db6 Merge branch 'master' into develop 2020-06-04 15:13:41 +01:00
RiotRobot
65e59fd708 v2.7.0 2020-06-04 15:12:24 +01:00
RiotRobot
5aff8f7915 Prepare changelog for v2.7.0 2020-06-04 15:12:23 +01:00
RiotRobot
07a12a73ee Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:06:40 +01:00
Weblate
648167ffdd Merge branch 'origin/develop' into Weblate. 2020-06-04 12:59:19 +00:00
XoseM
82eb80f0c6 Translated using Weblate (Galician) 
Currently translated at 52.7% (1189 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-04 12:59:19 +00:00
Michael Telatynski
920e087ada
Merge pull request #4704 from matrix-org/t3chguy/continuation 
Tidy up continuation algorithm and make it work for hidden profile changes
 2020-06-04 13:59:13 +01:00
Weblate
deac4222fb Merge branch 'origin/develop' into Weblate. 2020-06-04 12:50:20 +00:00
Michael Telatynski
4043989a25
Merge pull request #4699 from matrix-org/t3chguy/fix-own-displayname 
Profile settings should never show a disambiguated display name
 2020-06-04 13:50:15 +01:00
Bruno Windels
737c31a54c
Merge pull request #4703 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore-rc 
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
 2020-06-04 12:37:48 +00:00
Michael Telatynski
6d81337d92 Tidy up continuation algorithm and make it work for hidden profile change events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-04 13:10:45 +01:00
Weblate
0c7fc87fa8 Merge branch 'origin/develop' into Weblate. 2020-06-04 12:07:24 +00:00
Bruno Windels
77b012e49b
Merge pull request #4701 from matrix-org/bwindels/preventbootstrapfromkeybackuprestore 
Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
 2020-06-04 12:07:19 +00:00
Bruno Windels
40cabd2589 When trying to restore a keyback that has its key in 4S, check if 4S will be readable 
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
 2020-06-04 14:03:48 +02:00
J. Ryan Stinnett
4e623fa8c0
Merge pull request #4702 from matrix-org/jryans/release-4691 
Fix checkbox bleed
 2020-06-04 12:11:20 +01:00
Jorik Schellekens
ca69a9d7bb Fix checkbox bleed 2020-06-04 12:03:18 +01:00
Bruno Windels
07e0cab4a8 When trying to restore a keyback that has its key in 4S, check if 4S will be readable 
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
 2020-06-04 12:52:20 +02:00
Weblate
e476ac71f8 Merge branch 'origin/develop' into Weblate. 2020-06-04 09:16:51 +00:00
random
9c93e48748 Translated using Weblate (Italian) 
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-04 09:16:51 +00:00
Kévin C
db6d60566b Translated using Weblate (French) 
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-04 09:16:51 +00:00
Jeff Huang
39dcc9f23c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-04 09:16:50 +00:00
Bruno Windels
aec588dada
Merge pull request #4691 from JorikSchellekens/joriks/fix-addressselector-dropdown-checkbox-overlap 
Stop checkbox styling bleeding through room address selector
 2020-06-04 09:16:45 +00:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-04 09:50:19 +01:00
Michael Telatynski
e6a776be7e
Merge pull request #4693 from matrix-org/t3chguy/sso-query 
Fix login loop where the sso flow returns to `#/login` to release
 2020-06-04 01:09:30 +01:00
Weblate
3f75d82d95 Merge branch 'origin/develop' into Weblate. 2020-06-03 23:36:27 +00:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons 
Center HeaderButtons
 2020-06-04 00:36:23 +01:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Aaron Raimist
711ddd42c9 Remove some unused images 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:37 -05:00
Aaron Raimist
3b5de137c4 Center HeaderButtons 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 17:23:23 -05:00
Michael Telatynski
096045a037 change names of consts for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 22:15:01 +01:00
Michael Telatynski
84d81ff09b Fix login loop where the sso flow returns to #/login 
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 22:15:01 +01:00
Weblate
bfb1dc2938 Merge branch 'origin/develop' into Weblate. 2020-06-03 21:12:19 +00:00
Michael Telatynski
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault 
Add .well-known option to control default e2ee behaviour
 2020-06-03 22:12:13 +01:00
Weblate
21b378c8b0 Merge branch 'origin/develop' into Weblate. 2020-06-03 20:09:11 +00:00
Matthew Hodgson
b368856f2b
Merge pull request #4692 from aaronraimist/panel-max-width 
Add max-width to right and left panels
 2020-06-03 21:09:05 +01:00