Commit graph

24042 commits

Author SHA1 Message Date
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
Michael Telatynski
a332e0c0f4 Fix BigEmoji for replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 23:27:33 +01:00
Michael Telatynski
eb3639df5f
Merge pull request #4474 from matrix-org/t3chguy/complete_security_cherry-pick
Update login security copy and design to match Figma [to release]
2020-04-22 23:15:10 +01:00
Michael Telatynski
635472ccb1 stage new artifacts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 23:09:23 +01:00
Michael Telatynski
89860100ae Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 23:09:17 +01:00
Weblate
ba6a069532 Merge branch 'origin/develop' into Weblate. 2020-04-22 22:07:54 +00:00
Michael Telatynski
a3f4244dc0
Merge pull request #4472 from matrix-org/t3chguy/complete_security_designs
Update login security copy and design to match Figma
2020-04-22 23:07:48 +01:00
Michael Telatynski
a06401a83e stage new artifacts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:57:00 +01:00
Travis Ralston
c7423a68cb
Merge pull request #4473 from matrix-org/travis/t3chguy/rel-i18n-sso
Fix i18n of SSO UIA copy in Deactivate Account Dialog on release
2020-04-22 15:37:02 -06:00
Michael Telatynski
f952e9ebfe i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 15:34:42 -06:00
Michael Telatynski
63de2783c3 Fix i18n of SSO UIA copy in Deactivate Account Dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 15:34:32 -06:00
Michael Telatynski
80b8120bc3 Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
Weblate
4431fafb91 Merge branch 'origin/develop' into Weblate. 2020-04-22 20:50:15 +00:00
Michael Telatynski
a32687d1ce
Merge pull request #4471 from matrix-org/t3chguy/dialogAesthetics
Fix i18n of SSO UIA copy in Deactivate Account Dialog
2020-04-22 21:50:10 +01:00
Michael Telatynski
bc690c8f17 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:41:30 +01:00
Michael Telatynski
b10a386675 Fix i18n of SSO UIA copy in Deactivate Account Dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:37:52 +01:00
Weblate
2c99e321d9 Merge branch 'origin/develop' into Weblate. 2020-04-22 20:20:30 +00:00
Michael Telatynski
22d6c59213
Merge pull request #4470 from rkfg/autocomplete-fix
Assert type of domNode as HTMLElement to fix build
2020-04-22 21:20:24 +01:00
Sergey Shpikin
ae3dcff230 Assert type of domNode as HTMLElement to fix build
Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
2020-04-22 22:03:33 +03:00
Weblate
0a1a3013c8 Merge branch 'origin/develop' into Weblate. 2020-04-22 18:14:54 +00:00
Besnik Bleta
7364a7bf52 Translated using Weblate (Albanian)
Currently translated at 99.3% (2278 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-04-22 18:14:54 +00:00
Michael Telatynski
2952c37a47
Merge pull request #4466 from ihatetothink/unignored-in-settings
Unignored in settings
2020-04-22 19:14:47 +01:00
Agusti Bau
2471b3c100
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:22 +02:00