1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 23:22:01 +03:00
Commit graph

29135 commits

Author SHA1 Message Date
Travis Ralston
a501d698aa Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
Travis Ralston
0adb920448
Merge pull request 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
Michael Telatynski
914699259b
Merge pull request 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
RiotRobot
6f37875d38 Reset matrix-js-sdk back to develop branch 2020-10-26 16:57:24 +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
Travis Ralston
b10a6a5720
Merge pull request from RinkiyaKeDad/comments
docs: added comment explanation
2020-10-26 08:48:39 -06:00
Will Hunt
7eb54cc83c Also only download images after clicking on them 2020-10-23 17:16:09 +01:00
Will Hunt
e5228e2795 alt is not valid on video element 2020-10-23 16:42:23 +01:00
Will Hunt
7164284bb6 Do not download encrypted video if autoplay is not on 2020-10-23 16:33:40 +01:00
Will Hunt
bbb4c7f801 Convert MVideoBody to typescript 2020-10-23 16:32:04 +01:00
Travis Ralston
646ed4c4d4
Merge pull request from matrix-org/t3chguy/feat/modal-widgets
Modal Widgets - MSC2790
2020-10-23 07:29:10 -06:00
Michael Telatynski
cf93f75d09 fix sandbox flags 2020-10-22 22:09:16 +01:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
Michael Telatynski
12bc3ea9dc remove stale comments 2020-10-22 21:34:48 +01:00
Michael Telatynski
ca4e7202ae
Merge pull request from matrix-org/t3chguy/fix/widgets
Widgets fixes
2020-10-21 16:30:24 +01:00
Michael Telatynski
25c9b2694e
Merge pull request from matrix-org/t3chguy/fix/15511
Fix User Menu avatar colouring being based on wrong string
2020-10-21 16:09:23 +01:00
Michael Telatynski
5f2058a6a0 Fix WidgetStore wrongly hanging onto old Widget definitions during removal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:06:22 +01:00
Michael Telatynski
a16a6d2b54 Remove redundant event listener
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:44 +01:00
Michael Telatynski
6196c03c0a Fix stickerpicker not having correct contexts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:20 +01:00
Arsh Sharma
e57f4fbd54 docs: fixed whitespace 2020-10-21 20:13:50 +05:30
Arsh Sharma
312d46917c docs: added comment explanation 2020-10-21 20:10:35 +05:30
RiotRobot
5c7e9e8a46 v3.7.0-rc.2 2020-10-21 15:21:44 +01:00
RiotRobot
ecfd61de56 Prepare changelog for v3.7.0-rc.2 2020-10-21 15:21:43 +01:00
RiotRobot
b585cf76bd Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 15:16:46 +01:00
RiotRobot
2f3eb0cd01 v3.7.0-rc.1 2020-10-21 14:44:21 +01:00
RiotRobot
0a7e8049f2 Prepare changelog for v3.7.0-rc.1 2020-10-21 14:44:21 +01:00
RiotRobot
65d7b9c0f2 Upgrade matrix-js-sdk to 8.5.0 2020-10-21 14:38:51 +01:00
Michael Telatynski
0170fa608e Fix User Menu avatar colouring being based on wrong string
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 14:11:39 +01:00
David Baker
fa1a956733
Merge pull request from matrix-org/dbkr/select_answer
Support 'answered elsewhere'
2020-10-21 13:42:23 +01:00
J. Ryan Stinnett
a1352622ea
Merge pull request from matrix-org/jryans/translate-rename
Update Weblate URL
2020-10-21 13:37:29 +01:00
J. Ryan Stinnett
5fcd2d5f8a
Merge pull request from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2020-10-21 13:37:18 +01:00
J. Ryan Stinnett
640fe00d1e Update Weblate URL 2020-10-21 13:14:41 +01:00
Weblate
3be11d8785 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:59:48 +00:00
Michael Telatynski
1bbd273b01
Merge pull request from matrix-org/t3chguy/feat/room-list-widgets
Left Panel Widget support
2020-10-21 12:59:41 +01:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
Michael Telatynski
568e147053 Merge copyrights
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 12:44:16 +01:00
Weblate
810f579e56 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:41:32 +00:00
call_xz
2ba1805f74 Translated using Weblate (Japanese)
Currently translated at 57.1% (1354 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2020-10-21 11:41:31 +00:00
Michael Telatynski
fb3b5d2f5d
Merge pull request from matrix-org/t3chguy/feat/widgets
Pinned widgets work
2020-10-21 12:41:20 +01:00
David Baker
765fdf93e6 Support 'answered elsewhere'
Show a dialog for now, telling the user someone beat them to it.

Only useful with https://github.com/matrix-org/matrix-js-sdk/pull/1522
(but can be merged safely without).
2020-10-21 11:54:48 +01:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 09:48:02 +01:00
Michael Telatynski
9cd146aa33 remove debug lines
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 09:46:37 +01:00
Weblate
356a1916a9 Merge branch 'origin/develop' into Weblate. 2020-10-20 22:54:29 +00:00
Nikolay Boyadzhiev
6d0dc00d4a Translated using Weblate (Bulgarian)
Currently translated at 92.5% (2191 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
2020-10-20 22:54:29 +00:00
Michael Telatynski
42228719b9
Merge pull request from matrix-org/t3chguy/ts/resizer
Convert resizer to Typescript
2020-10-20 23:54:17 +01:00