matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-16 09:42:23 +03:00
Code Activity
2,775 Commits 242 Branches 516 Tags
dffe0b39b67fd8c91bbcc67060c110d49bba581c
Commit Graph

2775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Hodgson
dac820f957 actually filter /messages 2016-09-07 22:04:12 +01:00
Matthew Hodgson
91f8df8d19 make EventTimeline take an EventTimelineSet 2016-09-07 21:17:06 +01:00
Matthew Hodgson
9b507f6c6c Merge branch 'develop' into matthew/filtered-timelines 2016-09-07 20:34:57 +01:00
Matthew Hodgson
5e583d3c50 populate up filtered timelineSets vaguely correctly 2016-09-07 19:45:30 +01:00
Richard van der Hoff
d706b57fe9 Merge pull request #195 from matrix-org/rav/lazy_olm 
Don't create Olm sessions proactively
 2016-09-07 19:19:07 +01:00
Richard van der Hoff
1063a16013 Don't create Olm sessions proactively 
In what I hoped would be a five-minute refactor to help clean up an annoying
not-really-used codepath, but turned into a bit of a hackathon on the tests,
create Olm sessions lazily in Olm rooms, just as we do in megolm rooms, which
allows us to avoid having to get the member list before configuring e2e in a
room.
 2016-09-07 18:44:02 +01:00
Richard van der Hoff
46a2073427 Merge pull request #194 from matrix-org/rav/use_todevice_events 
Use to-device events for key sharing
 2016-09-07 14:01:57 +01:00
Richard van der Hoff
d7bb9574e7 Merge pull request #193 from matrix-org/rav/update_readme 
README: callbacks deprecated
 2016-09-07 14:00:24 +01:00
Richard van der Hoff
9c18893ae5 Use to-device events for key sharing 
Synapse now supports out-of-band messages, so use them instead of sending the
key-sharing messages in-band.
 2016-09-07 13:56:54 +01:00
Richard van der Hoff
4503c320e5 README: callbacks deprecated 
We are no longer adding callback arguments as a matter of course.
 2016-09-07 11:39:29 +01:00
Matthew Hodgson
c4995bd153 fix filtering 2016-09-07 02:17:03 +01:00
Richard van der Hoff
af0f5b37d8 Bump to olm 1.2.0 2016-09-06 22:29:33 +01:00
Richard van der Hoff
b9ba4671b4 Merge pull request #192 from matrix-org/rav/verified_megolm_senders 
Fix sender verification for megolm messages
 2016-09-06 22:22:20 +01:00
Richard van der Hoff
50b8f13037 Fix sender verification for megolm messages 
Turns out all we need to do is to make sure we use the Olm device table when we
look up megolm senders.
 2016-09-06 16:46:57 +01:00
Richard van der Hoff
4aa9dca608 Merge pull request #191 from matrix-org/rav/ciphertext_field 
Use `ciphertext` instead of `body` in megolm events
 2016-09-06 16:25:35 +01:00
Richard van der Hoff
98dc5328a0 Use ciphertext instead of body in megolm events 
Apparently `body` is going to be special.
 2016-09-06 16:23:23 +01:00
Richard van der Hoff
408671b58a Megolm: Remove check for signature field 
We're putting the signature in the body, so we don't want a separate field.
 2016-09-06 15:59:57 +01:00
Matthew Hodgson
1bda527e3d export EventTimelineSet 2016-09-06 01:04:23 +01:00
Richard van der Hoff
e0f1b9ebf0 Merge pull request #189 from matrix-org/rav/get_olm_sessions_for_user 
Add debug methods to get the state of OlmSessions
 2016-09-05 10:38:57 +01:00
Richard van der Hoff
55127aa43f Merge pull request #190 from matrix-org/rav/get_stored_devices 
MatrixClient.getStoredDevicesForUser
 2016-09-05 10:38:12 +01:00
Matthew Hodgson
888fbe3549 fix some lint 2016-09-05 02:44:46 +01:00
Matthew Hodgson
ed5c061566 move getOrCreateClient from sync.js to client.js 2016-09-05 02:44:24 +01:00
Richard van der Hoff
df6b1d1471 Add debug methods to get the state of OlmSessions 
I've been trying to track down issues with the OlmSessions getting out of sync
between two devices. To help with this, add a method which can be used from the
JS console to inspect the state of OlmSessions.
 2016-09-05 00:03:21 +01:00
Richard van der Hoff
5e0f09075d MatrixClient.getStoredDevicesForUser 
Implement MatrixClient.getStoredDevicesForUser which uses
Crypto.getStoredDevicesForUser, which is more powerful than listDeviceKeys, and
isn't deprecated.

Also a couple of accessors for DeviceInfo.
 2016-09-04 23:31:38 +01:00
Matthew Hodgson
2daa1b6007 change TimelineWindow to take a timelineSet rather than a Room 2016-09-04 13:57:56 +01:00
Matthew Hodgson
4ff2ad9fac s/EventTimelineList/EventTimelineSet/g at vdh's req 2016-09-03 22:27:29 +01:00
Matthew Hodgson
ba06e8091f Merge branch 'develop' into matthew/filtered-timelines 2016-09-03 13:33:15 +01:00
Richard van der Hoff
692b3107ac Merge pull request #188 from matrix-org/rav/cleanups 
Olm-related cleanups
 2016-09-02 15:39:15 +01:00
Richard van der Hoff
6baf9e1c37 Olm-related cleanups 
A couple of small refactors which fell out of the aborted stuff for upgrading
to secure Ed25519 keys, but are useful in their own right.

The main functional change here is to calculate the "algorithms" list from
DECRYPTION_CLASSES (and hence include megolm in the list).
 2016-09-02 11:33:50 +01:00
Richard van der Hoff
c07e662b90 Update to olm 1.1.0 
Use fixed olm library
 2016-09-02 11:18:58 +01:00
Matthew Hodgson
aca8b32e5b Merge pull request #186 from matrix-org/matthew/uninterrupted-audio 
always play audio out of the remoteAudioElement if it exists.
 2016-09-01 10:54:20 +01:00
Matthew Hodgson
0ec8a6e0af always play audio out of the remoteAudioElement if it exists.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621 2016-08-31 21:52:24 +01:00
Matthew Hodgson
41af7c8883 Merge pull request #185 from matrix-org/matthew/webrtc-promises 
Fix exceptions where HTMLMediaElement loads and plays race
 2016-08-31 21:00:24 +01:00
Matthew Hodgson
7f2070f7b7 fix lint 2016-08-31 20:59:02 +01:00
Matthew Hodgson
1cc74ec116 don't break the promise chain if a play() fails 2016-08-31 20:57:08 +01:00
Matthew Hodgson
627f662384 PR review 2016-08-31 17:39:06 +01:00
Matthew Hodgson
c791881c87 fix lint 2016-08-31 16:31:49 +01:00
Matthew Hodgson
b0782885d5 kill unhandled exceptions where loads and plays race by queuing them as promises 2016-08-31 16:29:14 +01:00
Matthew Hodgson
d25d60f0f0 make the tests pass again 2016-08-30 23:34:11 +01:00
Kegsay
d356e722da Make example actually work 2016-08-30 15:11:06 +01:00
Richard van der Hoff
84e2fc91ae Merge pull request #183 from matrix-org/rav/reset_megolm_on_member_change 
Reset megolm session when people join/leave the room
 2016-08-30 14:58:18 +01:00
Richard van der Hoff
9768fb020c Merge pull request #184 from matrix-org/rav/fix_redactions 
Fix exceptions when dealing with redactions
 2016-08-30 14:53:48 +01:00
Richard van der Hoff
e25112ad35 Fix exceptions when dealing with redactions 
When we got a redaction event, we were adding the entire (circular) MatrixEvent
object for the redaction to the redacted event, which would then cause
exceptions down the line (particularly when dealing with gappy timelines).

We should only be adding the raw event.

Fixes (hopefully) https://github.com/vector-im/vector-web/issues/1389.
 2016-08-30 14:30:12 +01:00
Matthew Hodgson
e18b446190 unbreak filter text 2016-08-30 01:30:23 +01:00
Matthew Hodgson
0848d4ed10 reemit Room.timeline events correctly 2016-08-30 01:13:32 +01:00
Matthew Hodgson
7514aea813 make most things work other than Room.timeline firing 2016-08-30 01:11:47 +01:00
Matthew Hodgson
58031ab21d fix things until they almost work again... 2016-08-30 00:36:52 +01:00
Matthew Hodgson
c1c2ca3ec1 tweak doc; make it build 2016-08-29 23:18:19 +01:00
Matthew Hodgson
b863a363da WIP refactor 2016-08-29 21:08:35 +01:00
Matthew Hodgson
b42db46abd WIP refactor 2016-08-29 21:06:53 +01:00