2775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthew Hodgson	d46863e199	fix syntax	2016-08-28 23:44:10 +01:00
Matthew Hodgson	751ce421cd	Merge branch 'develop' into matthew/filtered-timelines	2016-08-28 18:49:54 +01:00
Matthew Hodgson	74e1dccf50	0.5.6 v0.5.6	2016-08-28 16:36:06 +01:00
Matthew Hodgson	bf3eaa9eb7	Prepare changelog for v0.5.6	2016-08-28 16:29:34 +01:00
Richard van der Hoff	b4f22310ea	Reset megolm session when people join/leave the room	2016-08-26 11:24:59 +01:00
Richard van der Hoff	2da70ca024	Merge pull request #182 from matrix-org/rav/single_key_message ... Put all of the megolm keys in one room message	2016-08-24 11:48:54 +01:00
Richard van der Hoff	42babbc595	Put all of the megolm keys in one room message ... Avoid hitting the rate-limiter by putting all of the megolm keys in a single event.	2016-08-24 11:46:22 +01:00
Richard van der Hoff	ba4735d4a8	Merge pull request #181 from matrix-org/rav/fix_device_blocking ... Reinstate device blocking for simple Olm	2016-08-24 10:22:18 +01:00
Richard van der Hoff	31e7addf2f	Reinstate device blocking for simple Olm ... Commit 4cde51b3 broke device blocking such that we were encrypting for all devices, including blocked ones. Reinstate it, and add a test.	2016-08-24 09:26:12 +01:00
Richard van der Hoff	ba339ffdad	Merge pull request #180 from matrix-org/rav/receive_megolm_keys ... support for unpacking megolm keys	2016-08-23 17:30:30 +01:00
Richard van der Hoff	a05cbab7c6	Merge pull request #179 from matrix-org/rav/send_megolm_keys ... Send out megolm keys when we start a megolm session	2016-08-23 17:30:12 +01:00
Richard van der Hoff	e708e59b15	Add a TODO about batching events	2016-08-23 17:27:47 +01:00
Matthew Hodgson	dd5878015a	WIP filtered timelines	2016-08-23 14:31:47 +01:00
Richard van der Hoff	c72f613afc	Merge pull request #178 from matrix-org/rav/refactor_ensuresessions ... Change the result structure for ensureOlmSessionsForUsers	2016-08-23 11:19:19 +01:00
Richard van der Hoff	1159e0911f	support for unpacking megolm keys ... This is incredibly hacky at the moment, pending the arrival of ephemeral events, but it kinda works.	2016-08-22 18:24:46 +01:00
Richard van der Hoff	9f180179d5	rename m.key event to m.room_key ... ... because m.key is scary, or something	2016-08-22 18:13:11 +01:00
Richard van der Hoff	238700cbdb	Send out megolm keys when we start a megolm session ... For now, pending the arrival of SPEC-138, this happens via inline messages in the room.	2016-08-22 17:59:22 +01:00
Richard van der Hoff	df43b19510	Change the result structure for ensureOlmSessionsForUsers ... Nothing was using the results (except the tests), and it's more useful to have the devices we *do* have a session for than the ones we don't.	2016-08-22 17:44:37 +01:00
Richard van der Hoff	e4bfb3ca32	Merge pull request #177 from matrix-org/rav/olmlib ... Factor out a function for doing olm encryption	2016-08-22 16:34:17 +01:00
Richard van der Hoff	0234410b43	Factor out a function for doing olm encryption ... Make a library file with some constants and a function to pack olm-encrypted events (which we are going to use from megolm)	2016-08-22 10:22:12 +01:00
Richard van der Hoff	4877edb79b	Merge pull request #175 from matrix-org/rav/refactor_deviceinfo ... Move DeviceInfo and DeviceVerification to separate module	2016-08-22 10:16:48 +01:00
Richard van der Hoff	1c4ee62397	Merge pull request #176 from matrix-org/rav/asynchronous_encryption ... Make encryption asynchronous	2016-08-22 10:16:37 +01:00
Richard van der Hoff	7ea7e5ac6c	Move DeviceInfo and DeviceVerification to separate module	2016-08-19 16:18:54 +01:00
Richard van der Hoff	32fa51818b	Make encryption asynchronous ... We're going to need to send out a load of messages to distribute the megolm keys; as a first step, deal with the asynchronicity this will require.	2016-08-19 16:18:33 +01:00
David Baker	e0bd05a8c4	Fix lint	2016-08-18 23:58:06 +01:00
David Baker	a25315a994	Merge pull request #167 from Half-Shot/presence_status ... Added ability to set and get status_msg for presence.	2016-08-18 11:18:03 +01:00
Richard van der Hoff	03e493453b	Merge pull request #174 from matrix-org/rav/fix_room_reference ... Megolm: don't dereference nullable object	2016-08-18 10:31:45 +01:00
Richard van der Hoff	4d6f9da578	Megolm: don't dereference nullable object ... It is possible for `room` to be null when passed to MegolmEncryption.encryptMessage; we need to avoid dereferencing it. Instead, make sure that the EncryptionAlgorithm knows about the roomId it is targeting, and use that. Replace the increasingly-long argument list on the EncryptionAlgorithm constructor with a params list, and update DecryptionAlgorithm to match.	2016-08-17 16:21:37 +01:00
Richard van der Hoff	783b1feb70	Merge branch 'rav/group_e2e' into develop	2016-08-16 18:10:38 +01:00
Richard van der Hoff	9925b327b4	pr feedback ... break long line into two statements	2016-08-16 18:09:37 +01:00
Richard van der Hoff	f75287b6b9	Merge pull request #170 from matrix-org/dbkr/push_update_rules_expose_func ... Update our push rules when they come down stream	2016-08-16 17:10:14 +01:00
David Baker	cc72d35c6b	Move definition ... So we don't have to fudge the jsdoc to make the linter happy	2016-08-16 17:02:18 +01:00
Richard van der Hoff	89d8133ad2	Implement megolm encryption/decryption ... Very early attempt at encryption/decryption implementation via megolm. You have to c&p the keys manually.	2016-08-16 16:47:37 +01:00
Richard van der Hoff	e56833c7b2	Merge pull request #172 from matrix-org/rav/refactor_crypto ... Factor Olm encryption/decryption out to new classes	2016-08-16 15:26:37 +01:00
Richard van der Hoff	2c9f8ba598	Factor Olm encryption/decryption out to new classes ... - to make way for alternative encryption algorithms. We now store an encryption object for each room, rather than referring to sessionstore on each event. Also a little light tidying to the jsdocs.	2016-08-16 15:12:28 +01:00
Richard van der Hoff	1f16bba342	Merge pull request #171 from matrix-org/rav/refactor_deviceinfo ... Make DeviceInfo more useful, and refactor crypto methods to use it	2016-08-16 14:19:45 +01:00
Richard van der Hoff	4cde51b3ce	Make DeviceInfo more useful, and refactor crypto methods to use it ... This is a prerequisite for a forthcoming refactor of _encryptMessage out to a separate class.	2016-08-16 13:58:56 +01:00
David Baker	267e009ae3	Make lint pass ... Although with slightly redundant doc :/	2016-08-15 18:55:09 +01:00
David Baker	0ba1a1dabc	Update our push rules when they come down stream ... Also expose a useful function from pushprocessor. Fixes https://github.com/vector-im/vector-web/issues/1495	2016-08-15 18:40:12 +01:00
Richard van der Hoff	6739da5acb	Fix login ... https://github.com/matrix-org/matrix-js-sdk/pull/168 was broken :/	2016-08-12 13:30:04 +01:00
David Baker	b0d5e1d844	Merge pull request #169 from matrix-org/rav/move_login_to_base_apis ... Move login and register methods into base-apis	2016-08-12 13:10:59 +01:00
David Baker	ea6f526ef9	Merge pull request #168 from matrix-org/rav/clean_up_login ... Remove defaultDeviceDisplayName from MatrixClient options	2016-08-12 13:10:18 +01:00
Richard van der Hoff	3a7b1c6dd4	Move login and register methods into base-apis ... login no longer relies on fields within MatrixClient, so we can move it down to BaseApis	2016-08-12 13:02:40 +01:00
Richard van der Hoff	b98e421b8a	Remove defaultDeviceDisplayName ... We no longer rely on js-sdk setting the initial_device_display_name and login_id on login, so remove them to make `login` simpler.	2016-08-12 12:51:26 +01:00
David Baker	d9318a60e4	0.5.5 v0.5.5	2016-08-11 17:24:20 +01:00
David Baker	2fd569a61a	Prepare changelog for v0.5.5	2016-08-11 17:17:28 +01:00
Will Hunt	1bd5d12665	Fixed setPresence opts	2016-08-11 13:39:27 +01:00
Will Hunt	02de5e96ba	Add presenceStatusMsg to User	2016-08-11 12:55:07 +01:00
Will Hunt	bc56213010	Add status_msg to setPresence	2016-08-11 12:50:13 +01:00
David Baker	34919d1b96	Merge pull request #166 from matrix-org/rav/stop_sync_when_stopped ... Make sure we actually stop the sync loop on logout	2016-08-11 10:31:29 +01:00