Jaiwanth
04edf4103f
Remove unnecessary awaits
2021-07-30 11:46:55 +05:30
Jaiwanth
6f8f0e8314
Change copyright year
2021-07-27 19:30:08 +05:30
Jaiwanth
371d1026fa
Add jest-raw-loader
2021-07-27 12:11:08 +05:30
Jaiwanth
57590b9a8a
Use raw-loaders to import svgs and exportJS
2021-07-27 11:37:47 +05:30
Jaiwanth
9771f4d6c4
PascalCasing for enums
2021-07-27 00:00:52 +05:30
Jaiwanth
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
Jaiwanth
41bc2b6481
Move away from streamsaver(for now)
2021-07-26 22:15:05 +05:30
Jaiwanth
a4da8f9e9e
Update exportCSS
2021-07-26 15:07:45 +05:30
Jaiwanth
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
Jaiwanth
3d4d1d32d9
Modify design according to the design team
2021-07-26 00:09:59 +05:30
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
2021-07-23 09:09:17 +01:00
Jaiwanth
c81bac1a4c
Add try catch for event tile errors
2021-07-23 10:47:49 +05:30
David Baker
d38f2cf5b5
Fix display of image messages that lack thumbnails
...
Fixes https://github.com/vector-im/element-web/issues/18175
2021-07-22 22:49:30 +01:00
Michael Telatynski
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
David Baker
a6c432d66f
fix types
...
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
Michael Telatynski
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Jaiwanth
6dd3631a17
Delint
2021-07-21 11:48:37 +05:30
Jaiwanth
1ed316851a
Merge upstream and resolve conflicts
2021-07-21 11:35:27 +05:30
Travis Ralston
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
Travis Ralston
44e240e12d
Doc some values
2021-07-20 08:55:07 -06:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Michael Telatynski
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
Šimon Brandner
1b74286cf0
/me has managed to steel something by accident
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:11:23 +02:00
Šimon Brandner
28f5827884
Add FileUtils
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:02:33 +02:00
Michael Telatynski
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
Jaiwanth
c0d2dbe7fd
Delint once more
2021-07-19 13:28:09 +05:30
Jaiwanth
6d0fd0322e
Delint
2021-07-19 13:23:55 +05:30
Jaiwanth
f07402d234
Fix types and precompute blob sizes to avoid overflows
2021-07-19 13:17:19 +05:30
Jaiwanth
ed93bf4c77
Reverse events in-place
2021-07-19 13:00:37 +05:30
Jaiwanth
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
Šimon Brandner
313964e796
Fix call event tile not behaving
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:12:53 +02:00
Travis Ralston
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
Travis Ralston
703cf73759
Convert MessageEvent to TS and hoist MediaEventHelper
2021-07-16 15:12:36 -06:00
Travis Ralston
0a99f76e7f
Simple POC for moving download button to action bar
2021-07-16 15:12:36 -06:00
Michael Telatynski
74bd7cad3f
remove unrelated change
2021-07-16 13:40:53 +01:00
Michael Telatynski
3b13eb7b44
Prefer URL constructor over url dependency
2021-07-16 13:18:12 +01:00
Michael Telatynski
5dbd79c729
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring
...
Conflicts:
package.json
src/@types/global.d.ts
src/components/views/elements/AppTile.js
src/utils/HostingLink.js
yarn.lock
2021-07-16 12:47:33 +01:00
Šimon Brandner
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 14:54:06 +02:00
Michael Telatynski
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
Michael Telatynski
e8fcf0978d
fix worker import
2021-07-14 18:05:06 +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
Michael Telatynski
57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1
2021-07-14 17:19:07 +01: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
Šimon Brandner
58dedbeeff
Add missing type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 09:52:56 +02: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
Šimon Brandner
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +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
