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

2080 commits

Author SHA1 Message Date
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01: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
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
Michael Telatynski
e665e38b7b
Merge pull request #6413 from SimonBrandner/ts/address-stuff 2021-07-22 09:35:40 +01:00
Šimon Brandner
34f3e62f72
Types! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-21 20:48:50 +02:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +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
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
Š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
Michael Telatynski
ad50d23cc2
Revert accidental renaming of dispatcherRef 2021-07-20 13:56:49 +01: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
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
Š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
Š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
Šimon Brandner
28871ee07d
Convert AddressSelector to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:07 +02:00
Šimon Brandner
8bbd91547d
Convert ActionButton to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:01:02 +02:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01: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
David Baker
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox 
Fix bug where 'other homeserver' would unfocus
 2021-07-19 10:09:03 +01:00
Michael Telatynski
4ef4f49e90
Merge pull request #6392 from SimonBrandner/task/cleanup-replies 2021-07-18 13:37:44 +01:00
Šimon Brandner
e439d2e911
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:29:18 +02:00
Šimon Brandner
03ce480066
Convert ReplyThread to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 15:06:21 +02:00
Šimon Brandner
6d4ae6481a
Add alt 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:21:46 +02:00
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:13:51 +02:00
Šimon Brandner
bb643010a9
Remove title 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-17 08:10:34 +02:00
Travis Ralston
e3e7d945fd Remove useless spread operator 2021-07-16 23:51:44 -06:00
Travis Ralston
942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
David Baker
45fb0e927f Mention nested labels in comments 2021-07-16 22:35:53 +01:00
David Baker
f9b45677d6 Fix bug where 'other homeserver' would unfocus 
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.

Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
 2021-07-16 22:27:31 +01:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:43:33 +02: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
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
Michael Telatynski
57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1 2021-07-14 17:19:07 +01:00
Germain Souquet
51c5094ca4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 17:47:22 +02: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
Germain Souquet
789d078814 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 16:26:22 +02:00
Travis Ralston
9b6495903c Use TileShape enum more universally 2021-07-13 18:35:56 -06:00