mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 19:41:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
25863 commits 219 branches 562 tags 474 MiB
Commit graph

25863 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston
2fe56276f2 css for vis 2020-06-04 10:07:41 -06: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
Travis Ralston
a3fdd643d7 Add hacky math support 2020-06-04 09:57:16 -06:00
Jorik Schellekens
f6504d67ba Use 10px instead 2020-06-04 16:23:28 +01:00
Travis Ralston
cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
Travis Ralston
83df79aab9 Try variable resizing 2020-06-04 09:19:03 -06:00
Damir Jelić
5dfe5ac135 Searching: More docs and a bit of simplification. 2020-06-04 17:06:59 +02:00
Damir Jelić
bf13032d5b Searching: Fix a lint issue and expand some docs. 2020-06-04 17:06:58 +02:00
Damir Jelić
94d4aa17ee Searching: Remove some debug logs. 2020-06-04 17:06:58 +02:00
Damir Jelić
46fd36568a Searching: Always set the limit when searching. 
The spec doesn't mention any default limit so different homeservers
might use different defaults, since we don't want Riot to behave
differently depending on the homeserver bite the bullet of sending an
additional 10 or so bytes when searching.
 2020-06-04 17:06:58 +02:00
Damir Jelić
96ca47381c Searching: Add more docs explaining what's going on in the pagination. 2020-06-04 17:06:58 +02:00
Damir Jelić
df06594314 Searching: Refactor out some code that combines the search results. 2020-06-04 17:06:58 +02:00
Damir Jelić
c6462e11ec Searching: Fix some lint issues. 2020-06-04 17:06:58 +02:00
Damir Jelić
28f7d23bfc Searching: Correctly order the combined search results. 2020-06-04 17:06:58 +02:00
Damir Jelić
c2e0e10553 Searching: Split out more logic that combines the events. 2020-06-04 17:06:58 +02:00
Damir Jelić
b6198e0ab9 Searching: Combine the events before letting the client process them. 2020-06-04 17:06:58 +02:00
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