matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity
10,556 Commits 249 Branches 493 Tags
toger5/custom-timeout-for-delayed-restart
Commit Graph

10556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kegan Dougal
759dece725 Minor JSDoc fix. 2015-07-28 13:27:57 +01:00
Kegan Dougal
a750a4756f Merge branch 'develop' v0.2.0 2015-07-28 13:19:51 +01:00
Kegan Dougal
fed91a5090 Add 0.2.0 to /dist 2015-07-28 13:19:34 +01:00
Kegan Dougal
3e1940fe17 Merge branch 'develop' 2015-07-28 13:18:29 +01:00
Kegan Dougal
bfefa380ae Update README; v0.2.0 release commit. 2015-07-28 13:17:05 +01:00
Kegan Dougal
14e91624bd no-op if joinRoom is called when you're already joined. Add test for this. 
Also ignore missing require()s when building (missing olm).
 2015-07-28 13:13:55 +01:00
Kegan Dougal
551721b22e More WIP docs 2015-07-28 11:53:07 +01:00
Kegan Dougal
1ef7af258d Fix linting. Mark on new Store classes as WIP. 2015-07-28 11:50:47 +01:00
Kegan Dougal
3905e56e1f Bump to 0.2.0 - Add missing jsdoc, update CHANGELOG. 2015-07-28 11:45:46 +01:00
Kegan Dougal
9993e5dbed Cleanup jsdoc. Allow extra query params to be set on requests (for ASes). 2015-07-28 10:57:05 +01:00
Matthew Hodgson
14a7ff3e04 differentiate errors a bit better 2015-07-23 11:01:43 -07:00
Mark Haines
0737b80850 Check thet Olm.Account and Olm.Session are defined before enabling crypto 2015-07-23 10:19:41 +01:00
Mark Haines
19b4110a51 Merge pull request #18 from matrix-org/disable_end_to_end 
Disable end-to-end encryption if olm isn't installed.
 2015-07-23 10:09:35 +01:00
Mark Haines
ea1c315aa8 Enable crypto if olm is present 2015-07-23 10:03:20 +01:00
Mark Haines
58e44a2fc3 Disable end-to-end crypto 2015-07-23 09:30:50 +01:00
Mark Haines
ae8e01839e Add flag for indicating if an event was encrypted 2015-07-22 11:57:34 +01:00
Mark Haines
9e5f30fe1f Fix some lint errors 2015-07-22 11:37:22 +01:00
Mark Haines
319ca5123e Return device key list in a stable order, add a check for the list in the tests 2015-07-22 11:34:38 +01:00
Mark Haines
28a5719f5f Add method for listing the device keys we have for a user 2015-07-22 11:24:58 +01:00
David Baker
348d3f4ce1 Merge pull request #17 from matrix-org/markjh/end_to_end 
Add support for end-to-end using olm
 2015-07-21 13:12:01 -07:00
David Baker
a0fc8df3e1 Fix more minor things from PR comments 2015-07-21 13:10:01 -07:00
David Baker
8b2f11edc9 s/.then/.done/ 2015-07-21 13:08:13 -07:00
Mark Haines
09f7011bc5 Add method for telling if room is encrypted 2015-07-21 18:09:10 +01:00
Mark Haines
ffbc197650 Flush the httpBackend in the last crypto test 2015-07-21 17:53:04 +01:00
Mark Haines
b33dcec74b Dummy commit to poke jenkins 2015-07-21 17:47:01 +01:00
Mark Haines
f079e021a2 Line too long 2015-07-21 17:41:05 +01:00
Mark Haines
02c2e88a3e Fix some of the lint warnings 2015-07-21 17:39:11 +01:00
Kegan Dougal
358cdaf167 Fix linting errors 2015-07-21 17:20:35 +01:00
Kegan Dougal
90e778cb84 Handle redactions (both live and historic). 2015-07-21 17:14:11 +01:00
Mark Haines
816bb61689 Increase the timeout for the last crypto integ test 2015-07-21 17:07:10 +01:00
Kegan Dougal
6653d294d9 Re-apply metadata after setStateEvents to correctly apply sender/target props for m.room.member events. 2015-07-21 16:58:14 +01:00
Mark Haines
9fe6d9b782 Add method for disabling end-to-end for a room 2015-07-21 16:44:47 +01:00
Kegsay
185cbac85c Merge pull request #16 from matrix-org/getMembersWithMembership 
Add getMembersWithMembership to get all members with given membership
 2015-07-21 15:42:00 +01:00
Erik Johnston
f716431f65 Make getJoinedUsers call getMembersWithMembership 2015-07-21 15:41:33 +01:00
Erik Johnston
86e73bdd35 Add getMembersWithMembership to get all members with given membership state 2015-07-21 15:31:58 +01:00
Mark Haines
67318247c8 Use an npmified version of olm.js 2015-07-21 15:09:54 +01:00
Mark Haines
3be472330e Update olm.js 2015-07-21 14:30:54 +01:00
Mark Haines
6dae0ef327 Fix the local echo for encrypted events by sending a single event with different content and event type for the wire vs local display 2015-07-21 14:19:24 +01:00
Mark Haines
101de29f3e Store sessions under the right key after encrypting, set the room_id key in the encrypted payload 2015-07-21 11:59:46 +01:00
Mark Haines
b5d8bc5c5f Add the timestamp to decrypted events, update the copy of olm.js 2015-07-21 11:48:30 +01:00
Mark Haines
a97b11136a Update olm.js 2015-07-20 16:36:45 +01:00
Kegan Dougal
93a104fe4c Fire presence first time if presence event unset. 2015-07-20 11:28:13 +01:00
Mark Haines
00ae144997 Don't try to decrypt end-to-end messages if the client doesn't have end-to-end support enabled 2015-07-20 10:58:20 +01:00
Mark Haines
65d64bf223 Merge remote-tracking branch 'origin/develop' into markjh/end_to_end 
Conflicts:
	lib/client.js
	lib/matrix.js
 2015-07-20 10:43:23 +01:00
Mark Haines
d20bd41ff9 Update olm.js 2015-07-20 10:41:54 +01:00
Mark Haines
a375aa30ea Add script for running tests without converage 2015-07-20 10:36:30 +01:00
Kegan Dougal
32c4d3ffc4 Parse m.presence events from /events 2015-07-20 10:07:34 +01:00
Matthew Hodgson
8bc89d433b fix non-impacting typo 2015-07-19 00:36:56 +01:00
Matthew Hodgson
bc216d7bca fix stale video from appearing unexpectedly when you place a new call 2015-07-18 23:29:08 +01:00
Matthew Hodgson
beb8bff084 placeholder code for defaulting displaynames to userids, except it needs disambiguation logic 2015-07-18 15:40:19 +01:00