19384e24c0
Merge branch 'origin/develop' into Weblate.
2020-10-29 22:07:27 +00:00
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
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
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
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
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
f828c6d494
Implement call hold
...
Currently just by adding /holdcall and /unholdcall slash commands
The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.
Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
2020-10-29 17:56:24 +00:00
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
3f9f1d03c8
stubbed isGuest for unit tests
2020-10-29 13:22:09 +00:00
0b7ec2d734
Merge branch 'origin/develop' into Weblate.
2020-10-29 11:54:57 +00:00
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
8269ca74de
Merge branch 'origin/develop' into Weblate.
2020-10-29 03:18:29 +00:00
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
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
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
09b02d0120
Fix i18n
2020-10-28 10:50:38 -06:00
a501d698aa
Add a UI Feature flag for room history settings
2020-10-28 09:00:36 -06:00
e2aeca1580
Merge branch 'origin/develop' into Weblate.
2020-10-28 14:33:30 +00:00
a708dbf6e9
Reset matrix-js-sdk back to develop branch
2020-10-28 14:32:26 +00:00
6233df9d70
Merge branch 'master' into develop
2020-10-28 14:31:19 +00:00
bdfac1d858
v3.7.1
2020-10-28 14:25:35 +00:00
6c7284afba
Prepare changelog for v3.7.1
2020-10-28 14:25:34 +00:00
de6589705c
Upgrade matrix-js-sdk to 9.0.1
2020-10-28 14:17:48 +00:00
35a28a3f46
Merge branch 'origin/develop' into Weblate.
2020-10-28 14:17:06 +00:00
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
5f840da38a
Fix typo
2020-10-28 13:12:12 +00:00
ac7991c494
Add comment
2020-10-28 13:11:35 +00:00
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
e06550b748
Watch replyToEvent at RoomView to prevent races
2020-10-28 12:47:59 +00:00
c964c38406
Merge branch 'origin/develop' into Weblate.
2020-10-28 11:27:16 +00:00
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
f5480efea7
Merge branch 'origin/develop' into Weblate.
2020-10-28 00:56:38 +00:00
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
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
6dc709a045
😅
...
Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-10-27 20:10:23 +00:00
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
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
2fb0525756
Fix theme variable passed to Jitsi
2020-10-27 11:51:10 +00:00
9e3f3415bb
Merge branch 'origin/develop' into Weblate.
2020-10-27 11:39:07 +00:00
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
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
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
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
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
17717e27c6
Fix theme variable passed to Jitsi
2020-10-27 11:26:16 +00:00
cb510f7d74
Merge pull request #5351 from matrix-org/t3chguy/cherry-pick/6
...
[Release] Widget fixes
2020-10-27 11:15:53 +00:00
dc28616a6f
Remove empty CSS block
...
Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-10-26 22:53:37 +00:00
9c82482b85
Merge branch 'origin/develop' into Weblate.
2020-10-26 16:57:34 +00:00
6f37875d38
Reset matrix-js-sdk back to develop branch
2020-10-26 16:57:24 +00:00
361732612e
Merge branch 'origin/develop' into Weblate.
2020-10-26 16:56:57 +00:00
Weblate