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

38169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Germain Souquet
e52a33e93c Merge branch 'develop' into gsouquet/threads-action-bar-19127 2021-09-28 09:34:43 +01:00
Travis Ralston
8e497f8c56 Merge pull request #6871 from psrpinto/fix/close-url-preview-button 
Fix issue with preview panel close button not appearing for certain messages containing a URL
 2021-09-27 13:42:11 -06:00
Paulo Pinto
432dd994bd Filter out invalid previews 
The call to cli.getUrlPreview() might return an empty object ({}), which means
there is in fact no preview for that URL.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-09-27 18:07:54 +01:00
Paulo Pinto
dabc13c98f Extract logic to a function 
For better readability of the call to useAsyncMemo()

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-09-27 18:07:54 +01:00
Travis Ralston
77ad0a9142 Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787 
Improve AUX panel behaviour
 2021-09-27 10:16:05 -06:00
Germain
8c9cd0d2f4 Merge pull request #6865 from robintown/cut-off-pills 2021-09-27 16:39:04 +01:00
RiotRobot
b635d01779 Reset matrix-js-sdk back to develop branch 2021-09-27 14:33:56 +01:00
RiotRobot
3e2e3fcd20 Resetting package fields for development 2021-09-27 14:33:46 +01:00
RiotRobot
8471445b1e Merge branch 'master' into develop 2021-09-27 14:33:45 +01:00
RiotRobot
dad60804ba v3.31.0 2021-09-27 14:31:26 +01:00
RiotRobot
d5dddadc3b Prepare changelog for v3.31.0 2021-09-27 14:31:25 +01:00
RiotRobot
ccfc57657a Upgrade matrix-js-sdk to 13.0.0 2021-09-27 14:27:26 +01:00
Michael Telatynski
b461569008 Merge pull request #6824 from matrix-org/t3chguy/fix/spaces-admin-check 2021-09-27 13:56:08 +01:00
Michael Telatynski
c39519a753 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/spaces-admin-check 2021-09-27 13:46:51 +01:00
Dariusz Niemczyk
0cfa2a58c7 Add ability to expand and collapse long quoted messages (#6701) 
In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.

Fixes https://github.com/vector-im/element-web/issues/18884
 2021-09-27 12:20:37 +02:00
Germain
e5f2a06102 Merge pull request #6861 from SimonBrandner/task/messages-ts 2021-09-27 10:03:11 +01:00
Šimon Brandner
0cba943f96 Fix types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:35:33 +02:00
Šimon Brandner
6a88ac900c Merge remote-tracking branch 'upstream/develop' into task/messages-ts 2021-09-27 10:32:25 +02:00
Šimon Brandner
2712dde581 Remove empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:28:07 +02:00
Germain
4fa4ff23c3 Merge pull request #6863 from SimonBrandner/task/utils-ts 2021-09-27 09:26:04 +01:00
Germain
3e34f72378 Merge pull request #6864 from SimonBrandner/task/rageshake-ts 2021-09-27 09:25:05 +01:00
Šimon Brandner
dd92f8f1f9 Move imports 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:21:46 +02:00
Šimon Brandner
1ed4a9eb4f Fix JSDoc type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:19:53 +02:00
Šimon Brandner
a1d5e7ba66 Add return type 
Co-authored-by: Germain <germain@souquet.com>
 2021-09-27 10:12:55 +02:00
Šimon Brandner
6aa5d98741 Remove constructor 
Co-authored-by: Germain <germain@souquet.com>
 2021-09-27 10:12:45 +02:00
Šimon Brandner
b6fc10b65e Merge remote-tracking branch 'upstream/develop' into task/rageshake-ts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 09:56:09 +02:00
Germain
a4e5397d8a Merge pull request #6866 from SimonBrandner/task/stores-ts 2021-09-27 08:34:40 +01:00
Šimon Brandner
af9429c8a0 Convert ActiveWidgetStore to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 19:57:02 +02:00
Šimon Brandner
2584b5bc6b Convert rageshake to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 16:53:43 +02:00
Robin Townsend
b08e05ebe7 Fix pills being cut off in message bubble layout 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-26 10:24:46 -04:00
Šimon Brandner
ee344efb3d Convert MegolmExportEncryption to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 15:20:42 +02:00
Šimon Brandner
aa10cf45a5 Convert KeyVerificationStateObserver to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 15:05:51 +02:00
Šimon Brandner
0c6bf950f6 Convert HostingLink to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 15:03:50 +02:00
Šimon Brandner
755bfb4562 Convert DirectoryUtils to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 15:02:07 +02:00
Šimon Brandner
fb5c18caa0 Convert MKeyVerificationConclusion to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 14:51:46 +02:00
Šimon Brandner
c287d15fa0 Convert RoomCreate to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:42:29 +02:00
Šimon Brandner
421fa1ab69 Convert RoomAvatarEvent to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:42:28 +02:00
Šimon Brandner
ff1c1fbc78 Convert MjolnirBody to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:08:05 +02:00
Šimon Brandner
bee85a0bcd Convert EditHistoryMessage to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:08:04 +02:00
Travis Ralston
0354a7025d Merge pull request #6862 from SimonBrandner/task/usercontent-ts 
Convert `/src/usercontent` to TS
 2021-09-25 20:52:37 -06:00
Šimon Brandner
3450e91e32 Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-25 09:58:01 +02:00
Šimon Brandner
1a2476609c Fix code to be equivalent to the previous one 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-25 07:55:40 +02:00
Šimon Brandner
27f74b3ebd Remove unnecessary type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-25 07:53:38 +02:00
Šimon Brandner
bffebb9304 Convert index to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-24 20:51:50 +02:00
Germain
79b52f8a22 Merge pull request #6857 from matrix-org/gsouquet/composer-reply-18989 2021-09-24 15:05:40 +01:00
David Baker
d33bc4c0e2 Merge pull request #6860 from matrix-org/dbkr/fix_user_view 
Fix the User View
 2021-09-24 14:44:07 +01:00
David Baker
9f26cca256 Fix the User View 
Extreme confusion between users and members, and presumably we were
passing one as the other and they were similar enough that it
worked.

UserView still makes fake member objects but this at least fixes
the user view in the right panel.

Fixes https://github.com/vector-im/element-web/issues/19158
 2021-09-24 14:35:00 +01:00
Germain Souquet
8348add67f Add MessageActionBar to ThreadView 2021-09-24 14:19:11 +01:00
Germain
a2917a4a30 Merge pull request #6859 from matrix-org/gsouquet/threads-timestamp-fix 2021-09-24 13:27:50 +01:00
Germain Souquet
bb7319f632 move timestamp to the right in thread's context 2021-09-24 11:44:11 +01:00