OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,185 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

34185 Commits (4993fc3e7a2a2de5522f10ae5fdbd27432a40df5)

Author SHA1 Message Date
Michael Telatynski 4993fc3e7a Fix edit history modal 
defining enums in ts module declarations sadly isn't magic
 2021-06-24 11:16:13 +01:00
Michael Telatynski 89231a4d35
Merge pull request #6255 from matrix-org/t3chguy/fix/17750 2021-06-24 09:18:45 +01:00
Michael Telatynski 0e51fcc761 Fix pinning event in a room which hasn't had events pinned in before 2021-06-23 21:12:25 +01:00
Travis Ralston e290fdaabc Update widget-api for https://github.com/matrix-org/matrix-react-sdk/pull/6178 2021-06-23 11:21:56 -06:00
Travis Ralston 9d07519214 Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop 2021-06-23 11:21:19 -06:00
Michael Telatynski ef2dcaea3d
Merge pull request #6250 from matrix-org/t3chguy/fix/16843 2021-06-23 16:22:26 +01:00
Michael Telatynski 5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
David Baker f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad 
Dial Pad UI bug fixes
 2021-06-23 11:41:41 +01:00
Michael Telatynski 1fe1288427
Merge pull request #6247 from SimonBrandner/feature/media-device-handler 2021-06-23 11:10:09 +01:00
Šimon Brandner 4ab9758b67
log -> warn 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 10:43:49 +02:00
Šimon Brandner 0e582c425c
Make this look nicer 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-23 10:42:19 +02:00
Šimon Brandner 1bef985d46
Remove emmiting that isn't useful for us now 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 10:39:10 +02:00
Šimon Brandner 95624b3fa6
Add some docs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 10:37:15 +02:00
Šimon Brandner 6c9e0e54e9
Iterate PR 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 10:27:51 +02:00
Šimon Brandner 58151d71c5
Handle mid-call output changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 10:09:53 +02:00
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
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 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