sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
34,878 Commits 4 Branches 19 Tags
acd37d2aad3e256a67d7dfa2dbee6cd1b66c2ed5
Commit Graph
10678 Commits
Author SHA1 Message Date
Šimon Brandner acd37d2aad Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 16:53:05 +02:00
Travis RalstonandGitHub fe2eb5ebf0 Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel 
Fix voice messages in right panels
 2021-07-14 08:46:55 -06:00
Travis RalstonandGitHub 2b8e709125 Merge pull request #6369 from matrix-org/travis/tileshape 
Use TileShape enum more universally
 2021-07-14 08:46:27 -06:00
Šimon Brandner 54d2784818 Remove unused import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 12:19:16 +02:00
Šimon Brandner 6c801fea53 Use MImageReplyBody for stickers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 12:15:13 +02:00
Šimon Brandner 782563af53 Override audio and video body with file body 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:47:29 +02:00
Šimon Brandner 04db6beb10 Remove stale comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:30:24 +02:00
Šimon Brandner ae4d8c291d It's not an override 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:23:24 +02:00
Šimon Brandner 586e85cbff Use MFileBody in replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 10:14:44 +02:00
Šimon Brandner 4afd985e7e Kill off _afterComponentWillUnmount 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:55:14 +02:00
Šimon Brandner bde26a809a Omit onFinished 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:54:33 +02:00
Šimon Brandner 7b35d2c270 FORCED_IMAGE_HEIGHT into a const 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:53:40 +02:00
Šimon Brandner 74ff85ae30 Remove m.sticker since it's not a message type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:52:45 +02:00
Šimon Brandner 9aae33e076 Use string[] 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 09:28:37 +02:00
Robin Townsend 0117d513ea Consolidate disabling of history options 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-13 23:08:43 -04:00
Robin Townsend d568e92e06 Merge branch 'develop' into e2ee-history-visibility 2021-07-13 23:07:11 -04:00
Travis Ralston 1f131db216 Set a max width on waveform-less tiles 2021-07-13 19:02:12 -06:00
Travis Ralston 5a75539b93 Introduce a "pinned" tile shape 
All components which don't understand this shape will fall through to their normal states, as they would for no explicit tile shape.
 2021-07-13 19:01:55 -06:00
Travis Ralston 49c9492484 Pass tile shape down to tiles in the notifications panel 2021-07-13 18:52:07 -06:00
Travis Ralston ed1fbad6c4 Respect tile shape for voice messages 
Fixes https://github.com/vector-im/element-web/issues/17608
 2021-07-13 18:51:53 -06:00
Travis Ralston 9b6495903c Use TileShape enum more universally 2021-07-13 18:35:56 -06:00
Šimon Brandner 46e1fdf442 Reorder buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 20:28:49 +02:00
Šimon Brandner 0bbdfefd0d Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-13 13:21:27 +02:00
Šimon Brandner 8f831a89f6 Remove unused code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 13:07:47 +02:00
Šimon Brandner 1ec4ead62d Unused imports 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 13:04:59 +02:00
Šimon Brandner 2660e25d6e Deduplicate some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 13:04:37 +02:00
Šimon Brandner 8fc90e1d53 Fix isInfoMessage regression 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 12:26:14 +02:00
Šimon Brandner 75e7948ca8 Handle event edits 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 11:57:40 +02:00
Šimon Brandner 866a11d7e3 Fix image alignment issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 11:49:49 +02:00
Šimon Brandner fca5125c5b Improve redacted body look 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 10:36:44 +02:00
Šimon Brandner bc7a8f8406 Handle redaction 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 10:12:24 +02:00
Šimon Brandner 9455a6d772 Import replaceableComponent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:40:29 +02:00
Šimon Brandner e01d1572ac Formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:34:43 +02:00
Šimon Brandner 069180b16d Remove contructor 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:31:28 +02:00
Šimon Brandner c44de3bea8 Enums 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:30:52 +02:00
Šimon Brandner b1fb089816 More compact classNames 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:27:22 +02:00
Šimon Brandner 0bf595d8d4 Enums 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:26:27 +02:00
Šimon Brandner 22b029d116 Relation type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:24:40 +02:00
Šimon Brandner 63ad95246a EventType enum! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:23:57 +02:00
Šimon Brandner 931bba747a Replaceable component 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:22:13 +02:00
Šimon Brandner ef1a1ebe12 TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:21:33 +02:00
Šimon Brandner e4d1859fb7 Ret type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:21:05 +02:00
Šimon Brandner 4cf4ab2266 Return type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:20:40 +02:00
Šimon Brandner af7769ce93 Types! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:20:13 +02:00
Šimon Brandner 86580f3f20 current target 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:19:45 +02:00
Šimon Brandner 6193bc2a82 Types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:19:19 +02:00
Šimon Brandner fa4977c4da Use current target 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:18:34 +02:00
Šimon Brandner bdbd03c4ff Types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:18:05 +02:00
Šimon Brandner 2a403f6cfe Remove additional ? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:17:18 +02:00
Šimon Brandner 5fc35565df More TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:16:53 +02:00