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

20635 commits

Author SHA1 Message Date
Jeff Huang
bf34d37606 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-24 10:00:16 +00:00
Slavi Pantaleev
dd8109f77a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-24 10:00:16 +00:00
Travis Ralston
5c7e59b132 Use theme-capable icons in the user menu 
They're still inconsistent weights, but at least they are the right color on non-light-theme clients.
 2020-06-23 21:17:39 -06:00
Travis Ralston
380aed4244 Update profile information in User Menu 
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.

This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
 2020-06-23 21:01:50 -06:00
Travis Ralston
f93d67fc65 Fix sticky room disappearing/jumping in search results 
Fixes https://github.com/vector-im/riot-web/issues/14124
Fixes https://github.com/vector-im/riot-web/issues/14154 (which was technically supposed to say that the sticky room when filtering was always last)

This is all a bit complicated, but the theory is that we end up with a stable list even through filtering. There's some notes within, though I suspect it'll be difficult to understand :(
 2020-06-23 16:49:39 -06:00
Weblate
001abf40fb Merge branch 'origin/develop' into Weblate. 2020-06-23 19:38:12 +00:00
XoseM
a915da650a Translated using Weblate (Galician) 
Currently translated at 84.0% (1924 of 2290 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-23 19:38:12 +00:00
Besnik Bleta
cc60fff198 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2288 of 2290 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-23 19:38:09 +00:00
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup 
Mark messages with a black shield if the megolm session isn't trusted
 2020-06-23 15:38:03 -04:00
Bruno Windels
3b13a623cd cleanup 2020-06-23 17:54:57 +02:00
Bruno Windels
2f6fc6bba2 allow adding custom font faces in theme 2020-06-23 17:54:38 +02:00
Bruno Windels
b3510aa2b4 remove css vars when switching theme 2020-06-23 17:54:17 +02:00
Bruno Windels
e083856801 allow changing the font-family 2020-06-23 17:53:40 +02:00
Bruno Windels
86597aabca better naming 2020-06-23 17:52:54 +02:00
Weblate
edc384ac92 Merge branch 'origin/develop' into Weblate. 2020-06-23 14:38:55 +00:00
Jorik Schellekens
1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced 
Custom font selection
 2020-06-23 15:38:50 +01:00
Weblate
da308da6ac Merge branch 'origin/develop' into Weblate. 2020-06-23 14:24:14 +00:00
J. Ryan Stinnett
3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
Weblate
4c33d8d38f Merge branch 'origin/develop' into Weblate. 2020-06-23 14:20:32 +00:00
ziriSut
84bcd98d17 Translated using Weblate (Kabyle) 
Currently translated at 19.6% (449 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-23 14:20:32 +00:00
random
6255c67d4f Translated using Weblate (Italian) 
Currently translated at 99.9% (2287 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-23 14:20:26 +00:00
Kévin C
c5da3d726d Translated using Weblate (French) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-23 14:20:25 +00:00
Priit Jõerüüt
876e7799ba Translated using Weblate (Estonian) 
Currently translated at 70.2% (1606 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-23 14:20:25 +00:00
Jeff Huang
07cbf23b22 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-23 14:20:20 +00:00
RiotRobot
6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
Jorik Schellekens
680e997a94 Cleanup tooltip classnames 2020-06-23 13:38:50 +01:00
Weblate
b3a5093e4b Merge branch 'origin/develop' into Weblate. 2020-06-22 22:16:20 +00:00
ziriSut
22269de5b0 Translated using Weblate (Kabyle) 
Currently translated at 9.7% (223 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 22:16:20 +00:00
Travis Ralston
115c850d35 Use the correct timeline reference for message previews 
Fixes https://github.com/vector-im/riot-web/issues/14083 (hopefully)

This is the same logic used by `Unread.js`, so should be correct.
 2020-06-22 15:57:13 -06:00
Weblate
8d7497f426 Merge branch 'origin/develop' into Weblate. 2020-06-22 21:16:59 +00:00
Travis Ralston
fc5ee64fce Fix read receipt handling in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14064
Fixes https://github.com/vector-im/riot-web/issues/14082

Turns out the event doesn't reference a room, so we need to use the accompanied room reference instead.
 2020-06-22 15:12:30 -06:00
Weblate
9ed1a96209 Merge branch 'origin/develop' into Weblate. 2020-06-22 20:58:51 +00:00
Travis Ralston
fb551781c2 Force DMs to always be red notifications 
This also passes the tagId to the sublist so it doesn't have to rip it out of the `layout`. It doesn't get a layout until later anyways, which causes some null issues.
 2020-06-22 14:52:17 -06:00
Travis Ralston
894357f7f6 Merge branch 'develop' into travis/room-list/unread-2 2020-06-22 14:16:52 -06:00
Weblate
d31266cc22 Merge branch 'origin/develop' into Weblate. 2020-06-22 20:16:29 +00:00
Travis Ralston
26317b6826
Merge pull request #4803 from matrix-org/travis/room-list/setting-diff 
Only fire setting changes for changed settings
 2020-06-22 14:16:24 -06:00
Weblate
9d06d3943a Merge branch 'origin/develop' into Weblate. 2020-06-22 20:15:58 +00:00
Travis Ralston
edafb2467d
Merge pull request #4804 from matrix-org/travis/room-list/watchers 
Trigger room-specific watchers whenever a higher level change happens
 2020-06-22 14:15:53 -06:00
Travis Ralston
1fe3e33dbf Factor out cloning to a util and use it everywhere 2020-06-22 14:14:43 -06:00
Weblate
f85ea8ac99 Merge branch 'origin/develop' into Weblate. 2020-06-22 19:53:08 +00:00
Travis Ralston
aca6c65ef3
Merge pull request #4810 from matrix-org/travis/room-list/theme 
Have the theme switcher set the device-level theme to match settings
 2020-06-22 13:53:03 -06:00
Weblate
b31aa3d959 Merge branch 'origin/develop' into Weblate. 2020-06-22 19:51:42 +00:00
Travis Ralston
f66f220a3e
Merge pull request #4808 from matrix-org/travis/room-list/collapsed 
Fix layout of minimized view for new room list
 2020-06-22 13:51:38 -06:00
Weblate
c8ef9a6965 Merge branch 'origin/develop' into Weblate. 2020-06-22 19:51:33 +00:00
ziriSut
3054e6579a Translated using Weblate (Kabyle) 
Currently translated at 8.4% (192 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 19:51:33 +00:00
Priit Jõerüüt
326f336425 Translated using Weblate (Estonian) 
Currently translated at 68.9% (1576 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 19:51:32 +00:00
Travis Ralston
6c48966bf5 Have the theme switcher set the device-level theme to match settings 
Fixes https://github.com/vector-im/riot-web/issues/14111

This is a shortcut into the Appearance tab, so use the same level. It was an explicit decision to have the tab set the theme at the device level.
 2020-06-22 13:34:49 -06:00
Travis Ralston
1a427b8ff7 Fix sticky headers over/under extending themselves in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14095
 2020-06-22 13:09:42 -06:00
Travis Ralston
cf92fc37d4 Fix layout of minimized view for new room list 2020-06-22 12:51:53 -06:00
J. Ryan Stinnett
38bf1680a2 Update read receipt remainder for internal font size change 
In https://github.com/matrix-org/matrix-react-sdk/pull/4725, we changed the
internal font size from 15 to 10, but the `toRem` function (currently only used
for read receipts remainders curiously) was not updated. This updates the
function, which restores the remainders.

Fixes https://github.com/vector-im/riot-web/issues/14127
 2020-06-22 19:23:39 +01:00
Weblate
598fa96d17 Merge branch 'origin/develop' into Weblate. 2020-06-22 18:22:11 +00:00
Michael Albert
585af6ee84 Translated using Weblate (German) 
Currently translated at 99.7% (2281 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-22 18:22:10 +00:00
Priit Jõerüüt
d875c3170d Translated using Weblate (Estonian) 
Currently translated at 67.3% (1539 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 18:22:10 +00:00
Besnik Bleta
2319b25484 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2286 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-22 18:22:08 +00:00
J. Ryan Stinnett
37442b92ae Update read receipt remainder for internal font size change 
In https://github.com/matrix-org/matrix-react-sdk/pull/4725, we changed the
internal font size from 15 to 10, but the `toRem` function (currently only used
for read receipts remainders curiously) was not updated. This updates the
function, which restores the remainders.

Fixes https://github.com/vector-im/riot-web/issues/14127
 2020-06-22 19:02:03 +01:00
Travis Ralston
64a811fb03 Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2 2020-06-22 11:24:26 -06:00
Travis Ralston
9e3c101172 Clone reads of account data to prevent mutation 2020-06-22 11:24:04 -06:00
Travis Ralston
784e73831b Move setting to account only (no per-room) 2020-06-22 11:23:38 -06:00
Travis Ralston
cbee9146a6 Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2 2020-06-22 10:57:40 -06:00
Travis Ralston
fe65b7631d Soften warning about lack of rooms in setting updates 2020-06-22 10:57:08 -06:00
Travis Ralston
63ad14ae1e Clean up imports 2020-06-22 10:35:55 -06:00
Travis Ralston
137603c36d Merge branch 'travis/room-list/watchers' into travis/room-list/unread-2 2020-06-22 10:34:59 -06:00
Travis Ralston
241e0c12f0 Trigger room-specific watchers whenever a higher level change happens 
Otherwise the room list badges end up having to listen to `null` for a room ID, meaning they have to filter.

The notification badge count setting is the first ever setting to watch based on a room ID, so there are no compatibility concerns with this change.
 2020-06-22 10:28:05 -06:00
Travis Ralston
8201eed929 Encourage counts if the user has a mention (red state) 2020-06-22 10:26:37 -06:00
Travis Ralston
eeb408a081 Update badge logic for new setting and behaviour 
For https://github.com/vector-im/riot-web/issues/14084
 2020-06-22 10:26:19 -06:00
Travis Ralston
099661c2aa Only fire setting changes for changed settings 
Previously we were firing updates for everything, which is bad. This has an effect of causing the room list to update itself every time the user goes to toggle some account settings.
 2020-06-22 10:18:38 -06:00
Slimane Selyan AMIRI
4db2ede67f Translated using Weblate (Kabyle) 
Currently translated at 7.7% (177 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 15:41:20 +00:00
Jorik Schellekens
7bc5ce7271 Underscore actions 2020-06-22 16:05:32 +01:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
aab42a291b implement appearance tab nits 
- fix border colours in dark theme
- lighten dark theme preview background
- add missing return statement
 2020-06-22 12:28:15 +01:00
Jorik Schellekens
086177d808
Merge pull request #4770 from matrix-org/joriks/font-scaling-message-preview 
Add message preview for font slider
 2020-06-22 11:43:52 +01:00
Jorik Schellekens
3d7427ccca Fix semicolons 2020-06-22 11:39:11 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +01:00
Weblate
bfad8afead Merge branch 'origin/develop' into Weblate. 2020-06-22 08:34:26 +00:00
васян228
e19469a0c3 Translated using Weblate (Russian) 
Currently translated at 87.1% (1987 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-22 08:34:26 +00:00
Imre Kristoffer Eilertsen
b80b01076c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.1% (1416 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-06-22 08:34:26 +00:00
ziriSut
ac869cf6dc Translated using Weblate (Kabyle) 
Currently translated at 5.6% (127 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 08:34:16 +00:00
take100yen
abbacd788c Translated using Weblate (Japanese) 
Currently translated at 58.0% (1323 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-06-22 08:34:15 +00:00
aWeinzierl
92fb9356be Translated using Weblate (German) 
Currently translated at 99.6% (2273 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-22 08:34:12 +00:00
XoseM
d9b870c5fd Translated using Weblate (Galician) 
Currently translated at 82.6% (1886 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-22 08:34:11 +00:00
Priit Jõerüüt
6f9c6ffd5f Translated using Weblate (Estonian) 
Currently translated at 66.3% (1512 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 08:34:06 +00:00
ziriSut
7dfbdb73c5 Translated using Weblate (Kabyle) 
Currently translated at 5.0% (113 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-21 09:51:58 +00:00
ziriSut
0c2f5b81cb Translated using Weblate (Kabyle) 
Currently translated at 3.1% (70 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-21 05:18:41 +00:00
Slimane Selyan AMIRI
a5fd441880 Translated using Weblate (Kabyle) 
Currently translated at 3.1% (70 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-21 05:18:40 +00:00
Slimane Selyan AMIRI
565fd12770 Added translation using Weblate (Kabyle) 2020-06-20 16:01:57 +00:00
David Baker
d1caadec9f Add null check 2020-06-19 20:07:20 +01:00
David Baker
6e4a2b7efe i18n 2020-06-19 17:22:53 +01:00
David Baker
a82253ec96 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:18:48 +01:00
David Baker
ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker
a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
Weblate
3b75eb173c Merge branch 'origin/develop' into Weblate. 2020-06-19 16:06:15 +00:00
random
a1cb070c60 Translated using Weblate (Italian) 
Currently translated at 99.9% (2281 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-19 16:06:15 +00:00
Szimszon
e4521a4d81 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-19 16:06:15 +00:00
XoseM
db14729489 Translated using Weblate (Galician) 
Currently translated at 79.8% (1822 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-19 16:06:14 +00:00
Kévin C
4948e49f76 Translated using Weblate (French) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-19 16:06:09 +00:00
David Baker
87ab0f9830
Merge pull request #4762 from matrix-org/dbkr/fix_verification_race 
Look for existing verification requests after login
 2020-06-19 17:06:02 +01:00
David Baker
3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Weblate
4e92472f73 Merge branch 'origin/develop' into Weblate. 2020-06-19 08:48:50 +00:00
Victor Grousset
c7f72f0d00 Translated using Weblate (Esperanto) 
Currently translated at 98.7% (2252 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-06-19 08:48:49 +00:00
Jeff Huang
95dadca8e8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-19 08:48:49 +00:00
Damir Jelić
e3ae05b6b9 Merge branch 'poljar/eventindex-user-version' into develop 2020-06-19 09:50:40 +02:00
Damir Jelić
253212d8c8 Merge remote-tracking branch 'origin/poljar/eventindex-new-encrypted-rooom' into develop 2020-06-19 09:50:22 +02:00
Damir Jelić
ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop 2020-06-19 09:50:03 +02:00
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Weblate
8b0bc522da Merge branch 'origin/develop' into Weblate. 2020-06-18 22:53:47 +00:00
Travis Ralston
f136ba4a98
Merge pull request #4796 from matrix-org/travis/room-list/bug/crash-filter 
Fix crash when filtering new room list too fast
 2020-06-18 16:53:42 -06:00
Weblate
ff7d1a0034 Merge branch 'origin/develop' into Weblate. 2020-06-18 22:20:18 +00:00
Michael Telatynski
e723d6115c
Merge pull request #4795 from matrix-org/t3chguy/hide_unknown_rooms_search 
hide search results from unknown rooms
 2020-06-18 23:20:12 +01:00
Weblate
6112018401 Merge branch 'origin/develop' into Weblate. 2020-06-18 21:59:47 +00:00
Travis Ralston
7191c01265 Fix crash when filtering new room list too fast 
Fixes https://github.com/vector-im/riot-web/issues/14092

We were simply assuming we had a reference to a notification state, which might not be the case if we're between renders.
 2020-06-18 15:52:55 -06:00
Michael Telatynski
3ac028565b i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:50:10 +01:00
Michael Telatynski
eec42cff49 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:49:39 +01:00
Travis Ralston
847f12c289 Update i18n 2020-06-18 15:47:30 -06:00
Travis Ralston
0e9ef8804d Mark the new room list as ready for general testing 2020-06-18 15:46:37 -06:00
Michael Telatynski
045def4566 hide search results from unknown rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:45:42 +01:00
Weblate
712f10c76d Merge branch 'origin/develop' into Weblate. 2020-06-18 18:36:48 +00:00
vicdorke
a09779063c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.5% (1382 of 2283 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2020-06-18 18:36:48 +00:00
Michael Telatynski
69c5aecfc7
Merge pull request #4784 from bocoup/extend-querymatcher-heuristic 
Extend QueryMatcher's sorting heuristic
 2020-06-18 19:36:42 +01:00
Mike Pennisi
2e0cb4746a fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 14:20:40 -04:00
Mike Pennisi
4ffc54d143 fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 13:24:02 -04:00
Jorik Schellekens
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00
Jorik Schellekens
f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens
b9fb9aae4a Rename MessagePreview to EventTilePreview 2020-06-18 15:36:23 +01:00
Jorik Schellekens
0d3ea6c9d4 Merge branch 'joriks/font-scaling-message-preview' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-message-preview 2020-06-18 15:34:03 +01:00
Jorik Schellekens
997c7ffc96 Add missing semicolons 2020-06-18 15:26:53 +01:00
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
adfe1ac9bf Remove stray debug 2020-06-18 15:13:28 +01:00
David Baker
9b9e6e04e3 Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race 2020-06-18 15:12:06 +01:00
Weblate
f6e55345a1 Merge branch 'origin/develop' into Weblate. 2020-06-18 14:08:30 +00:00
David Baker
e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +01:00
Jorik Schellekens
ba0bc8f29c Resolve "The Great Conflict" 2020-06-18 14:55:24 +01:00
Jorik Schellekens
291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
Jorik Schellekens
74174041bb Remove semicolon in style 2020-06-18 14:53:12 +01:00
Weblate
199f776e58 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:51:27 +00:00
David Baker
5b27a570a8
Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases 
Revert "Use recovery keys over passphrases"
 2020-06-18 14:51:22 +01:00
Weblate
08fd9cda4f Merge branch 'origin/develop' into Weblate. 2020-06-18 13:48:51 +00:00
Travis Ralston
c26513b1e3
Merge pull request #4783 from matrix-org/travis/room-list/sticky-headers-reliability 
Clear `top` when not sticking headers to the top
 2020-06-18 07:48:46 -06:00
Travis Ralston
8f3a6fc30e
Consistent quotes 2020-06-18 07:48:36 -06:00
Weblate
9a05f5bc03 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:37 +00:00
Travis Ralston
4a5cc8557c
Merge pull request #4785 from matrix-org/travis/room-list/show-less-is-more 
Don't show a 'show less' button when it's impossible to collapse
 2020-06-18 07:46:32 -06:00
Weblate
c6eaac8b80 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:18 +00:00
Travis Ralston
b857c9d199
Merge pull request #4786 from matrix-org/travis/room-list/show-n-reliability 
Fix show less/more button occluding the list automatically
 2020-06-18 07:46:13 -06:00
Weblate
385d784036 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:08 +00:00
Travis Ralston
87aece9997
Merge pull request #4787 from matrix-org/travis/room-list/performance-2 
Improve room switching in the new room list
 2020-06-18 07:46:03 -06:00
Jorik Schellekens
47a825be7c
Merge branch 'develop' into joriks/appearance-advanced 2020-06-18 14:41:28 +01:00
Weblate
a1db9dd352 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:35:07 +00:00
Szimszon
45a6bf3a6d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-18 13:35:07 +00:00
XoseM
f1365a8d30 Translated using Weblate (Galician) 
Currently translated at 76.1% (1740 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-18 13:35:07 +00:00
Kévin C
5ceae3085c Translated using Weblate (French) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-18 13:35:04 +00:00
Jeff Huang
9b90dcd1a8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-18 13:35:04 +00:00