de4a29cd3c
Merge pull request #6368 from SimonBrandner/feature/reorder-buttons-image-view
2021-07-13 19:51:32 +01:00
46e1fdf442
Reorder buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:28:49 +02:00
497ea6ee79
Merge pull request #6367 from SimonBrandner/ignore-vscode
2021-07-13 19:19:47 +01:00
3a0408a4cc
Ignore vscode
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:11:52 +02:00
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
d7feaf55c2
Undo changes to the CHANGELOG
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 18:24:45 +01:00
59a1df71c8
remove redundant Promise.all
2021-07-13 17:05:57 +01:00
bbd785b158
Move blurhashing into a Worker and use OffscreenCanvas where possible for thumbnailing
2021-07-13 16:57:40 +01:00
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
6884b2aa6d
Standardise spelling of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
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
7a8400e5c7
Standardise spelling and casing of homeserver
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
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
80f3a64f53
Merge pull request #6362 from matrix-org/t3chguy/fix/inviting
2021-07-13 14:39:28 +01:00
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
1bca5371d1
Fix redacted messages for the 100th #*&@*%^ time
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:18:01 +02:00
8f831a89f6
Remove unused code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:07:47 +02:00
1ec4ead62d
Unused imports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:04:59 +02:00
2660e25d6e
Deduplicate some code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:04:37 +02:00
7433419649
Fix inviter exploding due to member being null
2021-07-13 11:37:31 +01:00
8e456b062a
More unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:32:17 +02:00
d149cead5f
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:27:03 +02:00
8fc90e1d53
Fix isInfoMessage regression
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:26:14 +02:00
b4ae54dcce
Remove unused CSS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 12:15:22 +02:00
75e7948ca8
Handle event edits
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:57:40 +02:00
866a11d7e3
Fix image alignment issues
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 11:49:49 +02:00
fca5125c5b
Improve redacted body look
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:36:44 +02:00
bc7a8f8406
Handle redaction
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 10:12:24 +02:00
9455a6d772
Import replaceableComponent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:40:29 +02:00
562d43e81c
Font
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:36:31 +02:00
e01d1572ac
Formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:34:43 +02:00
43cf7bc611
Remove 0px
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:33:45 +02:00
069180b16d
Remove contructor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:31:28 +02:00
c44de3bea8
Enums
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:30:52 +02:00
b1fb089816
More compact classNames
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:27:22 +02:00
0bf595d8d4
Enums
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:26:27 +02:00
22b029d116
Relation type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:24:40 +02:00
63ad95246a
EventType enum!
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:23:57 +02:00
931bba747a
Replaceable component
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:22:13 +02:00
ef1a1ebe12
TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:33 +02:00
e4d1859fb7
Ret type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:21:05 +02:00
4cf4ab2266
Return type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:40 +02:00
af7769ce93
Types!
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:20:13 +02:00
86580f3f20
current target
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:45 +02:00
6193bc2a82
Types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:19:19 +02:00
fa4977c4da
Use current target
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:34 +02:00
bdbd03c4ff
Types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:18:05 +02:00
2a403f6cfe
Remove additional ?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:17:18 +02:00
5fc35565df
More TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:53 +02:00
8f8377a71c
Types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 09:16:01 +02:00
Michael Telatynski