Commit Graph

11567 Commits

Author SHA1 Message Date
Michael Telatynski b6b099f6c8 Fix broken edge case with public space creation with no alias 2021-09-13 16:27:46 +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
Germain 1a4859ede8 Merge pull request #6727 from SimonBrandner/task/i-hate-my-code 2021-09-10 16:14:24 +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 cd73bbf2f5 Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +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
Germain d475b7f1ea Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00
Travis Ralston a6d2bb5e6c Merge pull request #6693 from SimonBrandner/fix/guest/18776
Render guest settings only in public rooms/spaces
2021-09-09 10:42:38 -06:00
Travis Ralston bdb29e96fa Merge pull request #6766 from matrix-org/travis/measure-encryption-perf
Add config option to turn on in-room event sending timing metrics
2021-09-09 10:38:15 -06:00
Germain Souquet 07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00
Germain Souquet aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +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 Telatynski e17a5328d2 Merge pull request #6764 from matrix-org/t3chguy/fix/18677 2021-09-08 23:00:01 +01:00
Michael Telatynski 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 Telatynski 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
Travis Ralston 21e33362e5 Add config option to turn on in-room event sending timing metrics
This is intended to be hooked up to an external system. 

Due to the extra events and metadata concerns, this is only available if turned on from the config.

See `sendTimePerformanceMetrics.ts` for event schemas.
2021-09-08 11:28:19 -06: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 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 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 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 8bd1f384b9 Improve tooltips on space quick actions and explore button 2021-09-08 10:16:20 +01:00
Michael Telatynski 92ad81ed76 Merge pull request #6744 from matrix-org/t3chguy/fix/18892 2021-09-08 10:04:07 +01:00
Germain Souquet bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet 646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
Germain Souquet 2d45bfb976 Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-07 15:39:32 +01:00
Michael Telatynski 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
Germain 42f5efaa28 Merge pull request #6750 from matrix-org/gsouquet/migrate-messageactionbar 2021-09-07 14:11:20 +01:00
Michael Telatynski 93af6aafce fix typing of olmVersion in settings 2021-09-07 13:28:51 +01:00
Michael Telatynski 6cbdb58341 add comment 2021-09-07 12:01:18 +01:00
Germain Souquet 9cbf8717e2 Add comments for missing types in MessageActionBar 2021-09-07 09:12:38 +01:00
Travis Ralston 78617c01a8 Merge pull request #6742 from matrix-org/travis/fix-oidc-dialog
Convert widget OIDC exchange dialog to TS (fixing it)
2021-09-06 22:43:27 -06:00
Travis Ralston 615a432eda Add missing type 2021-09-06 22:37:21 -06:00
Travis Ralston 329292eb9b Revert "Revert "Create narrow mode for Composer"" 2021-09-06 22:11:35 -06:00
Travis Ralston 945181fe39 Revert "Create narrow mode for Composer" 2021-09-06 22:08:50 -06:00
Germain 59de3c96a2 Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533 2021-09-07 05:07:00 +01:00
Germain Souquet 01d61786f1 Update return type for getThread prop 2021-09-06 16:18:35 +01:00
Germain Souquet 4b96a81bbe Migrate MessageActionBar to TypeScript 2021-09-06 16:15:50 +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 e252c5553e Prefer matrix.to alias links over room id in spaces & share 2021-09-06 11:27:15 +01:00
Michael Telatynski 898de13ca7 Consolidate roving tab index controls in the space panel buttons with dnd 2021-09-06 08:54:08 +01:00
Germain Souquet f549c1d52b Code style updates 2021-09-06 08:14:49 +01:00
Travis Ralston b9001c3e11 Convert widget OIDC exchange dialog to TS (fixing it)
Fixes https://github.com/vector-im/element-web/issues/15631

The `super` call was the primary issue, but a log line in the `onPermissionSelection` was also using the wrong property. Both issues have been fixed as part of the TS conversion in order to make the thing compile, conveniently fixing the bugs.
2021-09-03 22:31:29 -06:00