Commit Graph
100 Commits
Author SHA1 Message Date
Michael TelatynskiandGitHub b91ece1bcf Merge pull request #6828 from matrix-org/t3chguy/fix/a11y-label 2021-09-17 12:27:28 +01:00
Michael Telatynski 8c08293654 Fix reactions aria-label not being a string and thus being read as [Object object] 2021-09-17 11:36:22 +01:00
Michael TelatynskiandGitHub cf8100ad17 Merge pull request #6818 from matrix-org/t3chguy/fix/19064 2021-09-17 10:29:45 +01:00
Michael Telatynski af42a31794 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-17 10:22:57 +01:00
Michael Telatynski 68768002bb use more generic room type instead of boolean flag 2021-09-17 10:19:30 +01:00
Michael TelatynskiandGitHub 6e508e6a9a Merge pull request #6821 from matrix-org/t3chguy/fix/npe1 2021-09-17 10:17:19 +01:00
Michael Telatynski 80caa5646f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/npe1 2021-09-17 09:39:55 +01:00
Michael Telatynski 1e91191fa2 Fix missing null guard in space hierarchy pagination 2021-09-16 14:28:55 +01:00
Michael Telatynski 1e04dfa11d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-16 11:46:00 +01:00
Michael TelatynskiandGitHub 3da02f1546 Merge pull request #6819 from matrix-org/t3chguy/fix/build1 2021-09-16 11:33:20 +01:00
Michael Telatynski ec4650c60d Fix abuse of MainSplit in LegacyCommunityPreview 2021-09-16 11:23:41 +01:00
Michael Telatynski febd3df5ac Fix MainSplit IProps 2021-09-16 11:22:55 +01:00
Michael Telatynski 28bc8010a7 Say Joining space instead of Joining room where we know its a space 2021-09-16 11:20:01 +01:00
Michael Telatynski 4bb9eeb7a5 Convert RoomPreviewBar to Typescript 2021-09-16 11:09:58 +01:00
Michael TelatynskiandGitHub fd24511d42 Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Michael TelatynskiandGitHub 3b39ba6590 Merge pull request #6787 from SimonBrandner/task/structures-ts 2021-09-16 10:45:12 +01:00
Michael TelatynskiandGitHub bbc8e4da23 Merge pull request #6594 from matrix-org/t3chguy/fix/18088 2021-09-16 10:16:33 +01:00
Michael Telatynski b052d0730d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858 2021-09-16 10:15:43 +01:00
Michael TelatynskiandGitHub edf7764a3e Merge pull request #6319 from SimonBrandner/fix/user-info-dm/17877 2021-09-16 10:09:22 +01:00
Michael Telatynski e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Michael TelatynskiandGitHub 8921e25815 Merge pull request #6804 from matrix-org/t3chguy/fix/18481 2021-09-16 10:02:06 +01:00
Michael Telatynski b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski c786ef9f69 Fix space keyboard shortcuts conflicting with native zoom shortcuts 2021-09-14 16:02:14 +01:00
Michael TelatynskiandGitHub 9928079b82 Merge pull request #6797 from matrix-org/t3chguy/fix/19025 2021-09-14 15:56:20 +01:00
Michael TelatynskiandGitHub 1298fddebf Merge pull request #6800 from matrix-org/t3chguy/fix/18694
Simplify Space Panel layout and fix some edge cases
2021-09-14 15:55:44 +01:00
Michael TelatynskiandGitHub 6900fb79c2 Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Michael TelatynskiandGitHub 4a4c68b71c Merge pull request #6803 from matrix-org/t3chguy/fix/19034
Stop spinner on space preview if the join fails
2021-09-14 15:52:37 +01:00
919270ff0c Update src/stores/SpaceStore.tsx
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-09-14 15:50:51 +01:00
Michael Telatynski 60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Michael Telatynski 6672be91a1 Simplify Space Panel layout 2021-09-14 15:00:44 +01:00
Michael Telatynski f59baf1efb Tidy some types 2021-09-14 14:41:55 +01:00
Michael Telatynski 5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +01:00
Michael Telatynski e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Michael TelatynskiandGitHub ff39f480bc Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Michael Telatynski 87c9551507 Fix edge cases around joining new room which does not belong to active space 2021-09-14 12:49:18 +01:00
Michael TelatynskiandGitHub 0ee77e2d17 Merge pull request #6791 from matrix-org/t3chguy/fix/19003 2021-09-14 11:48:27 +01:00
Michael Telatynski 3c44969645 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-09-14 11:42:51 +01:00
Michael TelatynskiandGitHub be58a5e623 Merge pull request #6790 from matrix-org/t3chguy/fix/19007
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
2021-09-14 09:07:37 +01:00
Michael TelatynskiandGitHub 73a2225b10 Merge pull request #6792 from matrix-org/t3chguy/fix/19005
Fix automatic field population in space create menu not validating
2021-09-14 09:06:49 +01:00
Michael Telatynski 4a470e4341 Fix automatic field population in space create menu not validating 2021-09-13 17:15:52 +01:00
Michael Telatynski b6b099f6c8 Fix broken edge case with public space creation with no alias 2021-09-13 16:27:46 +01:00
Michael TelatynskiandGitHub e3a2c25421 Merge pull request #6786 from aaronraimist/fix18990 2021-09-13 14:11:36 +01:00
Michael Telatynski d75820a491 Hide mute/unmute button in UserInfo for Spaces as it makes no sense 2021-09-13 13:49:24 +01:00
Michael TelatynskiandGitHub ac0ba2d597 Merge pull request #6779 from matrix-org/t3chguy/fix/18908 2021-09-10 19:32:03 +01:00
Michael Telatynski ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Michael TelatynskiandGitHub 2f3b51139f Merge pull request #6780 from matrix-org/t3chguy/fix-types 2021-09-10 15:41:54 +01:00
Michael Telatynski d15ea932f6 fix unrelated issues 2021-09-10 15:35:35 +01:00
Michael Telatynski d46181385c Also default to PL invite=50 for private space creation 2021-09-10 13:05:04 +01:00
Michael Telatynski 6fcd930d0b fix unrelated issues 2021-09-10 11:54:25 +01:00
Michael Telatynski 41676b4a9b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891 2021-09-10 11:09:52 +01:00
Michael Telatynski 9a8a453827 tidy 2021-09-10 11:09:46 +01:00
Michael Telatynski 554c8ba74e delint 2021-09-10 11:01:01 +01:00
Michael Telatynski aff9be6120 Surface unsent messages on the sublist notification badge too 2021-09-10 10:58:13 +01:00
Michael Telatynski 456de355f9 fix e2e test 2021-09-10 10:48:47 +01:00
Michael TelatynskiandGitHub cd73bbf2f5 Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski 80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski 41118b418f fix expected number of radios 2021-09-10 09:52:54 +01:00
Michael Telatynski 2a8e8b93aa add comment 2021-09-10 09:48:46 +01:00
Michael Telatynski 558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Michael Telatynski bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Michael TelatynskiandGitHub 8cf891f9a4 Merge pull request #6770 from matrix-org/t3chguy/fix/18951
Use cursor:pointer on space panel buttons
2021-09-09 13:53:42 +01:00
Michael Telatynski 329bc8a89e Move unsent event badge handling into RoomNotificationState 2021-09-09 13:14:05 +01:00
Michael Telatynski 82cd7acdae Use cursor:pointer on space panel buttons 2021-09-09 11:40:43 +01:00
Michael Telatynski 630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-09-09 11:01:11 +01:00
Michael Telatynski 2eb64de508 Tweak edge case behaviour 2021-09-09 10:54:31 +01:00
Michael Telatynski fa60b24a9f fix react error in console 2021-09-09 10:50:12 +01:00
Michael TelatynskiandGitHub e17a5328d2 Merge pull request #6764 from matrix-org/t3chguy/fix/18677 2021-09-08 23:00:01 +01:00
Michael TelatynskiandGitHub d00c4d042b Merge pull request #6760 from matrix-org/t3chguy/fix/18528
Improve tooltips on space quick actions and explore button
2021-09-08 22:59:52 +01:00
Michael TelatynskiandGitHub 086d36beb1 Merge pull request #6765 from matrix-org/t3chguy/fix/17018
Make space members and user info behave more expectedly
2021-09-08 22:59:44 +01:00
Michael Telatynski 22c5902ae4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18677 2021-09-08 17:21:42 +01:00
Michael Telatynski 17e0a4b3d7 iterate PR based on feedback 2021-09-08 17:14:51 +01:00
Michael TelatynskiandGitHub 2c134b2dfd Merge pull request #6763 from matrix-org/t3chguy/ts1234
Improve types based on new TS in js-sdk
2021-09-08 17:09:17 +01:00
Michael Telatynski 600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
 Conflicts:
	src/i18n/strings/en_EN.json
2021-09-08 15:38:13 +01:00
Michael Telatynski 29b4ba6675 Use new SCSS vars 2021-09-08 15:30:19 +01:00
Michael Telatynski 911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Michael TelatynskiandGitHub 2538f8b1e9 Merge pull request #6747 from matrix-org/t3chguy/fix/18597 2021-09-08 14:37:27 +01:00
Michael Telatynski d4bac4752d Make space members and user info behave more expectedly 2021-09-08 13:34:26 +01:00
Michael Telatynski 83912daced Improve the upgrade for restricted user experience 2021-09-08 13:16:31 +01:00
Michael Telatynski 1da65d459c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18597 2021-09-08 12:57:37 +01:00
Michael TelatynskiandGitHub 0d0eea392c Merge pull request #6746 from matrix-org/t3chguy/fix/10935 2021-09-08 12:55:45 +01:00
Michael TelatynskiandGitHub 075b0613a5 Merge pull request #6761 from matrix-org/t3chguy/fix/18781
Fix regressed tab view buttons in space update toast
2021-09-08 12:55:36 +01:00
Michael Telatynski 467fb55e8e improve typing & comment 2021-09-08 12:53:13 +01:00
Michael Telatynski f3abb13dc9 Convert crypto/verification/* to Typescript 2021-09-08 12:34:44 +01:00
Michael Telatynski 0caca49ec0 Fix regressed tab view buttons in space update toast 2021-09-08 10:26:23 +01:00
Michael Telatynski 8bd1f384b9 Improve tooltips on space quick actions and explore button 2021-09-08 10:16:20 +01:00
Michael TelatynskiandGitHub 92ad81ed76 Merge pull request #6744 from matrix-org/t3chguy/fix/18892 2021-09-08 10:04:07 +01:00
Michael TelatynskiandGitHub 9d1e6dc18a Merge pull request #6756 from matrix-org/t3chguy/ts/123
fix typing of olmVersion in settings
2021-09-07 14:27:54 +01:00
Michael Telatynski 93af6aafce fix typing of olmVersion in settings 2021-09-07 13:28:51 +01:00
Michael Telatynski f4f4686270 tidy up code 2021-09-07 12:07:18 +01:00
Michael Telatynski 6cbdb58341 add comment 2021-09-07 12:01:18 +01:00
Michael TelatynskiandGitHub 51f1d21464 Merge pull request #6748 from matrix-org/t3chguy/fix/18764
Fix Space creation wizard go to my first room button behaviour
2021-09-07 11:08:53 +01:00
Michael Telatynski 8cab86e58b fix typing of firstRoomId 2021-09-07 11:02:38 +01:00
Michael TelatynskiandGitHub a4c0fa8046 Merge pull request #6745 from matrix-org/t3chguy/fix/18796
Prefer matrix.to alias links over room id in spaces & share
2021-09-06 16:53:11 +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 68836b9c68 hide no-op m.room.encryption events and better word param changes 2021-09-06 14:59:30 +01:00
Michael Telatynski c915288044 Respect m.space.parent relations if they hold valid permissions 2021-09-06 14:34:06 +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 TelatynskiandGitHub 6801ec76a7 Merge pull request #6738 from matrix-org/t3chguy/fix/18780 2021-09-06 11:40:55 +01:00
Michael Telatynski fc84682c81 i18n 2021-09-06 11:35:02 +01:00