Commit Graph

62531 Commits

Author SHA1 Message Date
Matthew Kenigsberg 24ba566877 Specify community description img must be mxc urls
Closes vector-im/element-web#7100

Signed-off-by: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
2020-10-28 18:34:54 -05:00
Travis Ralston 09b02d0120 Fix i18n 2020-10-28 10:50:38 -06:00
Weblate 6b31c14c97 Merge branch 'origin/develop' into Weblate. 2020-10-28 15:27:07 +00:00
RiotRobot 67d82f2695 Merge remote-tracking branch 'origin/develop' into develop 2020-10-28 15:26:41 +00:00
RiotRobot 35327ff6a4 Reset matrix-react-sdk back to develop branch 2020-10-28 15:24:23 +00:00
RiotRobot a3fdb1c2a2 Reset matrix-js-sdk back to develop branch 2020-10-28 15:24:11 +00:00
Weblate 98acd1b059 Merge branch 'origin/develop' into Weblate. 2020-10-28 15:23:45 +00:00
J. Ryan Stinnett 4bff37b16c Merge pull request #15590 from vector-im/jryans/rename-docker-repo
Rename Docker repo in docs
2020-10-28 15:23:38 +00:00
RiotRobot 098d8b154b Merge branch 'master' into develop 2020-10-28 15:22:24 +00:00
RiotRobot cc7e64375d v1.7.12 v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot 9d6bbef04e Prepare changelog for v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot f821b7c8bb Upgrade matrix-react-sdk to 3.7.1 2020-10-28 15:13:55 +00:00
RiotRobot 469df236d9 Upgrade matrix-js-sdk to 9.0.1 2020-10-28 15:13:31 +00: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
J. Ryan Stinnett d64639c70a Rename Docker repo in docs
We now have a Docker repo named `element-web`, so this updates docs to match.

Fixes https://github.com/vector-im/element-web/issues/14930
2020-10-28 14:32:25 +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
Travis Ralston 71206e8e3d Add documentation for new UIFeature flag regarding room history settings 2020-10-27 19:23:06 -06: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
Resynth 6dc709a045 😅
Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-10-27 20:10:23 +00: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 ce44cbb2dc Merge pull request #15577 from vector-im/t3chguy/fix/jitsi-cherry-pick
[Release] Fix Jitsi regressions with custom themes
2020-10-27 12:05:09 +00:00
Michael Telatynski 2fb0525756 Fix theme variable passed to Jitsi 2020-10-27 11:51:10 +00:00
Michael Telatynski be1e4552aa fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:48:03 +00:00
Michael Telatynski d297ee5c7e Fix theme variable handling with invalid values 2020-10-27 11:48:03 +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
Weblate b9a7531926 Merge branch 'origin/develop' into Weblate. 2020-10-27 11:38:34 +00:00
DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN 5de910a9eb Translated using Weblate (Dutch)
Currently translated at 87.8% (29 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2020-10-27 11:38:34 +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 dda3779ad8 Merge pull request #15575 from vector-im/t3chguy/fix/jitsi
Fix Jitsi regressions with custom themes
2020-10-27 11:38:26 +00:00
Michael Telatynski 0bdf979c46 fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:26:41 +00:00