Commit graph

920 commits

Author SHA1 Message Date
Dariusz Niemczyk
5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter
* origin/develop: (1278 commits)
  Add a little padding
  Keep number field in focus when pressing dialpad buttons (#6520)
  Remove old version
  Fix video call persisting when widget removed
  Update link to matrix-js-sdk CONTRIBUTING file (#6557)
  $toast-bg-color -> $system
  $system-... -> $system
  Iterate PR based on feedback
  Remove unnecessary code
  Use AccessibleTooltipButton
  Just upload the PR object itself
  Edit PR Description instead of commenting
  publish the right directory
  Fix Netflify builds from fork PRs
  This doesn't need to be here as it was moved into CallViewButtons
  Make scrollbar dot transparent
  Iterate PR based on feedback
  Don't set hidden RRs labs setting at account level
  Add a comment for weirdly placed div
  Add full class names to animations.scss
  ...
2021-08-13 15:12:07 +02:00
Šimon Brandner
c79852a9f0
Left align call tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
Jaiwanth
c62210b07c Merge branch 'export-conversations' of https://github.com/jaiwanth-v/matrix-react-sdk into export-conversations 2021-08-13 09:00:20 +05:30
Jaiwanth
00d5a0baa4
Apply suggestions from code review
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-08-13 08:59:28 +05:30
Jaiwanth
dda24da204 Add copyright headers 2021-08-13 08:59:14 +05:30
Jaiwanth
edfc8af6cf Apply PR Suggestions 2021-08-13 08:30:50 +05:30
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Hubert Chathi
82c34e9ed1
Update src/utils/DecryptFile.ts
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-08-10 19:37:18 -04:00
Hubert Chathi
3b9810719f use the mimetype from the info property rather than the EncryptedFile
the mimetype in EncryptedFile is undocumented and redundant.
see https://github.com/matrix-org/matrix-doc/pull/2582
2021-08-10 19:27:24 -04:00
Michael Telatynski
db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01:00
Jaiwanth
ecf0aba97c Test for different types of events 2021-08-10 12:25:51 +05:30
Jaiwanth
900accd823 Add test for renderToString 2021-08-09 13:25:32 +05:30
Jaiwanth
850b5452a0 Add tests for reply regex 2021-08-09 12:36:06 +05:30
Jaiwanth
45ce352d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:44:13 +05:30
Travis Ralston
f53451df65
Merge pull request #6349 from SimonBrandner/feature/collapse-pinned-mels/17938
Group pinned message events with MELS
2021-08-06 09:25:08 -06:00
Michael Telatynski
64995dfae7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-06 11:39:24 +01:00
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:43:19 +02:00
Travis Ralston
81ddaf2efa Properly set style attribute on shared usercontent iframe
Fixes https://github.com/vector-im/element-web/issues/18414
2021-08-05 11:21:22 -06:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Jaiwanth
f00ab0460b Delint 2021-08-04 13:06:07 +05:30
Jaiwanth
c74d6c6fff Assign replacements 2021-08-04 12:48:32 +05:30
Jaiwanth
e29d9db2e7 Fetch exportCSS during export 2021-08-04 12:37:13 +05:30
Jaiwanth
b333612dea Fix comparing MB -> bytes 2021-08-03 14:53:23 +05:30
Jaiwanth
4824c93707 Add a test file 2021-08-03 14:36:21 +05:30
Jaiwanth
46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
Jaiwanth
17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Jaiwanth
04edf4103f Remove unnecessary awaits 2021-07-30 11:46:55 +05:30
Travis Ralston
761fb6e1d5 Appease the linter 2021-07-29 16:01:26 -06:00
Travis Ralston
c322761abb Improve general style per design direction 2021-07-29 15:49:23 -06:00
Travis Ralston
fb89b45c06 Unify and improve download interactions
With help from Palid.

This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).

The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski
493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
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
Michael Telatynski
2114e854f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
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
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