Commit graph

34814 commits

Author SHA1 Message Date
Michael Telatynski
e9d56d4f13 Fix possible uncaught exception for getUrlPreview which would cause 0 url previews if one url was faulty 2021-07-15 12:10:01 +01:00
Michael Telatynski
1eaf6dd4ed Improve TS in SenderProfile 2021-07-15 11:49:55 +01:00
Michael Telatynski
b8ac40ae55 Fix React missing key error 2021-07-15 11:49:44 +01:00
Michael Telatynski
59feff3763 Silence RoomListStore possible memory leak warning 2021-07-15 11:49:15 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363)
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
David Baker
f990a595d1
Merge pull request #6379 from matrix-org/dbkr/contributing_md
Convert CONTRIBUTING to markdown
2021-07-14 23:06:18 +01:00
David Baker
21a6a2d01e Update links 2021-07-14 22:39:03 +01:00
David Baker
f4c767ab3e Convert CONTRIBUTING to markdown
Where by 'convert', I mean 'rename'
2021-07-14 22:37:47 +01:00
Michael Telatynski
6fc6d6b0a3
Merge pull request #6366 from matrix-org/t3chguy/ts/c4 2021-07-14 20:14:01 +01:00
Travis Ralston
2c5c2e82bf
Merge pull request #6378 from matrix-org/travis/widgets/fix-state-read
Exclude state events from widgets reading room events
2021-07-14 12:59:58 -06:00
Travis Ralston
421392f339 Exclude state events from widgets reading room events
They can request state reading permissions to read state.
2021-07-14 12:48:27 -06:00
Michael Telatynski
12761fd823 add valuable ts-ignore 2021-07-14 19:16:34 +01:00
Michael Telatynski
296d5d1d5e stub out workers for jest tests as it doesn't like the worker-loader 2021-07-14 18:50:01 +01:00
Michael Telatynski
50a9394c59 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4
 Conflicts:
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-14 18:36:12 +01:00
Michael Telatynski
8de4f092d4
Merge pull request #6356 from matrix-org/t3chguy/ts/c3 2021-07-14 18:25:25 +01:00
Michael Telatynski
e8fcf0978d fix worker import 2021-07-14 18:05:06 +01:00
Michael Telatynski
0e38eee080 improve typing in the idb worker 2021-07-14 17:53:42 +01:00
Michael Telatynski
4084a11847 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c3 2021-07-14 17:52:32 +01:00
Travis Ralston
5a51b7139c
Merge pull request #6371 from matrix-org/travis/widgets/fix-enc
Send clear events to widgets when permitted
2021-07-14 10:34:08 -06:00
Travis Ralston
c4b03064ae fix imports 2021-07-14 10:28:45 -06:00
David Baker
603889dbb8
Merge pull request #6377 from matrix-org/dbkr/comment_only_develop
Comment why end to end tests are only on the develop branch
2021-07-14 17:23:17 +01:00
Michael Telatynski
57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1 2021-07-14 17:19:07 +01:00
Travis Ralston
5dc3d09dd8 Use new function name 2021-07-14 10:18:55 -06:00
David Baker
5399929da5 Comment why end to end tests are only on the develop branch 2021-07-14 17:13:40 +01:00
David Baker
291723107a
Merge pull request #6375 from matrix-org/dbkr/fix_user_type_import
Fix 'User' type import
2021-07-14 16:49:41 +01:00
David Baker
6c72955731 Fix 'User' type import 2021-07-14 16:41:01 +01:00
Travis Ralston
fe2eb5ebf0
Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel
Fix voice messages in right panels
2021-07-14 08:46:55 -06:00
Travis Ralston
2b8e709125
Merge pull request #6369 from matrix-org/travis/tileshape
Use TileShape enum more universally
2021-07-14 08:46:27 -06:00
David Baker
181a23d259
Merge pull request #6373 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-07-14 11:52:44 +01:00
Weblate
14e024b17f Merge branch 'origin/develop' into Weblate. 2021-07-14 10:44:59 +00:00
Phuc D**
769c91387c Translated using Weblate (Vietnamese)
Currently translated at 10.0% (307 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/vi/
2021-07-14 10:44:48 +00:00
Paulo Pinto
4b6de3a011 Undo change that impacts analytics action
We dont't want the analytics identitfier to change.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-14 11:10:17 +01:00
J. Ryan Stinnett
f3970e201a
Merge pull request #5947 from robintown/e2ee-history-visibility
Hide world readable history option in encrypted rooms
2021-07-14 10:00:30 +01:00
Germain
2a66269383
Merge pull request #6372 from SimonBrandner/feature/bigger-image-view-buttons
Make the Image View buttons easier to hit
2021-07-14 08:55:08 +01:00
Šimon Brandner
6a285bed5a
Make the buttons easier to hit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:06:41 +02:00
Travis Ralston
9495ba001c Send clear events to widgets when permitted
Fixes https://github.com/vector-im/element-web/issues/17615
2021-07-13 23:17:17 -06:00
Robin Townsend
0117d513ea Consolidate disabling of history options
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:08:43 -04:00
Robin Townsend
d568e92e06 Merge branch 'develop' into e2ee-history-visibility 2021-07-13 23:07:11 -04:00
Travis Ralston
1f131db216 Set a max width on waveform-less tiles 2021-07-13 19:02:12 -06:00
Travis Ralston
5a75539b93 Introduce a "pinned" tile shape
All components which don't understand this shape will fall through to their normal states, as they would for no explicit tile shape.
2021-07-13 19:01:55 -06:00
Travis Ralston
49c9492484 Pass tile shape down to tiles in the notifications panel 2021-07-13 18:52:07 -06:00
Travis Ralston
ed1fbad6c4 Respect tile shape for voice messages
Fixes https://github.com/vector-im/element-web/issues/17608
2021-07-13 18:51:53 -06:00
Travis Ralston
9b6495903c Use TileShape enum more universally 2021-07-13 18:35:56 -06:00
Michael Telatynski
de4a29cd3c
Merge pull request #6368 from SimonBrandner/feature/reorder-buttons-image-view 2021-07-13 19:51:32 +01:00
Šimon Brandner
46e1fdf442
Reorder buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:28:49 +02:00
Michael Telatynski
497ea6ee79
Merge pull request #6367 from SimonBrandner/ignore-vscode 2021-07-13 19:19:47 +01:00
Šimon Brandner
3a0408a4cc
Ignore vscode
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:11:52 +02:00
Paulo Pinto
45a265a59a Undo changes to translation files other than en_EN
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 18:24:45 +01:00
Paulo Pinto
d7feaf55c2 Undo changes to the CHANGELOG
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 18:24:45 +01:00