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

24114 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
a1e174d8b8 Fix incorrect toast if security setup skipped 
DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

Fixes https://github.com/vector-im/riot-web/issues/13372
 2020-04-24 15:58:28 +01:00
David Baker
bbce37b92f Make icon change in SetupEncryptionDialog 
Fixes https://github.com/vector-im/riot-web/issues/13368
 2020-04-24 15:39:54 +01:00
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:39:23 +01:00
Michael Telatynski
e16f511527 Redesign redactions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:07:39 +01:00
Michael Telatynski
7b9c46a5a9
Merge pull request #4483 from matrix-org/t3chguy/cherry-pick/1 
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
 2020-04-24 13:45:15 +01:00
Michael Telatynski
42a857cb5e Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 
(cherry picked from commit 972f9d354d)
 2020-04-24 13:24:54 +01:00
Weblate
8c0bb43637 Merge branch 'origin/develop' into Weblate. 2020-04-24 12:23:45 +00:00
Michael Albert
8c414014e6 Translated using Weblate (German) 
Currently translated at 77.2% (1771 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-24 12:23:45 +00:00
Michael Telatynski
30a409a74e
Merge pull request #4482 from matrix-org/revert-4344-t3chguy/emojibase 
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
 2020-04-24 13:23:38 +01:00
Michael Telatynski
972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 2020-04-24 12:25:19 +01:00
Weblate
070535d082 Merge branch 'origin/develop' into Weblate. 2020-04-24 05:43:41 +00:00
Imre Kristoffer Eilertsen
a15db97b77 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 49.2% (1130 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-04-24 05:43:40 +00:00
Travis Ralston
d8eb761106
Merge pull request #4481 from matrix-org/travis/fix-widget-params-again 
Fix widget URL templating (again)
 2020-04-23 23:43:35 -06:00
Travis Ralston
50783c2432 Appease the linter 2020-04-23 23:25:53 -06:00
Travis Ralston
28865e27bc Don't overwrite the 'domain' data key for all widgets 
Some widgets, which aren't Jitsi widgets, might need this to be something else.
 2020-04-23 15:24:27 -06:00
Travis Ralston
efaf4fbbda Decode dollar signs in safe widget URLs before rendering/templating 
Fixes https://github.com/vector-im/riot-web/issues/13344
 2020-04-23 15:24:27 -06:00
J. Ryan Stinnett
dd532d5a6c
Merge pull request #4480 from matrix-org/jryans/login-recovery-link-release 
Fix recovery link on login verification flow
 2020-04-23 18:24:55 +01:00
Weblate
c9ac8cd88f Merge branch 'origin/develop' into Weblate. 2020-04-23 17:24:51 +00:00
J. Ryan Stinnett
3b362f2845
Merge pull request #4479 from matrix-org/jryans/login-recovery-link 
Fix recovery link on login verification flow
 2020-04-23 18:24:45 +01:00
J. Ryan Stinnett
949b916091 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:18:25 +01:00
J. Ryan Stinnett
5af3d83cc7 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:14:30 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk" 
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:29 +01:00
Weblate
3eeb6ca2c5 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:57:25 +00:00
Szimszon
f768b23b38 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2295 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-04-23 14:57:25 +00:00
Bruno Windels
0c1414aca9
Merge pull request #4476 from rkfg/pill-fix 
Make avatars in pills occupy the entire space using cropping
 2020-04-23 14:57:19 +00:00
RiotRobot
941709d19a v2.5.0-rc.4 2020-04-23 15:55:37 +01:00
RiotRobot
b3753f3407 Prepare changelog for v2.5.0-rc.4 2020-04-23 15:55:37 +01:00
RiotRobot
86200812a5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:49:21 +01:00
Weblate
f2ca8f1d2c Merge branch 'origin/develop' into Weblate. 2020-04-23 14:18:16 +00:00
Travis Ralston
35dd892dce
Merge pull request #4458 from matrix-org/travis/fix-sticker-picker-add 
Use WidgetType more often to avoid breaking new sticker pickers
 2020-04-23 08:18:12 -06:00
Weblate
9f05bc5c45 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:17:59 +00:00
Travis Ralston
d66d497638
Merge pull request #4460 from matrix-org/travis/integ-logging 
Update logging for unmanaged widgets, and add TODO comments for other areas
 2020-04-23 08:17:54 -06:00
Weblate
d66d8460f8 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:17:45 +00:00
Szimszon
90dcfe0b01 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2290 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-04-23 14:17:45 +00:00
Tirifto
18176cdc5b Translated using Weblate (Esperanto) 
Currently translated at 96.3% (2209 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-04-23 14:17:45 +00:00
Travis Ralston
3d4032e542
Merge pull request #4459 from matrix-org/travis/fix-openid-widget 
Fix OpenID requests from widgets
 2020-04-23 08:17:38 -06:00
Jorik Schellekens
61b45afcd3 Slightly darker toggle off bg color 2020-04-23 12:28:39 +01:00
Michael Telatynski
f64929187a Make Screens an enum 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 10:44:35 +01:00
J. Ryan Stinnett
9b4172bf85
Merge pull request #4468 from matrix-org/travis/rel-seshat-enable 
Take encrypted message search out of labs for release
 2020-04-23 10:22:04 +01:00
Weblate
c055866960 Merge branch 'origin/develop' into Weblate. 2020-04-23 09:22:03 +00:00
J. Ryan Stinnett
4a0f228714
Merge pull request #4467 from matrix-org/travis/seshat-enable 
Take encrypted message search out of labs
 2020-04-23 10:21:58 +01:00
Michael Telatynski
e06b5f8cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 2020-04-23 10:12:56 +01:00
Michael Telatynski
4cf234197b iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 10:12:50 +01:00
Weblate
a671c6dff4 Merge branch 'origin/develop' into Weblate. 2020-04-23 08:51:16 +00:00
random
970d340318 Translated using Weblate (Italian) 
Currently translated at 100.0% (2296 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-04-23 08:51:15 +00:00
Kévin C
9b66ae614a Translated using Weblate (French) 
Currently translated at 100.0% (2296 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-23 08:51:15 +00:00
Jeff Huang
486ce3ae91 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2296 of 2296 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-23 08:51:14 +00:00
Michael Telatynski
369446a94f
Merge pull request #4475 from matrix-org/t3chguy/reply_big_emoji 
Fix BigEmoji for replies
 2020-04-23 09:51:06 +01:00
Sergey Shpikin
a97a3cea51 Make avatars in pills occupy the entire space using cropping 
Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
 2020-04-23 10:55:49 +03:00