imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
62580 commits 222 branches 563 tags 470 MiB
Commit graph

194 commits

Author SHA1 Message Date
Michael Telatynski
8cab86e58b fix typing of firstRoomId 2021-09-07 11:02:38 +01:00
Michael Telatynski
43868c4539 Fix Space creation wizard go to my first room button behaviour 2021-09-06 15:17:09 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Michael Telatynski
f7e491f713
Merge pull request #6729 from matrix-org/t3chguy/fix/18762 
Fix explore rooms button not working during space creation wizard
 2021-09-03 16:18:25 +01:00
Michael Telatynski
cc40df298b Improve form handling in and around space creation 2021-09-03 13:34:09 +01:00
Michael Telatynski
aed835554c Fix explore rooms button not working during space creation wizard 2021-09-02 12:30:49 +01:00
Michael Telatynski
daba23d1bf Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18760 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
 2021-09-02 12:10:20 +01:00
Michael Telatynski
030fa17a66 When creating private spaces, make the initial rooms restricted if supported 2021-09-01 12:47:43 +01:00
Michael Telatynski
d3ba33172b Only make the initial space rooms suggested by default 2021-08-31 16:42:21 +01:00
Michael Telatynski
0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json
 2021-08-12 11:41:03 +01:00
Michael Telatynski
cbd6f2de44 Tweak copy on space preview 2021-08-11 15:03:38 +01: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
Michael Telatynski
a9d7d01014 Null guard space inviter to prevent the app exploding 2021-08-05 12:30:22 +01:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
Michael Telatynski
9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-07-30 11:34:52 +01:00
Michael Telatynski
259627fba2 Clean up SpaceHierarchy 2021-07-30 11:01:49 +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
ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski
a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +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
70d8378a66 delint 2021-07-23 18:50:25 +01:00
Michael Telatynski
dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski
1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +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
010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +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
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
Michael Telatynski
90d380c8ae Cache value of feature_spaces* flags as they cause page refresh so are immutable 2021-07-15 08:26:49 +01:00
Michael Telatynski
89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Michael Telatynski
4c42313f99 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-01 12:47:34 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski
88cd5aeaf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/StyledRadioGroup.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-06-29 12:29:45 +01:00
Michael Telatynski
1c8e24023e Fix space preview for when user cannot join the space 2021-06-25 11:00:27 +01:00
Germain Souquet
d22617c422 More specific type definition and adhering to code style better 2021-06-18 12:44:15 +01:00
Germain
d3101b5ce4
Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-15 00:02:49 +01:00
Germain Souquet
de414cd0a6 Migrate UserSettingsDialog to TypeScript 2021-06-14 23:42:36 +01:00
Travis Ralston
2eafe132b8 Move various createRoom types to the js-sdk 2021-06-14 13:31:58 -06:00
Michael Telatynski
f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
Michael Telatynski
e525d046c7 remove outdated TODO 2021-06-01 10:49:19 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Michael Telatynski
e984a4f0cd rejig the code to make types happy 2021-05-20 20:12:28 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674 
Improve Spaces "Just Me" wizard
 2021-05-14 10:58:55 +01:00
Michael Telatynski
e1df62472d remove unused imports and run i18n 2021-05-14 10:48:24 +01:00
Michael Telatynski
2f28de8472 Show alternative button during space creation wizard if user opted to create 0 rooms 2021-05-13 13:22:50 +01:00
Michael Telatynski
423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Michael Telatynski
654ce95c74 Progress from adding existing rooms to new space upon completion 2021-05-12 17:31:55 +01:00