Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 22:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
39,200 Commits 203 Branches 552 Tags 525 MiB
8fe582b094
Commit Graph

925 Commits

Author SHA1 Message Date
Jaiwanth
3d4d1d32d9 Modify design according to the design team 2021-07-26 00:09:59 +05:30
Michael Telatynski
c8d9294350 Discard unused utility now that we use Object.fromEntries 2021-07-23 18:40:22 +01:00
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
Michael Telatynski
010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +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
Šimon Brandner
2df4f7b859
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938 2021-07-22 07:51:58 +02:00
Šimon Brandner
9f227893b1
join -> jsxJoin 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 07:47:04 +02: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
Michael Telatynski
1b2d70d816 Prompt user to leave rooms/subspaces in a space when leaving space 2021-07-21 09:57:10 +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
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
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
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
Germain Souquet
36ba65b534 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-12 13:00:34 +02:00
Michael Telatynski
27f74dd3f1 Fix multiinviter user already in room and clean up code 2021-07-12 11:32:06 +01:00
Michael Telatynski
a645cebb49 Fix setTimeout/setInterval typing 2021-07-12 09:02:46 +01:00
Šimon Brandner
19f14e4b2e
Fix tests? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 10:58:04 +02:00
Šimon Brandner
3e95cd1854
Handle JSX in MELS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 10:34:15 +02:00
Šimon Brandner
7a329b7a01
Add ReactUtils 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 10:31:24 +02:00
Michael Telatynski
bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Jaiwanth
6a4e2672f6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-10 19:18:01 +05:30
Š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
437d53d1cc Update space children (best effort) when upgrading a room 2021-07-09 08:43:41 +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
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Michael Telatynski
89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Jaiwanth
87c624d085 Use ref for progress updates 2021-07-02 16:52:33 +05:30
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Jaiwanth
3dcc7738f6 Add missing semicolon 2021-07-02 10:53:19 +05:30
Jaiwanth
f2e67604e7 Delint 2021-07-02 10:49:24 +05:30
Jaiwanth
190ccb6f00 Merge and add export support for the modified MAudioBody 2021-07-02 10:41:04 +05:30
Jaiwanth
6ca664636e Display progress 2021-07-02 10:23:34 +05:30
David Baker
80f5232217 Comply with new member-delimiter-style rule 
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
 2021-07-01 23:23:03 +01:00
Michael Telatynski
88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d Use defer from js-sdk as it has a better ts definition 2021-07-01 22:50:06 +01:00
Michael Telatynski
e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
Jaiwanth
08d886e9d1 Delint 2021-06-30 14:08:22 +05:30
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Jaiwanth
b0be7d2861 Add license and negate the conditional 2021-06-29 19:43:21 +05:30
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Jaiwanth
497d8102e2 Handle mxc urls for non-encrypted rooms 2021-06-29 12:54:44 +05:30
Jaiwanth
3fc4be0be9 Add return types to ABC Exporter 2021-06-29 11:40:26 +05:30
Jaiwanth
637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-29 11:31:30 +05:30
Jaiwanth
6cbbc0ecb4 Replace hard coded forExport string by mxc url 2021-06-29 11:29:05 +05:30
Jaiwanth
e404fa3cae Apply suggestions 2021-06-29 10:57:02 +05:30
Jaiwanth
de6bc3f2ed
Update src/utils/exportUtils/Exporter.ts 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:19:57 +05:30
Jaiwanth
efccf19e9e
Update src/utils/exportUtils/exportUtils.ts 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:14:00 +05:30
Jaiwanth
e6cb0666ef
Update src/utils/exportUtils/exportUtils.ts 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:13:51 +05:30
Travis Ralston
e519e704e9
Apply suggestions from code review 2021-06-28 20:40:11 -06:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Germain Souquet
652e06a7b1 remove cancelAnimationFrame complexity and rely on MarkedExecution class 2021-06-28 09:24:35 +01:00
Jaiwanth
fc81001316 Hide alt text if the image isn't present (for unavailable avatars) 2021-06-28 13:23:50 +05:30
Jaiwanth
00ee3efbff Wrap avatar fetch in try catch 2021-06-28 12:41:32 +05:30
Jaiwanth
efd8bf3a0f Delint 2021-06-28 11:00:34 +05:30
Jaiwanth
d46fe678b0 Handle export cancellation 2021-06-27 20:55:54 +05:30
Jaiwanth
685441baf5 Remove avatarForExport string 2021-06-26 23:40:35 +05:30
Jaiwanth
55ffb318e5 Change format order 2021-06-26 23:08:37 +05:30
Jaiwanth
e505646f21 Finish dialog implementation of export settings 2021-06-26 21:54:10 +05:30
Jaiwanth
92e34c7993 Format dropdown 2021-06-26 13:04:10 +05:30
Germain Souquet
533d5ad664 Specify return type for drawable promise 2021-06-25 11:49:24 +01:00
Germain Souquet
a17b13f83a Add drawable copyright header 2021-06-25 11:47:33 +01:00
Jaiwanth
566e7bc8d6 format 2021-06-25 15:52:01 +05:30
Jaiwanth
4af8ec4d40 Explicitly declare file extensions for stickers and log event fetching progress 2021-06-25 15:40:28 +05:30
Jaiwanth
593f14beae Append media text to text for event 2021-06-25 15:01:14 +05:30
Jaiwanth
c885cd719f i18n 2021-06-25 14:58:59 +05:30
Jaiwanth
abbe047bfd try catch for plain text 2021-06-25 14:49:01 +05:30
Germain Souquet
6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet
652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +01:00
Jaiwanth
02f15d573a Refactor 2021-06-25 11:52:26 +05:30
Jaiwanth
3718826e94 refactor to share downloading code across all formats 2021-06-25 11:16:59 +05:30
Jaiwanth
ccd02c48b3 Nicer indentation 2021-06-24 22:49:36 +05:30
Jaiwanth
544761329c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-24 18:33:30 +05:30
Jaiwanth
70cc2b20d5 Fix auto import 2021-06-24 18:23:08 +05:30
Jaiwanth
112dfa2b96 Finish JSON export implementation 2021-06-24 18:19:12 +05:30
Michael Telatynski
f6bb0f4e75
Merge pull request #6258 from matrix-org/t3chguy/fix/17752 2021-06-24 13:34:45 +01:00
Michael Telatynski
cc1ff2ce1c Remove unused import 2021-06-24 13:28:16 +01:00
Michael Telatynski
4993fc3e7a Fix edit history modal 
defining enums in ts module declarations sadly isn't magic
 2021-06-24 11:16:13 +01:00
Germain Souquet
21caa6df12 move live recording logic down the component tree 2021-06-24 09:58:11 +01:00
Germain Souquet
56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Michael Telatynski
0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Jaiwanth
dd40f81edf Wrap media fetch in try catch 2021-06-24 14:03:12 +05:30
Travis Ralston
76308de532 Add optional mark function callback 2021-06-24 09:19:33 +01:00
Jaiwanth
5fff64f128 Fix types 2021-06-23 12:14:20 +05:30
Jaiwanth
b2162c3be9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-23 12:09:46 +05:30
Jaiwanth
438b9d4730 Get rid of jszip and replace it with a custom library 2021-06-23 11:58:50 +05:30
Michael Telatynski
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski
e0ac200e27 Iterate PR 2021-06-22 22:23:09 +01:00
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
 2021-06-22 21:15:53 +01:00
Michael Telatynski
7948aa6181 Iterate PR, improve jsdoc and switch function style 2021-06-22 21:10:29 +01:00
Michael Telatynski
6fd1dc7d18 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7 2021-06-22 18:09:24 +01:00
Michael Telatynski
6d92953311 Convert bunch of utils to TS 2021-06-22 17:22:38 +01:00
Jaiwanth
db875508d8 Add text for room avatar events and skip empty text events 2021-06-22 12:50:15 +05:30
Jaiwanth
8a1cd77ef4 Handle no match cases and modify textForEvent to handle redacted messages 2021-06-22 12:12:37 +05:30
Jaiwanth
c58abd9582 Revert auto format 2021-06-22 10:51:16 +05:30
Jaiwanth
bf189204f2 Implement IRC bridge style reply formatting 2021-06-22 10:49:14 +05:30
Jaiwanth
a0e0453635 Fix type lint 2021-06-22 09:27:49 +05:30
Jaiwanth
45be4a6d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-22 09:27:37 +05:30
Šimon Brandner
39ca2844bd
Add AnimationUtils 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-19 10:10:27 +02:00
Michael Telatynski
0ae4e7b11d Fix typescript types 2021-06-18 16:21:46 +01:00
Michael Telatynski
058cbbbd0c Fix imports 2021-06-18 16:13:55 +01:00
Michael Telatynski
2e73647a85 Fix tests by updating private field names and spies 2021-06-17 15:18:52 +01:00
Michael Telatynski
3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Jaiwanth
9e6b8ff9f5 Start implementation of plain text export 2021-06-17 10:46:08 +05:30
Michael Telatynski
27e27b7a87 Convert MultiInviter, RoomInvite and UserAddress to Typescript 2021-06-16 10:18:32 +01:00
Michael Telatynski
cee294f5a7 iterate PR 2021-06-16 09:23:06 +01:00
Jaiwanth
cff4521106 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-16 10:52:00 +05:30