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

25693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damir Jelić
c1ef193e3a Searching: Add initial pagination for combined searches. 2020-06-04 17:06:58 +02:00
Damir Jelić
e94f3422df Searching: Add support to paginate Seshat search results. 2020-06-04 17:06:58 +02: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
Travis Ralston
30027a6556 Remove debugging 2020-06-03 21:53:58 -06:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
Travis Ralston
dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a Initial experiments with resizing of room lists 2020-06-03 21:17:18 -06: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
ed2eca52b2
Don't show FormatBar if composer is empty 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 18:05:43 -05: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
Justin Sleep
bdc451d66b Remove escape backslashes in non-Markdown messages 2020-06-03 17:08:13 -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
Aaron Raimist
92c28f089c
Add max-width to right and left panels 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 14:56:48 -05:00
Weblate
bfff565eae Merge branch 'origin/develop' into Weblate. 2020-06-03 19:28:06 +00:00
Michael Telatynski
10bdb4975e
Merge pull request #4685 from matrix-org/t3chguy/sso-query 
Fix login loop where the sso flow returns to `#/login`
 2020-06-03 20:28:01 +01:00