Commit graph

95 commits

Author SHA1 Message Date
Šimon Brandner
03ce480066
Convert ReplyThread to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:21 +02:00
Š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 Ralston
9b6495903c Use TileShape enum more universally 2021-07-13 18:35:56 -06: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
cbe94c3c5f
Kill-off sdk.getComponent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 08:23:01 +02:00
Šimon Brandner
68d194444a
FocusComposer -> FocusSendMessageComposer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-08 17:36:31 +02:00
Šimon Brandner
090acc4811
Unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:41:36 +02:00
Šimon Brandner
259b36c13d
Remove unused code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:38:44 +02:00
Šimon Brandner
0d8f84c769
Delete lozenge effect
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:35:52 +02:00
Tulir Asokan
5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Tulir Asokan
c1bc4b0027 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-19 16:11:53 +03:00
Germain Souquet
1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +01:00
J. Ryan Stinnett
8f02ca8ce9 Stop requesting null next replies from the server
A recent change (47e007e08f) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.

Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
2021-06-16 18:04:41 +01:00
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00
Robin Townsend
ea2120bdfd Fix timestamps
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 01:55:01 -04:00
Germain Souquet
47e007e08f batch load events in ReplyThread before adding them to the state 2021-05-21 10:20:24 +01:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Tulir Asokan
cdf8f09ec2 Remove unused import and run yarn i18n 2021-03-20 13:38:42 +02:00
Tulir Asokan
99717db762 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-19 21:58:30 +02:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Tulir Asokan
8c8b46b984 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-03-12 14:18:12 +02:00
Travis Ralston
c359dff738 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:34 -07:00
Tulir Asokan
dfcf701449 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-02-19 21:47:10 +02:00
Šimon Brandner
f2d236d429
Use LayoutPropType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:17:30 +01:00
Šimon Brandner
972c947049
More generic layout setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 10:35:35 +01:00
Michael Telatynski
430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836
Fix editing and redactions not updating the Reply Thread
2020-10-07 00:14:56 +01:00
Michael Telatynski
1bd0d9e02b Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-06 22:53:34 +01:00
Michael Telatynski
fbcea7d2cc Fix editing and redactions not updating the Reply Thread
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-06 08:23:48 +01:00
Sorunome
34c15b5221
fix img tags not always being rendered correctly 2020-10-05 09:50:19 +02:00
Tulir Asokan
987cdf1bf0 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-09-19 19:14:37 +03:00
Michael Telatynski
9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Tulir Asokan
75a0178dad Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-09-04 12:41:38 +03:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
2020-09-03 17:21:58 +01:00
Michael Telatynski
beb77799f6 Respect user preference for whether pills should have an avatar or not 2020-09-02 17:26:23 +01:00
Michael Telatynski
78812b6f85 Fix some stuff 2020-08-29 12:53:04 +01:00
Tulir Asokan
db5121aeca Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-08-03 16:49:43 +03:00
Hubert Chathi
b05a19ef13 lint 2020-07-16 18:07:51 -04:00
Hubert Chathi
a85af47b0a use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp 2020-07-16 17:46:49 -04:00
Tulir Asokan
4521e9feb1 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-06-07 15:12:30 +03:00
Travis Ralston
1f1f613777 Add a focus_composer dispatcher action
and use it
2020-06-02 19:07:46 -06:00
Tulir Asokan
4e5680de85 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-05-25 19:21:19 +03:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
4deeef5fca Remove ability to remove avatars 2020-05-18 16:57:00 +01:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
Jorik Schellekens
bc5fc57dd6 Lint
This is why we shouldn't rely on regex
2020-05-07 14:22:15 +01:00
Jorik Schellekens
771ae5e18f Fix encryption badge layouts and replies.
Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
2020-05-07 14:04:56 +01:00
Jorik Schellekens
5568e6488d Fix encryption badge layout 2020-05-07 14:04:34 +01:00
Jorik Schellekens
0af265bf93 Fix replies 2020-05-07 14:04:34 +01:00