Commit Graph

34717 Commits (3a0408a4cc3c66a372b4c44f0fe113ea3cc56b66)

Author SHA1 Message Date
Germain 35b8f79fbd
Merge pull request #6228 from matrix-org/gsouquet/fix-17673 2021-06-23 09:08:43 +01:00
Germain bca19783fa
Merge pull request #6246 from matrix-org/gsouquet/fix-dependencies-mismatch
Fix dependency and lockfile mismatch
2021-06-23 09:03:15 +01:00
Germain Souquet 057f46ad9d fix dependency and lockfile mismatch 2021-06-23 08:44:48 +01:00
Šimon Brandner 9bceb40820
CallMediaHandler -> MediaDeviceHandler
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Aaron Raimist 9d723cd1b6
lint
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-22 22:48:04 -05:00
Aaron Raimist 38d0ab3c44
Do not honor string power levels
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-06-22 22:35:59 -05:00
Travis Ralston 759a4e796f
Merge pull request #6234 from SimonBrandner/fix/room-dir-click/13751
Improve room directory click behaviour
2021-06-22 19:44:20 -06:00
Michael Telatynski d5581f00cc
Merge pull request #6239 from matrix-org/t3chguy/fix/17605 2021-06-22 22:56:49 +01:00
Michael Telatynski 50a5c03730
Merge pull request #6151 from matrix-org/t3chguy/fix/17244 2021-06-22 22:52:33 +01:00
Michael Telatynski 2a3b92f7d7
Merge pull request #6244 from matrix-org/t3chguy/fix/17368
Hide communities invites and the community autocompleter when Spaces on
2021-06-22 22:50:28 +01:00
Michael Telatynski 9f20d6661d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
Michael Telatynski e4542e13d9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-22 22:42:59 +01:00
Michael Telatynski 24b03366a8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17368 2021-06-22 22:40:59 +01:00
Michael Telatynski bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski ffaa19ef2c fix typing 2021-06-22 22:27:12 +01:00
Michael Telatynski e0ac200e27 Iterate PR 2021-06-22 22:23:09 +01:00
Michael Telatynski 83296b7440 Fix typing 2021-06-22 22:19:01 +01:00
Michael Telatynski 9dc8493a5c Hide communities invites and the community autocompleter when Spaces Beta is enabled 2021-06-22 22:07:42 +01:00
Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Michael Telatynski 5dc542f189 Iterate PR 2021-06-22 22:01:18 +01:00
Travis Ralston c316eb841a
Merge pull request #6179 from aaronraimist/open-local-addresses
Open local addresses section by default when there are no existing local addresses
2021-06-22 14:48:02 -06:00
Michael Telatynski bbcd64263d
Merge pull request #6137 from matrix-org/t3chguy/fix/17282 2021-06-22 21:36:43 +01:00
Michael Telatynski d212175e63 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	yarn.lock
2021-06-22 21:29:52 +01:00
Michael Telatynski b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529 2021-06-22 21:28:51 +01:00
Michael Telatynski 49d20d2530 consolidate the two onRoomAccountData listeners 2021-06-22 21:22:30 +01:00
Michael Telatynski 99e3aea1e5 i18n and regen yarn lock 2021-06-22 21:17:33 +01:00
Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski 7948aa6181 Iterate PR, improve jsdoc and switch function style 2021-06-22 21:10:29 +01:00
Travis Ralston 1180741cc2
Merge pull request #6000 from robintown/event-tile-preview-fixes
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
Michael Telatynski cecf0ce299 Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript 2021-06-22 20:41:26 +01:00
Michael Telatynski 0be08b293b
Merge pull request #6233 from matrix-org/t3chguy/types/react 2021-06-22 18:22:25 +01:00
Michael Telatynski 6fd1dc7d18 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7 2021-06-22 18:09:24 +01:00
Michael Telatynski 47bddac0a6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react 2021-06-22 18:08:10 +01:00
Michael Telatynski d96d861983
Merge pull request #6242 from matrix-org/t3chguy/ts/fix
Fix type error in the SpaceStore
2021-06-22 18:08:00 +01:00
Michael Telatynski 42d33cf091 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react 2021-06-22 18:03:39 +01:00
Michael Telatynski cd04fb76dc Fix type error 2021-06-22 18:01:29 +01:00
Michael Telatynski 28c61cca27 Remove pinned resolution for @types/react to 16.x 2021-06-22 17:56:52 +01:00
Michael Telatynski 59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665 2021-06-22 17:46:57 +01:00
Michael Telatynski e0aa142db7
Merge pull request #6215 from matrix-org/t3chguy/ts/5 2021-06-22 17:41:29 +01:00
Michael Telatynski e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
 Conflicts:
	src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski 55292e8beb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/types/react 2021-06-22 17:34:05 +01:00
Michael Telatynski 59258585b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-22 17:28:19 +01:00
Michael Telatynski 4a66794236 update copy 2021-06-22 17:26:19 +01:00
Michael Telatynski a839d0f396 More typescript conversion 2021-06-22 17:23:13 +01:00
Michael Telatynski 6d92953311 Convert bunch of utils to TS 2021-06-22 17:22:38 +01:00
Germain cbfab29a5c
Merge pull request #6236 from matrix-org/gsouquet/bk-branch-matching
Fix branch matching for Buildkite
2021-06-22 16:44:15 +01:00
Germain Souquet b092686453 improve comment grammar 2021-06-22 16:14:01 +01:00
Germain Souquet fca2feaae8 make github env variable check first as it is new home for ci 2021-06-22 16:09:33 +01:00
Michael Telatynski 3c9cd938d0 remove spurious full stop 2021-06-22 15:29:53 +01:00
Germain 5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051 2021-06-22 15:07:04 +01:00