a4e20c7b41
Improve timeline message for restricted join rule changes ( #6984 )
2021-10-26 15:28:22 +01:00
7c50cfeab8
Fix direction override characters breaking member event text direction ( #6999 )
...
Strip RLO & LRO chars from display names when rendering text for
member events.
See https://github.com/matrix-org/matrix-js-sdk/pull/1992 - also
necessary here because we use the display name in the event content
rather than from the member object sanitised by the js-sdk.
2021-10-20 16:14:11 +00:00
5290afcc4c
Replace console.warn with logger.warn
...
Related https://github.com/vector-im/element-web/issues/18425
2021-10-18 14:08:23 +02:00
94e4fb71c1
Merge branch 'develop' into export-conversations
2021-09-22 18:07:01 +05:30
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages
...
When pinning or unpinning messages, link to the specific message
2021-09-03 13:27:49 -06:00
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
00d5a0baa4
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-08-13 08:59:28 +05:30
aaeb9969a4
Handle case where one message is pinned, and another unpinned
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-11 14:56:59 +01:00
94d3dd6bbc
Collapse lines together to reduce line/indent spam
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-08-10 15:50:23 +01:00
46e2f67f54
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-03 10:03:16 +05:30
2bdb7e64a3
Revert removing textForCallInvite
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 14:34:18 +02:00
3f2dadf0fe
When a single message is unpinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
8fe7df9171
When a single message is pinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
1ed316851a
Merge upstream and resolve conflicts
2021-07-21 11:35:27 +05:30
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
7dd4100f41
improve types
2021-07-15 12:18:17 +01:00
6c4f0526d7
Coalesce falsy values from TextForEvent handlers
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:26:09 -04:00
8e64b73bd6
Merge branch 'develop' into text-for-event-perf
2021-07-13 23:25:16 -04:00
1b39dbdb53
Merge pull request #6245 from aaronraimist/string-pl
...
Do not honor string power levels
2021-07-12 16:01:11 +01:00
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
08d886e9d1
Delint
2021-06-30 14:08:22 +05:30
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
c0e10218d9
Fix lints
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-29 22:42:46 -04:00
adb5df52a4
Merge branch 'develop' into text-for-event-perf
2021-06-29 22:13:18 -04:00
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +01:00
f0d0b77b8c
Update src/TextForEvent.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-29 10:13:14 +05:30
434b313850
Merge branch 'develop' into string-pl
2021-06-28 22:13:51 -05:00
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
ff11244de8
Trailing spaces
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 17:27:53 +02:00
e282c4aa54
Simplifie code
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-24 17:23:42 +02:00
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
cc1f68296e
Iterate
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:58:56 +02:00
e436e28f01
Make TS happy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:31:04 +02:00
0542c69b66
Fix types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:13:27 +02:00
6333d4aa36
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:02:06 +02:00
a8b2c6d36b
Type event
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 12:24:42 +02:00
8d47ea63c2
Make pinned message text clickable
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:41:55 +02:00
Michael Telatynski