nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
47,810 Commits 258 Branches 582 Tags
caef3c1921b6db19de7ac6c7e88cf7657ea456be
Commit Graph

18378 Commits

Author SHA1 Message Date
Travis Ralston
9f2eba4351 Fix class identifiers 2021-06-24 11:38:35 -06:00
Travis Ralston
50127da227 Replace MAudioBody with a voice message body as a template 2021-06-24 11:38:35 -06:00
Jaiwanth
91b8b2ac5a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-24 22:54:40 +05:30
Robin Townsend
70bf47ced4 Merge branch 't3chguy/ts/8' into watch-show-timestamps 2021-06-24 12:53:37 -04:00
Germain Souquet
27ee7c5836 Move backdrop filter to a canvas based solution 2021-06-24 17:51:11 +01:00
Michael Telatynski
8f6d31b73c Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile 2021-06-24 17:05:16 +01:00
Michael Telatynski
3d6c6cea89 Fix AutoHideScrollbar typing 2021-06-24 16:43:12 +01:00
Michael Telatynski
c5a1da49ce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/AutoHideScrollbar.tsx
 2021-06-24 16:42:03 +01:00
Michael Telatynski
d83a92959b Fix UserInfo not working when rendered without a room 2021-06-24 16:30:40 +01:00
Robin Townsend
d466d1a7ee Add alwaysShowTimestamps and others to RoomView setting watchers 
to allow them to update on the fly. This also modifies the setting
watchers to avoid an unnecessary settings lookup.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-24 11:28:16 -04:00
Šimon Brandner
430ae0e79f Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Šimon Brandner
dc2f71bee6 Even more fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:55:44 +02:00
Šimon Brandner
b065f6d1a4 Remove sdk... 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:48:36 +02:00
Šimon Brandner
f0dbc974fa Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile 2021-06-24 16:44:13 +02:00
Šimon Brandner
c0a1127cb7 Fix PowerStatus 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:43:11 +02:00
Šimon Brandner
f08b92309f Iterate EntityTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:35:33 +02:00
Michael Telatynski
bc786cdf4a Merge pull request #6220 from matrix-org/t3chguy/ts/5.1 2021-06-24 15:23:59 +01:00
Jaiwanth
544761329c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-24 18:33:30 +05:30
Jaiwanth
112dfa2b96 Finish JSON export implementation 2021-06-24 18:19:12 +05:30
Šimon Brandner
8fb788ae56 Iterate EntityTile once more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:39:51 +02:00
Šimon Brandner
5b21cff240 Iterate MemberTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:38:21 +02:00
Šimon Brandner
1b64cd0c88 Iterate PresenceLabel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:36:22 +02:00
Šimon Brandner
298e505381 Iterate EntityTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:29:24 +02:00
Michael Telatynski
f965d449b8 Merge pull request #6249 from SimonBrandner/ts/member-list 2021-06-24 13:25:59 +01:00
Šimon Brandner
d2d8cb3c24 Think about what you copy-paste, Simon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:15:44 +02:00
Šimon Brandner
a774aed365 Iterate PR 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:07:43 +02:00
Šimon Brandner
6333d4aa36 Iterate PR 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:02:06 +02:00
Michael Telatynski
01aadb460d Fix cyclic imports 2021-06-24 11:12:32 +01:00
Michael Telatynski
26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Germain Souquet
21caa6df12 move live recording logic down the component tree 2021-06-24 09:58:11 +01:00
Germain Souquet
56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Michael Telatynski
0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Aaron Raimist
7b7ad76fe4 Merge branch 'develop' into string-pl 2021-06-23 17:54:42 -05: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
Šimon Brandner
e25940cbdd Convert PresenceLabel to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 19:22:11 +02:00
Šimon Brandner
87d27593de Convert MemberTile to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 19:22:11 +02:00
Šimon Brandner
d5acfc6cf4 Convert EntityTile to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 19:22:06 +02:00
Travis Ralston
9d07519214 Merge remote-tracking branch 'nordeck/nic/feat/DisableModalWidgetButtons' into develop 2021-06-23 11:21:19 -06: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
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
Germain Souquet
a6367c0796 Reintroduce LiveRecording components for maintenance reasons 2021-06-23 09:33:38 +01: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
Šimon Brandner
9bceb40820 CallMediaHandler -> MediaDeviceHandler 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 09:26:33 +02:00
Jaiwanth
b2162c3be9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-23 12:09:46 +05:30
Jaiwanth
438b9d4730 Get rid of jszip and replace it with a custom library 2021-06-23 11:58:50 +05:30
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