Commit graph

23688 commits

Author SHA1 Message Date
Zoe
0e1341c498
Merge pull request #4341 from matrix-org/foldleft/12843-resend-requests
Re-request room keys after auth
2020-04-06 13:43:32 +01:00
Weblate
2ac8d5e79f Merge branch 'origin/develop' into Weblate. 2020-04-06 11:19:11 +00:00
Michael Telatynski
f554f763c2
Merge pull request #4344 from matrix-org/t3chguy/emojibase
Update emojibase for fixed emoji codepoints and Emoji 13 support
2020-04-06 12:19:07 +01:00
Weblate
b207936ed4 Merge branch 'origin/develop' into Weblate. 2020-04-06 11:05:49 +00:00
Karol Kosek
60e3f55f5a Translated using Weblate (Polish)
Currently translated at 61.3% (1388 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2020-04-06 11:05:49 +00:00
MamasLT
2778f1fa51 Translated using Weblate (Lithuanian)
Currently translated at 43.6% (987 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-04-06 11:05:46 +00:00
random
faae7d0b1b Translated using Weblate (Italian)
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-04-06 11:05:42 +00:00
Melvyn Laïly
39edfc7c05 Translated using Weblate (French)
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-06 11:05:41 +00:00
Kévin C
340fd6914f Translated using Weblate (French)
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-06 11:05:41 +00:00
Stanislav Lukeš
da9fbba37d Translated using Weblate (Czech)
Currently translated at 96.4% (2184 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-04-06 11:05:40 +00:00
Jeff Huang
0b549ddf7f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2266 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-06 11:05:38 +00:00
Besnik Bleta
a5856042b1 Translated using Weblate (Albanian)
Currently translated at 99.7% (2259 of 2266 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-04-06 11:05:37 +00:00
Michael Telatynski
122be045c3
Merge pull request #4343 from matrix-org/t3chguy/app_load1
App load order tweaks for code splitting
2020-04-06 12:05:29 +01:00
Zoe
1395cb02ed Fixup alignment 2020-04-06 11:44:46 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Michael Telatynski
5ac68d4ce0 Update emojibase for fixed emoji codepoints and Emoji 13 support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-06 11:10:00 +01:00
Michael Telatynski
fc74d927c0 import VelocityBounce sync as it is *tiny* (481B)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-04 17:23:19 +01:00
Weblate
334d76bcf9 Merge branch 'origin/develop' into Weblate. 2020-04-03 19:33:47 +00:00
Michael Telatynski
da8939107a
Merge pull request #4312 from matrix-org/t3chguy/xsigning/fix_userinfo_e2eicon
Fix alignment of e2e icon in userinfo and expose full displayname in title
2020-04-03 20:33:42 +01:00
Michael Telatynski
fe401ce4da
Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Weblate
956d354ce7 Merge branch 'origin/develop' into Weblate. 2020-04-03 16:01:59 +00:00
random
4c46ae1864 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-04-03 16:01:59 +00:00
@a2sc:matrix.org
fd5a7ad74d Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 16:01:58 +00:00
Jonathan
c0dff26235 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 16:01:58 +00:00
Bruno Windels
37781f2064
Merge pull request #4342 from matrix-org/bwindels/selfverifux
Adjust copy & UX for self-verification
2020-04-03 16:01:53 +00:00
@a2sc:matrix.org
e8848892f2 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 15:55:20 +00:00
Jonathan
2c29172d70 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 15:55:19 +00:00
@a2sc:matrix.org
aaad265190 Translated using Weblate (German)
Currently translated at 76.7% (1731 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-03 15:55:03 +00:00
Bruno Windels
adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels
2cf55fb2a0 adjust start options styling 2020-04-03 17:32:09 +02:00
Bruno Windels
37289bc832 i18n 2020-04-03 17:05:20 +02:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
Bruno Windels
cdbd4da0e4 adjust copy for self-verification in verification panel 2020-04-03 17:04:29 +02:00
Bruno Windels
030d594e67 for self-verif, mention which device, not user we're verifying in panel 2020-04-03 17:03:37 +02:00
Weblate
a0805e8a55 Merge branch 'origin/develop' into Weblate. 2020-04-03 12:28:46 +00:00
Bruno Windels
c15fa2ba0c
Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate
QR code reciprocation
2020-04-03 12:28:41 +00:00
Weblate
20c6dc208c Merge branch 'origin/develop' into Weblate. 2020-04-03 11:52:58 +00:00
Bruno Windels
2698751429
Merge pull request #4339 from jungeonkim/develop
Fix Hangul typing does not work properly
2020-04-03 11:52:53 +00:00
JungEon Kim
94236de637 Fix Hangul typing does not work properly
compositionstart event may fire in the meantime because
compositionend event is being processed asynchronously.

Signed-off-by: JungEon Kim <me@jungeon.kim>
2020-04-03 20:43:34 +09:00
Zoe
0102876e40 Re-request room keys after auth 2020-04-03 11:49:08 +01:00
Weblate
c46358c4bb Merge branch 'origin/develop' into Weblate. 2020-04-03 10:27:37 +00:00
Bruno Windels
9407df3da0
Merge pull request #4336 from matrix-org/bwindels/fixverifytoastaftercompletesecurity
Fix: dismiss setup encryption toast if cross-signing is ready
2020-04-03 10:27:32 +00:00
Weblate
257e2e7266 Merge branch 'origin/develop' into Weblate. 2020-04-03 10:07:54 +00:00
Kévin C
4b5e2198fd Translated using Weblate (French)
Currently translated at 100.0% (2256 of 2256 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-03 10:07:54 +00:00
J. Ryan Stinnett
cabaf36794
Merge pull request #4340 from matrix-org/jryans/read-marker-groupers
Fix read marker visibility for grouped events
2020-04-03 11:07:46 +01:00
J. Ryan Stinnett
86f39ee0ee Fix read marker visibility for grouped events
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
2020-04-03 01:14:31 +01:00
Weblate
171ffa5d1c Merge branch 'origin/develop' into Weblate. 2020-04-02 16:40:44 +00:00
Jorik Schellekens
3ed457ea7d
Merge pull request #4305 from JorikSchellekens/joriks/font-scaling
Make all 'font-size's and 'line-height's rem
2020-04-02 17:40:39 +01:00
Bruno Windels
2ee780caa2 pass isSelf flag to sas component 2020-04-02 18:28:14 +02:00
Bruno Windels
6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00