mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 10:41:36 +03:00
Code Issues Projects Releases Packages Wiki Activity
35821 commits 219 branches 562 tags 474 MiB
Commit graph

11071 commits

Author SHA1 Message Date
Michael Telatynski
5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx
 2021-07-23 10:42:46 +01:00
Michael Telatynski
f5630acea7 Adhere to better eslint rules 2021-07-23 10:35:10 +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
cd77b9f1af merge two opposing if statements 2021-07-23 08:55:16 +01:00
Michael Telatynski
010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +01:00
Germain
aac01171b2
Merge pull request #6448 from matrix-org/gsouquet/fix-18162 
Make images fit inside message bubble
 2021-07-23 08:10:37 +01:00
Travis Ralston
c427612c24 de-dupe audio player 
Fixes https://github.com/vector-im/element-web/issues/18161
 2021-07-22 12:14:38 -06:00
Travis Ralston
e1bb04f45a Remove answered TODOs 2021-07-22 09:27:38 -06:00
Travis Ralston
eec63574e6 Move src/voice to src/audio for better naming 
Many of these files are used by Audio and Voice messages.

Fixes https://github.com/vector-im/element-web/issues/18131
 2021-07-22 09:26:26 -06:00
Germain
248a758ad6
Merge pull request #6439 from matrix-org/gsouquet/fix-18142 
Fix avatar obstructing membership and state changes
 2021-07-22 16:16:33 +01:00
Germain Souquet
0768f03097 Migrate ViewSourceEvent to TypeScript 2021-07-22 17:11:23 +02:00
Germain Souquet
472ead41fb Make images fit inside message bubble 2021-07-22 16:05:09 +02:00
Robin Townsend
5d4b293e0a Add comment about modulo operator 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:56:26 -04:00
Robin Townsend
9e0720a6c4 Rename zoom anchor variables for clarity 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:48:56 -04:00
Robin Townsend
875b46bacb Don't zoom images when the cursor isn't over the image 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:46:29 -04:00
Robin Townsend
b99a6a8d54 Use typeof to check for presence of parameters 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-22 09:41:39 -04:00
Robin Townsend
3bf742f7aa Merge branch 'develop' into zoom-to-cursor 2021-07-22 09:39:52 -04:00
Germain Souquet
552770c15a Remove excessive padding after url previews 2021-07-22 14:24:49 +02: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
Travis Ralston
0bb0c8105d
Merge pull request #6434 from matrix-org/travis/voice-messages/upload-failed 
Handle upload errors in voice messages
 2021-07-22 03:40:26 -06:00
Travis Ralston
98472b4fce
Merge pull request #6433 from matrix-org/travis/voice-messages/errors 
Render error state for audio components
 2021-07-22 03:39:47 -06:00
Travis Ralston
b9b37f59f1
Merge pull request #6432 from matrix-org/travis/voice-messages/colours 
Clean up visual style of files and voice messages
 2021-07-22 03:39:29 -06:00
Germain Souquet
8da2d0fe72 Fix avatar obstructing membership and state changes 2021-07-22 11:31:46 +02:00
Šimon Brandner
f4287fc3ab
Simplifie sidebar showing logic 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 11:16:16 +02:00
Šimon Brandner
33abe83dad
Always hide all feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 10:39:00 +02:00
Michael Telatynski
e665e38b7b
Merge pull request #6413 from SimonBrandner/ts/address-stuff 2021-07-22 09:35:40 +01:00
Michael Telatynski
9219661d7c
Merge pull request #5389 from matrix-org/t3chguy/fix/15536 
Fix onPaste handler to work with copying files from Finder
 2021-07-22 09:22:55 +01:00
Šimon Brandner
89983820df
Fix dumb typo 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:49:37 +02:00
Šimon Brandner
6429b3c8bd
Only show toast about camera in video calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:23:37 +02:00
Šimon Brandner
37335b2c79
Show toast even for non-presenters 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:19:47 +02:00
Šimon Brandner
1b9b5fd048
Fix sidebar hiding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-22 09:14:44 +02:00
Jaiwanth
76040c652c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-07-22 08:25:24 +05:30
Travis Ralston
079e75aae9 Handle upload errors in voice messages 
Fixes https://github.com/vector-im/element-web/issues/17148

Mostly adding some try/catch blocks, and a generic dialog.
 2021-07-21 16:11:10 -06:00
Travis Ralston
3d72b9e227 Render error state for audio components 
Fixes https://github.com/vector-im/element-web/issues/17148

Both `AudioPlayer` and `RecordingPlayback` got a fragment added to their DOM structure, to incorporate the rarely seen error message below it. Additionally, a missing try/catch was added to the `Playback` class to handle uncaught decoding issues.

The similarity of the components is tracked in https://github.com/vector-im/element-web/issues/18161
 2021-07-21 15:47:52 -06:00
Travis Ralston
3023fda497 Make MFileBody inherit the MediaBody styles 2021-07-21 14:46:25 -06:00
Šimon Brandner
c2aada6aa7
Clearer avatar sizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 21:27:07 +02:00
Travis Ralston
36d4eb85e1 Restore 'use default' naming on room notifications 
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
 2021-07-21 13:01:19 -06:00
Šimon Brandner
34f3e62f72
Types! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 20:48:50 +02:00
Šimon Brandner
9891eddcbd
Rename to toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:28:44 +02:00
Šimon Brandner
ddd4b4bc12
Show a "Your camera is turned off" toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:22:47 +02:00
Šimon Brandner
3fac4adfc7
Fix feed sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 18:14:21 +02:00
Šimon Brandner
dc7f6d8286
Show sidebar in PiP mode 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 17:45:21 +02:00
Šimon Brandner
0a8067506f
Adjust hiding local feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 17:12:27 +02:00
Šimon Brandner
337664a1b4
Update sidebar behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:34:21 +02:00
Šimon Brandner
74649f1f92
Correct feed ordering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:21:52 +02:00
Šimon Brandner
2014517173
Always show screensharing feed as primary 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:20:09 +02:00
Germain
80e64601a9
Merge pull request #6427 from matrix-org/gsouquet/fix-18120 
Improve new layout switcher UI
 2021-07-21 15:11:58 +01:00
Šimon Brandner
51cf426179
Update the toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 16:08:18 +02:00
Travis Ralston
34b8870a95
Merge pull request #6417 from matrix-org/travis/voice-messages/play-1 
Play only one audio file at a time
 2021-07-21 07:58:46 -06:00
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02: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
Germain Souquet
c155382445 Improve new layout switcher UI 2021-07-21 14:55:30 +02:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +01: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
a58edcb241 tweak copy 2021-07-21 10:43:12 +01:00
Germain
b31b8f1b41
Remove old container sizing comment 
Co-authored-by: James Salter <jamess@element.io>
 2021-07-21 09:13:12 +01:00
Germain Souquet
a7cd5fc49b Shift thumbnail dislay to use object-fit to preserve aspect-ratio 2021-07-21 10:03:10 +02:00
Germain Souquet
794c49c5db Migrate MStickerBody to TypeScript 2021-07-21 09:52:09 +02:00
Germain Souquet
54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
Robin Townsend
0497e0864f Fix types 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 02:42:30 -04:00
Robin Townsend
3911666c52 Zoom images to where the cursor points 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-21 02:25:34 -04:00
Travis Ralston
45f9f3e13e Name functions better 2021-07-20 23:34:27 -06:00
Travis Ralston
a759d61ba0 Play only one audio file at a time 
Fixes https://github.com/vector-im/element-web/issues/17439
 2021-07-20 23:28:07 -06:00
Šimon Brandner
862932cce5
Don't use require 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 18:48:18 +02:00
Germain Souquet
efce2d16f1 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 18:43:08 +02:00
Germain
745a8d3860
Explain isSmall proper for CountryDropdown 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-20 17:18:33 +01:00
Šimon Brandner
9fb872cade
Sort feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:34:47 +02:00
Dariusz Niemczyk
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition 
* develop: (141 commits)
  delint
  Doc some values
  Remove useless image reference
  Revert accidental renaming of dispatcherRef
  Fix event highlighthing
  Move some code around for clarity
  Constrain emoji skins type even further
  Delint
  i18n irc and fix lint from merge conflict
  Remove unwanted coma in EventTile
  fix three lints
  lint fix
  not sure how these happened :/
  remove unused prop
  Update eslint-plugin-matrix-org
  Fix placeholder centering
  Make emoji skins type more specific
  Rename some variables since their purpose has changed
  Conform to new react and typescript eslint rules
  Apply code review suggestions
  ...
 2021-07-20 17:33:05 +02:00
Šimon Brandner
cfaf4b8078
Correct sidebar behaviour when muting local video 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 17:08:17 +02:00
Travis Ralston
7892539a9b delint 2021-07-20 09:03:26 -06:00
Šimon Brandner
c7a28491ca
Correct sidebar toggle behaviour 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:58:44 +02:00
Travis Ralston
5994111e5d Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download 2021-07-20 08:55:53 -06:00
Travis Ralston
32d8da2c74 Remove useless image reference 2021-07-20 08:52:55 -06:00
Šimon Brandner
690905d01e
Show sidebar button only when screen-sharing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:51:47 +02:00
Šimon Brandner
3751f04cef
Add "You are presenting toast" 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:17:07 +02:00
Šimon Brandner
0a282b587b
Reorder buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:07:27 +02:00
Šimon Brandner
fadb13e9fb
Center all buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 16:02:02 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-20 15:48:25 +02:00
Michael Telatynski
ad50d23cc2
Revert accidental renaming of dispatcherRef 2021-07-20 13:56:49 +01:00
David Baker
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile 
Add VoIP event tiles
 2021-07-20 13:31:53 +01:00
Michael Telatynski
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Šimon Brandner
6491a00645
Add some types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:47:07 +02:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:24:05 +02:00
Šimon Brandner
6cb1c5d918
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:20:30 +02: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
Šimon Brandner
c3399b110d
Fix setTimeout retrun type? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:48:38 +02:00
Šimon Brandner
333608c4c4
sdk.getComponent shall die 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:42:21 +02:00
Šimon Brandner
73187156d4
Disable eslint line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:38:14 +02:00
Šimon Brandner
b1f4ba28d7
Merge remote-tracking branch 'upstream/develop' into ts/address-stuff 2021-07-20 12:31:18 +02:00
Šimon Brandner
3cb7a6ab78
Improve more typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:30:41 +02:00
Šimon Brandner
1fc5138cfe
Convert AppPermission to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:27:20 +02:00
Michael Telatynski
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint 2021-07-20 11:23:36 +01:00
Germain Souquet
596fb774e3 Remove sdk.getComponent instructions 2021-07-20 12:22:32 +02:00
Michael Telatynski
b94886a291 i18n irc and fix lint from merge conflict 2021-07-20 11:18:27 +01:00
Šimon Brandner
48949af961
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:16:33 +02:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Germain Souquet
e38682d75c Remove unwanted coma in EventTile 2021-07-20 12:05:18 +02:00
Šimon Brandner
a747bbbae7
Convert AddressPickerDialog to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:08 +02:00
Šimon Brandner
156901ce62
Convert AddressTile to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:08 +02:00