1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Commit Graph

45 Commits

Author SHA1 Message Date
Germain Souquet
f40d0d24c7 Move relations and redactions to thread timeline 2021-09-10 09:21:25 +01:00
Travis Ralston
14ba851daf Revert "Count notifications in encrypted rooms client-side" 2021-09-07 14:15:01 -06:00
Travis Ralston
95d80772d7 Merge pull request #1872 from SimonBrandner/fix/call-notifs
Count notifications in encrypted rooms client-side
2021-09-07 12:31:49 -06:00
Germain Souquet
e97d18a03b Improve thread deduplication thread process
Some threads were still holding a reference to the original thread models they were assigned to, leading to some unexpected timeline rendering
2021-09-07 15:05:45 +01:00
Šimon Brandner
241203f804 Merge remote-tracking branch 'upstream/develop' into fix/call-notifs 2021-09-03 18:28:34 +02:00
Šimon Brandner
9b6cee0cab Merge remote-tracking branch 'upstream/develop' into fix/call-notifs 2021-09-02 16:32:26 +02:00
Germain Souquet
fa44300abc Add reply events rendering hint
Adds an unstable hint for clients to know whether to render an event in the room timeline or in a thread

There are currently no MSC associated with that unstable "io.element.in_thread" property as I am only experimenting before settling on a specific approach
2021-09-01 12:12:01 +01:00
Šimon Brandner
824f93daa3 Add wirePushRules
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 20:01:39 +02:00
Germain Souquet
b7a5f81f95 Add experimental indicators for all threading related features 2021-08-19 11:10:20 +01:00
Germain Souquet
b884accc99 Dispatch thread events 2021-08-17 17:43:00 +01:00
Germain Souquet
d56540320e Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-17 11:14:10 +01:00
Germain Souquet
aa696c4c15 Move threading logic to the Sync API 2021-08-17 10:37:34 +01:00
J. Ryan Stinnett
0b12e37459 Clarify usages of event's toJSON 2021-08-16 09:04:14 +01:00
Michael Telatynski
0ad5ef4e9b Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/12 2021-08-10 10:21:13 +01:00
Germain Souquet
18113900fe Implementation of event threading 2021-08-04 17:28:08 +02:00
Brad Murray
4f8c20ddae Fix reattempting decryption check 2021-07-26 07:49:42 -04:00
Brad Murray
e85b3b6a8d Fix the tests and add a test 2021-07-25 11:41:08 -04:00
Brad Murray
04cd9b55f7 Merge remote-tracking branch 'upstream/develop' into improve-event-clear-event-state 2021-07-25 11:23:11 -04:00
Brad Murray
faf237e588 Respect the comment in getClearContent 2021-07-25 11:19:36 -04:00
Michael Telatynski
c2b5b14d26 Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/12
 Conflicts:
	src/client.ts
	src/interactive-auth.ts
	src/models/search-result.ts
2021-07-23 23:46:15 +01:00
Brad Murray
ad79a64f1c Address review feedback 2021-07-23 16:25:39 -04:00
Brad Murray
91f5df1e48 Fix incorrect indentation 2021-07-23 16:16:39 -04:00
Brad Murray
980d6fc2ae Differentiate between an undefined clearEvent and a falsey property of the clearEvent 2021-07-23 16:13:46 -04:00
Brad Murray
5aa60b8056 Clean up Event.clearEvent handling 2021-07-23 15:56:24 -04:00
Travis Ralston
4bc4e1b76f remove useless code 2021-07-14 10:22:36 -06:00
Travis Ralston
11dabf9a68 rename 2021-07-14 10:18:12 -06:00
Travis Ralston
ea4dfd003f It's not a partial anymore 2021-07-14 10:09:23 -06:00
Travis Ralston
326b14402f Return a properly shaped event 2021-07-14 10:07:43 -06:00
Travis Ralston
83337eee57 Expose MatrixEvent's internal clearEvent as a function 2021-07-13 23:09:37 -06:00
Michael Telatynski
e775bcac3c Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript 2021-07-07 11:08:54 +01:00
Michael Telatynski
ce7f20219f Merge pull request #1763 from matrix-org/t3chguy/ts/11
Convert Sync and SyncAccumulator to Typescript
2021-07-02 11:03:27 +01:00
Michael Telatynski
ae870b1cc1 Merge pull request #1762 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:56 +01:00
David Baker
b2ad957d29 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:28:18 +01:00
Michael Telatynski
cab334ed73 Convert Sync and SyncAccumulator to Typescript 2021-07-01 22:47:50 +01:00
Michael Telatynski
4b29f02f1c Convert EventTimeline, EventTimelineSet and TimelineWindow to TS 2021-07-01 09:53:55 +01:00
Michael Telatynski
835aafcb17 Type the rest of algorithms because tests are unhappy otherwise 2021-06-25 10:18:46 +01:00
Michael Telatynski
7bda13aba6 Fix types of MatrixEvent sender & target 2021-06-22 20:37:50 +01:00
Michael Telatynski
2fb033b5ba Merge pull request #1746 from matrix-org/t3chguy/ts/5 2021-06-22 17:41:26 +01:00
Michael Telatynski
a93de99d42 Improve type of IContent msgtype 2021-06-22 17:18:54 +01:00
Travis Ralston
47e972a66c Incorporate merge conflict resolution 2021-06-18 11:18:29 -06:00
Michael Telatynski
7aa5a79c86 Convert Room and RoomState to Typescript 2021-06-18 15:29:45 +01:00
Michael Telatynski
a2449ff6a7 Fix typos 2021-06-17 15:23:40 +01:00
Michael Telatynski
608b0e7b93 Fix up some more type defs 2021-06-17 14:49:27 +01:00
Michael Telatynski
7c61b9cf7e Fix more type definitions 2021-06-17 14:24:53 +01:00
Michael Telatynski
bfea882416 Convert MatrixEvent to TS 2021-06-17 14:04:04 +01:00