Commit graph

69 commits

Author SHA1 Message Date
J. Ryan Stinnett
1b39dbdb53
Merge pull request #6245 from aaronraimist/string-pl
Do not honor string power levels
2021-07-12 16:01:11 +01:00
Šimon Brandner
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
Jaiwanth
08d886e9d1 Delint 2021-06-30 14:08:22 +05:30
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Robin Townsend
c0e10218d9 Fix lints
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-29 22:42:46 -04:00
Robin Townsend
adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -04:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Jaiwanth
f0d0b77b8c
Update src/TextForEvent.tsx
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-29 10:13:14 +05:30
Aaron Raimist
434b313850 Merge branch 'develop' into string-pl 2021-06-28 22:13:51 -05:00
Jaiwanth
398d49245f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-06-26 23:42:42 +05:30
Šimon Brandner
ff11244de8
Trailing spaces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 17:27:53 +02:00
Šimon Brandner
e282c4aa54
Simplifie code
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-24 17:23:42 +02:00
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Šimon Brandner
cc1f68296e
Iterate
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:58:56 +02:00
Šimon Brandner
e436e28f01
Make TS happy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:31:04 +02:00
Šimon Brandner
0542c69b66
Fix types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:13:27 +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
Šimon Brandner
a8b2c6d36b
Type event
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 12:24:42 +02:00
Šimon Brandner
8d47ea63c2
Make pinned message text clickable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:41:55 +02:00
Renamed from src/TextForEvent.ts (Browse further)