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
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
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
Germain Souquet
51c5094ca4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 17:47:22 +02:00
David Baker
6c72955731
Fix 'User' type import
2021-07-14 16:41:01 +01:00
Germain Souquet
dde58d449d
Only hide sender when in bubble mode
2021-07-14 17:16:13 +02:00
Šimon Brandner
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 16:53:05 +02: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
James Salter
e054af7f38
Run yarn i18n
2021-07-14 15:35:57 +01:00
Germain Souquet
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00
Germain Souquet
f4dfe9832b
change labs flag wording
2021-07-14 16:20:25 +02:00
James Salter
2fe5ad5d4b
Slightly refine error message
2021-07-14 15:07:22 +01:00
James Salter
7f70b982cd
Add English i18n string
2021-07-14 15:02:59 +01:00
James Salter
8bf5e61acc
Add "Copy" to room context menu.
...
This menu item creates a matrix.to link for the room and copies it to the clipboard.
2021-07-14 14:58:18 +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
Šimon Brandner
54d2784818
Remove unused import
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 12:19:16 +02:00
Šimon Brandner
6c801fea53
Use MImageReplyBody for stickers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 12:15:13 +02: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
Šimon Brandner
782563af53
Override audio and video body with file body
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:47:29 +02:00
Šimon Brandner
04db6beb10
Remove stale comment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:30:24 +02:00
Šimon Brandner
ae4d8c291d
It's not an override
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:23:24 +02:00
Šimon Brandner
586e85cbff
Use MFileBody in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 10:14:44 +02:00
Šimon Brandner
4afd985e7e
Kill off _afterComponentWillUnmount
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:55:14 +02:00
Šimon Brandner
bde26a809a
Omit onFinished
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:54:33 +02:00
Šimon Brandner
7b35d2c270
FORCED_IMAGE_HEIGHT into a const
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:53:40 +02:00
Šimon Brandner
58dedbeeff
Add missing type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:52:56 +02:00
Šimon Brandner
74ff85ae30
Remove m.sticker since it's not a message type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:52:45 +02:00
Šimon Brandner
9aae33e076
Use string[]
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:28:37 +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
deab0407cb
Pull another settings lookup out of SearchResultTile loop
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:27:49 -04:00
Robin Townsend
6c4f0526d7
Coalesce falsy values from TextForEvent handlers
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:26:09 -04:00
Robin Townsend
8e64b73bd6
Merge branch 'develop' into text-for-event-perf
2021-07-13 23:25:16 -04: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
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
Michael Telatynski
59a1df71c8
remove redundant Promise.all
2021-07-13 17:05:57 +01:00
Michael Telatynski
bbd785b158
Move blurhashing into a Worker and use OffscreenCanvas where possible for thumbnailing
2021-07-13 16:57:40 +01:00
Paulo Pinto
76157a7b48
Standardise casing of integration manager
...
Replace instances of 'Integration Manager' with 'Integration manager', when at start of
sentence, or 'integration manager' when not.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:44 +01:00
Paulo Pinto
6884b2aa6d
Standardise spelling of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Paulo Pinto
09d08882e3
Standardise casing of identity server
...
Replace instances of 'Identity Server' with 'Identity server', when at start of
sentence, or 'identity server' when not.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Paulo Pinto
7a8400e5c7
Standardise spelling and casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Michael Telatynski
5a80530eff
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4
...
Conflicts:
src/components/structures/RoomDirectory.tsx
src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-13 15:46:48 +01:00
Šimon Brandner
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
Šimon Brandner
8f831a89f6
Remove unused code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:07:47 +02:00
Šimon Brandner
1ec4ead62d
Unused imports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:04:59 +02:00
Šimon Brandner
2660e25d6e
Deduplicate some code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:04:37 +02:00
Michael Telatynski
7433419649
Fix inviter exploding due to member being null
2021-07-13 11:37:31 +01:00
Šimon Brandner
8fc90e1d53
Fix isInfoMessage regression
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:26:14 +02:00
Šimon Brandner
75e7948ca8
Handle event edits
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:57:40 +02:00
Šimon Brandner
866a11d7e3
Fix image alignment issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
Šimon Brandner
fca5125c5b
Improve redacted body look
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
Germain Souquet
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
Šimon Brandner
bc7a8f8406
Handle redaction
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:12:24 +02:00
Šimon Brandner
9455a6d772
Import replaceableComponent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:40:29 +02:00
Šimon Brandner
e01d1572ac
Formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:34:43 +02:00
Šimon Brandner
069180b16d
Remove contructor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:31:28 +02:00
Šimon Brandner
c44de3bea8
Enums
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:30:52 +02:00
Šimon Brandner
b1fb089816
More compact classNames
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:27:22 +02:00
Šimon Brandner
0bf595d8d4
Enums
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:26:27 +02:00
Šimon Brandner
22b029d116
Relation type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:24:40 +02:00
Šimon Brandner
63ad95246a
EventType enum!
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:23:57 +02:00
Šimon Brandner
931bba747a
Replaceable component
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:22:13 +02:00
Šimon Brandner
ef1a1ebe12
TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:33 +02:00
Šimon Brandner
e4d1859fb7
Ret type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:05 +02:00
Šimon Brandner
4cf4ab2266
Return type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:40 +02:00
Šimon Brandner
af7769ce93
Types!
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:13 +02:00
Šimon Brandner
86580f3f20
current target
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:45 +02:00
Šimon Brandner
6193bc2a82
Types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:19 +02:00
Šimon Brandner
fa4977c4da
Use current target
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:34 +02:00
Šimon Brandner
bdbd03c4ff
Types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:05 +02:00
Šimon Brandner
2a403f6cfe
Remove additional ?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:17:18 +02:00
Šimon Brandner
5fc35565df
More TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:53 +02:00
Šimon Brandner
8f8377a71c
Types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:01 +02:00
Šimon Brandner
70e94f9af5
Formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:48:43 +02:00
Šimon Brandner
b5baf404be
Don't use as
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:47:37 +02:00
Šimon Brandner
04098dc74c
Remove unnecessary constructor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:46:45 +02:00
Šimon Brandner
ae5e10ff0c
Burn sdk.getComponent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:45:36 +02:00
Travis Ralston
8278b2273d
Copy over the whole feature of changing the state for keywords entirely
2021-07-13 00:23:56 -06:00
Šimon Brandner
cbe94c3c5f
Kill-off sdk.getComponent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:23:01 +02:00
Šimon Brandner
7bd7f704f9
Extend IDialogProps
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:20:17 +02:00
Šimon Brandner
2e295a94ed
Don't export IProps
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:17:51 +02:00
Travis Ralston
9d60d29368
Clean up i18n
2021-07-13 00:04:07 -06:00
Travis Ralston
4444ccb079
Appease the linter
2021-07-13 00:02:44 -06:00
Travis Ralston
ff7a18da56
Rewrite Notifications component for modern UI & processing
2021-07-12 23:57:54 -06:00
Travis Ralston
3ae76c84f6
Add a simple TagComposer for the keywords entry
2021-07-12 23:55:08 -06:00
Travis Ralston
fd5a36fd0c
Fix more types around notifications
2021-07-12 21:48:20 -06:00
Travis Ralston
0e749e32ac
Clarify that vectorState is a VectorState
2021-07-12 18:30:42 -06:00
Travis Ralston
5b9fca3b91
Migrate to js-sdk types for push rules
2021-07-12 18:30:42 -06:00
Travis Ralston
9556b61041
Crude conversion of Notifications.js to TS + cut out legacy code
...
This is to make the file clearer during development and serves no practical purpose
2021-07-12 18:30:42 -06:00
Travis Ralston
5a834fbc06
Convert Spinner to TS
2021-07-12 18:30:42 -06:00
Travis Ralston
436563be7b
Change label on notification dropdown for a room
...
by request of design, to reduce mental load
2021-07-12 18:30:42 -06:00
Travis Ralston
59e48ee0ba
Convert NotificationUserSettingsTab to TS
2021-07-12 18:30:42 -06:00
Travis Ralston
199c80315e
Merge pull request #6359 from matrix-org/travis/voice-messages/samplesssss
...
Increase sample count in voice message thumbnail
2021-07-12 14:18:22 -06:00
Travis Ralston
cbce71fd8e
Merge pull request #6360 from matrix-org/travis/seed-faster
...
Improve arraySeed utility
2021-07-12 14:14:14 -06:00
Travis Ralston
e045aa940e
Be smart with readonly
2021-07-12 14:11:24 -06:00
Travis Ralston
4910737064
Improve arraySeed utility
...
This is a tiny microimprovement, but worthwhile the more we use it.
2021-07-12 14:08:42 -06:00
Michael Telatynski
3232926ed8
Merge pull request #6358 from matrix-org/t3chguy/node-canvas
2021-07-12 21:08:40 +01:00
Travis Ralston
79aa205a95
variablize
2021-07-12 14:05:59 -06:00
Travis Ralston
4c98c0bc23
Increase sample count in voice message thumbnail
...
Fixes https://github.com/vector-im/element-web/issues/17817
Technically requires https://github.com/matrix-org/matrix-react-sdk/pull/6357 for sample sizing.
2021-07-12 14:02:51 -06:00
Travis Ralston
0e2bcb474d
delint
2021-07-12 13:52:10 -06:00
Travis Ralston
ec0f940ef0
Adjust recording waveform behaviour for voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17683
2021-07-12 13:48:01 -06:00
Michael Telatynski
d3652996d6
Convert FontManager to TS
2021-07-12 20:45:19 +01:00
Michael Telatynski
ae6eaa5acc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
...
Conflicts:
src/components/structures/RoomDirectory.tsx
src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
Michael Telatynski
d737b4e6ab
Use webpack worker-loader to load the IndexedDB worker instead of homegrown hack
2021-07-12 18:43:20 +01:00
J. Ryan Stinnett
1b39dbdb53
Merge pull request #6245 from aaronraimist/string-pl
...
Do not honor string power levels
2021-07-12 16:01:11 +01:00
HelaBasa
2da3b34878
Translated using Weblate (Sinhala)
...
Currently translated at 0.3% (10 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/si/
2021-07-12 14:25:39 +00:00
Priit Jõerüüt
e4166f1c40
Translated using Weblate (Estonian)
...
Currently translated at 99.7% (3037 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-12 14:25:39 +00:00
Kaede
9c6ff62629
Translated using Weblate (Japanese)
...
Currently translated at 75.3% (2294 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2021-07-12 14:25:32 +00:00
Erkin Alp Güney
b657da0f19
Translated using Weblate (Turkish)
...
Currently translated at 74.4% (2268 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/tr/
2021-07-12 14:25:30 +00:00
Percy
2ecc5a406b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (3046 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-12 14:25:25 +00:00
Percy
5303cc277c
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (3046 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2021-07-12 14:25:23 +00:00
Onno Ekker
fed094b459
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (3046 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-12 14:25:09 +00:00
xelantro
b30b1999db
Translated using Weblate (German)
...
Currently translated at 99.6% (3035 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-12 14:25:08 +00:00
libexus
94d5173c86
Translated using Weblate (German)
...
Currently translated at 99.6% (3035 of 3046 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-12 14:25:08 +00:00
J. Ryan Stinnett
130aee0416
Merge pull request #6343 from matrix-org/jryans/customise-aliases
...
Add alias and directory customisation points
2021-07-12 12:09:17 +01:00
J. Ryan Stinnett
38cbbfb99e
Add time to comment
2021-07-12 11:56:47 +01:00
Michael Telatynski
cecc43281b
i18n
2021-07-12 11:33:33 +01:00
Michael Telatynski
27f74dd3f1
Fix multiinviter user already in room and clean up code
2021-07-12 11:32:06 +01:00
Michael Telatynski
a3ea120150
Merge pull request #6341 from matrix-org/t3chguy/fix/17910
2021-07-12 10:55:00 +01:00
Michael Telatynski
2ef714b9eb
remove unused import
2021-07-12 10:49:19 +01:00
Michael Telatynski
83a4a20cfb
Merge pull request #5679 from SimonBrandner/quit-sticker-picker
2021-07-12 09:31:37 +01:00
Germain
ebd64eb53c
Merge pull request #6350 from SimonBrandner/fix/dont-auto-detect-lang/12366
...
Don't autodetect language in inline code blocks
2021-07-12 09:28:52 +01:00
Michael Telatynski
f049edf605
Merge branch 'develop' into quit-sticker-picker
2021-07-12 09:26:11 +01:00
Michael Telatynski
33dca81352
Update some more
2021-07-12 09:10:27 +01:00
Michael Telatynski
a645cebb49
Fix setTimeout/setInterval typing
2021-07-12 09:02:46 +01:00
Michael Telatynski
cdc75f3709
Merge pull request #6346 from matrix-org/t3chguy/fix/17935
...
only consider valid & loaded url previews for show N more prompt
2021-07-12 08:56:15 +01:00
Michael Telatynski
4f82f6aa1f
Merge pull request #6335 from matrix-org/t3chguy/fix/6884
...
Extract MXCs from _matrix/media/r0/ URLs for inline images in messages
2021-07-12 08:24:40 +01:00
Robin Townsend
b147bcd207
Merge branch 'develop' into text-for-event-perf
2021-07-11 11:35:12 -04:00
Šimon Brandner
cd125506b6
Auto-detect language only if enabled and only for codeblocks
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 11:18:06 +02:00
Robin Townsend
718887dd27
Update Emojibase and switch to IamCal (Slack-style) shortcodes
...
for consistency with shortcodes commonly used by other platforms, as
was decided in https://github.com/vector-im/element-web/issues/13857 .
One thing to be aware of is that the currently used version of Twemoji
does not support a few of the newer emoji present in Emojibase, so these
look a little out of place in the emoji picker. Optimally Twemoji would
be updated at the same time, though I don't know how to do that.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-10 23:13:48 -04:00
Michael Telatynski
e3e7d41d5c
only consider valid & loaded url previews for show N more prompt
2021-07-10 19:41:50 +01:00
Michael Telatynski
9b7697c530
fix imports
2021-07-10 16:02:43 +01:00
Michael Telatynski
2634ed949f
Fix Searching's mixing of types
2021-07-10 16:00:04 +01:00
Michael Telatynski
bd175c6f40
Improve and consolidate typing
2021-07-10 15:43:46 +01:00
Michael Telatynski
829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp
...
Fix small visual regression with the site name on url previews
2021-07-09 18:05:48 +01:00
J. Ryan Stinnett
ff7f3f47be
Add directory publish customisation point
...
This will help certain environments, such as P2P, where directory publishing can
be allowed freely.
2021-07-09 17:51:18 +01:00
J. Ryan Stinnett
8177dbfb56
Add display alias customisation point
...
This will allow environments such as P2P to tweak the preferred display alias if
needed.
2021-07-09 17:11:17 +01:00
J. Ryan Stinnett
4b9d4ad1e3
Centralise display alias getters
2021-07-09 17:06:54 +01:00
Šimon Brandner
a90b8f32f1
Add some tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 16:45:04 +02:00
Šimon Brandner
d9b8f0d540
Add docs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 15:58:35 +02:00
Michael Telatynski
8072007782
Fix small visual regression with the site name on url previews
2021-07-09 14:50:55 +01:00
Šimon Brandner
ba3d7f9bee
Use marked execution
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 15:50:52 +02:00
Michael Telatynski
a7aa87a9fc
Fix right panel not closing user info when changing rooms
2021-07-09 14:43:07 +01:00
Šimon Brandner
007548aa7f
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
2021-07-09 15:36:14 +02:00
Germain
a1c3f25fe5
Merge pull request #6340 from SimonBrandner/feature/media-devices
2021-07-09 14:09:11 +01:00
Michael Telatynski
c38fa9ded2
Merge pull request #6339 from matrix-org/t3chguy/update-modernizr
...
Simplify typescript definition for Modernizr
2021-07-09 13:59:22 +01:00
Šimon Brandner
cdeb0be847
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:22:41 +02:00
Šimon Brandner
96100ffaf3
Fix styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:19:27 +02:00
Šimon Brandner
dbc37675a0
Simplifie the code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:15:36 +02:00
Šimon Brandner
1b209a9cb3
Add setDevice() method
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:13:31 +02:00
Šimon Brandner
cd95be147c
Finish TS conversion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:45:39 +02:00
Michael Telatynski
2998018876
Merge pull request #6322 from SimonBrandner/feature/remember-server/17739
...
Remember the last used server for room directory searches
2021-07-09 12:36:54 +01:00
Šimon Brandner
dadfba9075
Add MediaDeviceKindEnum
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 13:08:39 +02:00
Šimon Brandner
866c1b76bd
Basic TS conversion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:57:42 +02:00
Michael Telatynski
318a68e761
Update Modernizr and stop it from polluting classes on the html tag
2021-07-09 11:49:05 +01:00
Šimon Brandner
046b3f325c
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 12:31:44 +02:00
Šimon Brandner
40954313e4
Merge branch 'feature/remember-server/17739' of https://github.com/SimonBrandner/matrix-react-sdk into feature/remember-server/17739
2021-07-09 10:44:45 +02:00
Šimon Brandner
6dcf860181
Refresh the room list only if validation failed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:44:20 +02:00
Šimon Brandner
84b00b5c38
Make the code more readable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 10:39:02 +02:00
Šimon Brandner
f78ede9324
Merge remote-tracking branch 'upstream/develop' into feature/remember-server/17739
2021-07-09 10:33:24 +02:00
Šimon Brandner
88a5969f2d
Remove a word
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-09 10:32:43 +02:00
Michael Telatynski
ac309a0d08
Merge pull request #6332 from SimonBrandner/fix/focus-composer-reaction/11023
2021-07-09 09:05:54 +01:00
Michael Telatynski
6fe00d12ea
Convert RoomUpgradeDialog to TS
2021-07-09 08:47:18 +01:00
Michael Telatynski
437d53d1cc
Update space children (best effort) when upgrading a room
2021-07-09 08:43:41 +01:00
Michael Telatynski
f412fb44a7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/SlashCommands.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-09 08:13:39 +01:00
Michael Telatynski
b9be0896f1
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/pins
2021-07-09 07:48:12 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
David Baker
013a81148b
Merge pull request #6337 from matrix-org/dbkr/devicelistener_megolm_key
...
Make DeviceListener also update on megolm key in SSSS
2021-07-08 21:44:41 +01:00
David Baker
197b6aeefe
Make DeviceListener also update on megolm key in SSSS
...
The device listener checks for a megolm key stored in SSSS but didn't
update when one was added, so the encryption upgrade toast would not
disappear after the key was fixed by https://github.com/matrix-org/matrix-js-sdk/pull/1776
2021-07-08 21:16:19 +01:00
Šimon Brandner
7a1381135a
Simplifie some code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 18:31:47 +02:00
Šimon Brandner
27db0da437
Simpler code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:40:41 +02:00
Šimon Brandner
6401577fe4
focus_composer -> focus_send_message_composer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:37:39 +02:00
Šimon Brandner
68d194444a
FocusComposer -> FocusSendMessageComposer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:36:31 +02:00
Šimon Brandner
7734f8aeef
Handle focusing multiple composers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:33:49 +02:00
Šimon Brandner
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:17:34 +02:00
Šimon Brandner
8f0d72335d
Rework call silencing once again
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:16:02 +02:00
Michael Telatynski
4978c27dd5
Merge pull request #6326 from matrix-org/revert-6135-t3chguy/fix/17494
2021-07-08 14:56:55 +01:00
Michael Telatynski
f8907a6ea4
Fix bug which prevented more than one event getting pinned
2021-07-08 14:48:06 +01:00
Michael Telatynski
8e7e4c9e8d
Convert MessageContextMenu to Typescript
2021-07-08 14:47:36 +01:00
Michael Telatynski
94a7812039
Extract MXCs from _matrix/media/r0/ URLs for inline images in messages
2021-07-08 14:22:38 +01:00
Šimon Brandner
2615ea7f3f
Add icons to buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:35:06 +02:00
Michael Telatynski
00a3f5d469
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494
2021-07-08 13:29:10 +01:00
Michael Telatynski
5d72ea5e19
Fix Space Create menu not disabling the alias field when busy
2021-07-08 13:24:56 +01:00
Michael Telatynski
fc05395dba
Don't close settings dialog when opening spaces feedback prompt
2021-07-08 13:24:16 +01:00
Šimon Brandner
9ec3d93402
Better handling of call types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 14:19:02 +02:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
Šimon Brandner
14687f3630
Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023
2021-07-08 13:19:46 +02:00
Šimon Brandner
64f32a9fc1
Focus composer after reacting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 13:12:57 +02:00