mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
34374 commits 206 branches 547 tags 603 MiB
Commit graph

34374 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston
e696a1d5dc Update membership reason handling, including leave reason displaying 
Incorporates ideas from https://github.com/matrix-org/matrix-react-sdk/pull/6198
 2021-06-23 10:31:08 -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
Šimon Brandner
b7a821a9e4
.tsx can also be tests 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 16:00:13 +02:00
Šimon Brandner
0df6200dd0
Convert MemberList-test to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 16:00:13 +02:00
Šimon Brandner
99c442cea7
Convert MemberList to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 16:00:06 +02:00
Michael Telatynski
a8dfc4488f Convert more of js-sdk crypto and fix underscored field accesses 2021-06-23 14:47:24 +01:00
Michael Telatynski
73b7610228 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5.1 2021-06-23 13:05:21 +01:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +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
Germain Souquet
a6367c0796 Reintroduce LiveRecording components for maintenance reasons 2021-06-23 09:33:38 +01: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