Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
36,165 Commits 1 Branch 646 Tags
efc63f1f7709b6021a8a0fbc53c7e1cea27b9ffa
Commit Graph

1745 Commits

Author SHA1 Message Date
David Baker 28f5dc483b Update eslint plugin & fix silly indenting 
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
 2021-08-03 17:07:37 +01:00
Germain Souquet 54c685bfa8 Migrate LogoutDialog to TypeScript 2021-08-03 13:52:46 +02:00
Germain Souquet 81b45f8aa9 Make defaultProps a static property of LogoutDialog 2021-08-03 13:44:14 +02:00
Michael Telatynski 94af6db201 Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski 3ee8f607c0 Switch dropdown out for radio interaction when leaving space 2021-07-29 15:50:18 +01:00
Michael Telatynski 251b6eb04e update copy 2021-07-29 15:30:49 +01:00
Michael Telatynski af851f7f44 fix merge conflict resolution issue 2021-07-29 15:24:42 +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 08c883ed07 Update all copy of subspace to space 2021-07-29 13:02:07 +01:00
Michael Telatynski 40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski 5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01:00
Michael Telatynski 6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski 52e50863f8 Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:39:59 +01:00
Michael Telatynski 39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Michael Telatynski 737aa1c55d delint 2021-07-26 12:41:52 +01:00
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
Michael Telatynski 64e3c72f65 Fix bad import due to naming clash 2021-07-23 18:51:27 +01:00
Michael Telatynski 70d8378a66 delint 2021-07-23 18:50:25 +01:00
Michael Telatynski 05a9023bac delint and tidy code 2021-07-23 18:31:31 +01:00
Michael Telatynski 1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
 2021-07-23 18:28:21 +01:00
Michael Telatynski b89434fcbc avoid abusing spans because you're too lazy to give things a class 2021-07-23 16:03:15 +01:00
Michael Telatynski 7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Michael Telatynski 9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +01:00
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 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
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 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 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
Michael Telatynski 880dc26847 don't force height if the height can't change (no children edge) 2021-07-21 10:39:04 +01:00
Michael Telatynski bc87dc3c56 remove duplicated content 2021-07-21 10:17:09 +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
Š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 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 48949af961 Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 12:16:33 +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
Michael Telatynski 9fe9534e01 fix three lints 2021-07-20 10:33:52 +01: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 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
Michael Telatynski 50b6c5c557 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-07-15 10:19:04 +01: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