Commit Graph

29209 Commits (71334649777b15fcdd1a9836986bd29996d48573)

Author SHA1 Message Date
progserega 7133464977 Translated using Weblate (Russian)
Currently translated at 99.8% (2363 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2020-10-30 12:00:11 +00:00
Weblate 19384e24c0 Merge branch 'origin/develop' into Weblate. 2020-10-29 22:07:27 +00:00
Nikolai Zahariev 3ef0bb5888 Translated using Weblate (Bulgarian)
Currently translated at 92.3% (2186 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
2020-10-29 22:07:27 +00:00
notramo 397f2386d3 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2020-10-29 22:07:25 +00:00
Max Harmathy 1bab68333e Translated using Weblate (German)
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2020-10-29 22:07:23 +00:00
Michael Telatynski d10234740b
Merge pull request #5367 from aaronraimist/fix-custom-tag-layout
Fix custom tag layout which regressed in #5309
2020-10-29 22:07:12 +00:00
Aaron Raimist c636dc0ed3
Fix custom tag layout which regressed in #5309
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-29 16:54:55 -05:00
Weblate 0b7ec2d734 Merge branch 'origin/develop' into Weblate. 2020-10-29 11:54:57 +00:00
Michael Telatynski 3c9cc636c4
Merge pull request #5360 from matrix-org/t3chguy/fix/15586
Watch replyToEvent at RoomView to prevent races
2020-10-29 11:54:49 +00:00
Weblate 8269ca74de Merge branch 'origin/develop' into Weblate. 2020-10-29 03:18:29 +00:00
MamasLT c4e8b4221f Translated using Weblate (Lithuanian)
Currently translated at 81.3% (1926 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
2020-10-29 03:18:29 +00:00
Travis Ralston ac3414b231
Merge pull request #5362 from matrix-org/travis/ui-feat/history
Add a UI Feature flag for room history settings
2020-10-28 21:18:19 -06:00
Travis Ralston 09b02d0120 Fix i18n 2020-10-28 10:50:38 -06:00
Travis Ralston a501d698aa Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
Weblate e2aeca1580 Merge branch 'origin/develop' into Weblate. 2020-10-28 14:33:30 +00:00
RiotRobot a708dbf6e9 Reset matrix-js-sdk back to develop branch 2020-10-28 14:32:26 +00:00
RiotRobot 6233df9d70 Merge branch 'master' into develop 2020-10-28 14:31:19 +00:00
RiotRobot bdfac1d858 v3.7.1 2020-10-28 14:25:35 +00:00
RiotRobot 6c7284afba Prepare changelog for v3.7.1 2020-10-28 14:25:34 +00:00
RiotRobot de6589705c Upgrade matrix-js-sdk to 9.0.1 2020-10-28 14:17:48 +00:00
Weblate 35a28a3f46 Merge branch 'origin/develop' into Weblate. 2020-10-28 14:17:06 +00:00
J. Ryan Stinnett e1e77b2191
Merge pull request #5361 from matrix-org/jryans/hide-inline-images
Hide inline images when preference disabled
2020-10-28 14:16:57 +00:00
J. Ryan Stinnett 5f840da38a Fix typo 2020-10-28 13:12:12 +00:00
J. Ryan Stinnett ac7991c494 Add comment 2020-10-28 13:11:35 +00:00
J. Ryan Stinnett 9c8bc583e0 Hide inline images when preference disabled
As a first attempt, this drops inline images (as if they were not present at
all) when the "show images" preference is disabled. Future work might expose
some UI to reveal them like standalone image events have.

Fixes https://github.com/vector-im/element-web/issues/15573
2020-10-28 13:03:48 +00:00
Michael Telatynski e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
Weblate c964c38406 Merge branch 'origin/develop' into Weblate. 2020-10-28 11:27:16 +00:00
J. Ryan Stinnett 557d9ad90c
Merge pull request #5359 from matrix-org/jryans/react-key-checkboxes
Fix React warning by moving handler to each button
2020-10-28 11:27:07 +00:00
Weblate f5480efea7 Merge branch 'origin/develop' into Weblate. 2020-10-28 00:56:38 +00:00
Tirifto 89fbd33abf Translated using Weblate (Esperanto)
Currently translated at 99.6% (2359 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
2020-10-28 00:56:38 +00:00
Travis Ralston 0adb920448
Merge pull request #5352 from matrix-org/hs/mvideobody
Do not preload encrypted videos|images unless autoplay or thumbnailing is on
2020-10-27 18:56:29 -06:00
J. Ryan Stinnett bb18e44042 Fix React warning by moving handler to each button
React is disturbed that the buttons don't have their own event handlers, so
let's just move it there.
2020-10-27 17:11:09 +00:00
Michael Telatynski a093a64d70
Merge pull request #5358 from matrix-org/t3chguy/fix/jitsi-cherry-pick
[Release] Fix theme variable passed to Jitsi
2020-10-27 12:05:13 +00:00
Michael Telatynski 2fb0525756 Fix theme variable passed to Jitsi 2020-10-27 11:51:10 +00:00
Weblate 9e3f3415bb Merge branch 'origin/develop' into Weblate. 2020-10-27 11:39:07 +00:00
MamasLT da00ab53ad Translated using Weblate (Lithuanian)
Currently translated at 81.2% (1923 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
2020-10-27 11:39:07 +00:00
LinAGKar fdb491d4e8 Translated using Weblate (Swedish)
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2020-10-27 11:38:47 +00:00
notramo 1214052e53 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2020-10-27 11:38:44 +00:00
Corentin Noël 432deb665d Translated using Weblate (French)
Currently translated at 94.8% (2245 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2020-10-27 11:38:42 +00:00
Michael Telatynski 914699259b
Merge pull request #5357 from matrix-org/t3chguy/fix/jitsi
Fix theme variable passed to Jitsi
2020-10-27 11:38:30 +00:00
Michael Telatynski 17717e27c6 Fix theme variable passed to Jitsi 2020-10-27 11:26:16 +00:00
Michael Telatynski cb510f7d74
Merge pull request #5351 from matrix-org/t3chguy/cherry-pick/6
[Release] Widget fixes
2020-10-27 11:15:53 +00:00
Weblate 9c82482b85 Merge branch 'origin/develop' into Weblate. 2020-10-26 16:57:34 +00:00
RiotRobot 6f37875d38 Reset matrix-js-sdk back to develop branch 2020-10-26 16:57:24 +00:00
Weblate 361732612e Merge branch 'origin/develop' into Weblate. 2020-10-26 16:56:57 +00:00
MamasLT 40881a7359 Translated using Weblate (Lithuanian)
Currently translated at 74.0% (1752 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
2020-10-26 16:56:56 +00:00
RiotRobot 1f2ff33fc8 Merge branch 'master' into develop 2020-10-26 16:56:37 +00:00
RiotRobot 492f85da00 v3.7.0 2020-10-26 16:55:16 +00:00
RiotRobot 25dd5e045e Prepare changelog for v3.7.0 2020-10-26 16:55:16 +00:00
RiotRobot 5446184e6e Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:49:16 +00:00