OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
46,660 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

86 Commits (af268b4a03fdaa9e873014380e282ac9195e73a5)

Author SHA1 Message Date
Jaiwanth 94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Travis Ralston 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
Jaiwanth 7207329c15 Apply review suggestions 2021-08-13 23:44:07 +05:30
Jaiwanth 00d5a0baa4
Apply suggestions from code review 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-08-13 08:59:28 +05:30
Paulo Pinto 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
Paulo Pinto 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
Jaiwanth 46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
Šimon Brandner 2bdb7e64a3
Revert removing textForCallInvite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-02 14:34:18 +02:00
Paulo Pinto 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
Paulo Pinto 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
Jaiwanth 1ed316851a Merge upstream and resolve conflicts 2021-07-21 11:35:27 +05:30
Jaiwanth fe2cac56f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-19 12:57:27 +05:30
Šimon Brandner 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
Šimon Brandner 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
Michael Telatynski 7dd4100f41 improve types 2021-07-15 12:18:17 +01:00
Robin Townsend 6c4f0526d7 Coalesce falsy values from TextForEvent handlers 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-13 23:26:09 -04:00
Robin Townsend 8e64b73bd6 Merge branch 'develop' into text-for-event-perf 2021-07-13 23:25:16 -04:00
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