1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-09-19 02:54:33 +03:00

372 Commits

Author SHA1 Message Date
Kegan Dougal
f665748fe5 Add 0.2.1 browser-dist. v0.2.1 2015-09-11 10:59:44 +01:00
Kegan Dougal
92e3a28315 Add gendoc script 2015-09-11 10:24:38 +01:00
Kegan Dougal
4e26790418 Merge branch 'develop' 2015-09-11 10:17:20 +01:00
Kegan Dougal
f1793ff96d Merge branch 'release-v0.2.1' into develop 2015-09-11 10:17:09 +01:00
Kegan Dougal
22a9db6c29 Add CHANGELOG and bump to 0.2.1 2015-09-11 10:12:54 +01:00
Kegsay
7a4a3a1239 Merge pull request #19 from matrix-org/matthew/http_exceptions
#19 - Gracefully fail when synchronous errors occur when calling the request function
2015-09-02 09:57:29 +01:00
Kegan Dougal
3c01e2db43 Style checks 2015-09-02 09:50:43 +01:00
Matthew Hodgson
3b9f1728c7 turn HTTP exceptions into errbacks or rejected deferreds rather than bubbling them up and expecting the app to have try blocks eeeeeeeeeverywhere 2015-08-31 18:26:27 +01:00
Kegan Dougal
6d6868df73 Mention the user_id of the inviter for invited room names 2015-08-14 17:09:21 +01:00
Kegan Dougal
c1c2731f2e Set the Content-Type on uploads
Most browsers seem to set this if you forget, but some don't.
2015-08-14 15:09:31 +01:00
David Baker
e859119bde Support allowDefault flag on room avatars too 2015-08-13 17:12:09 +01:00
David Baker
9fab329a70 Add option to prevent the SDK from returning default avatar URLs. 2015-08-13 17:07:34 +01:00
Kegan Dougal
deaaee4986 Add 'opts' to joinRoom function.
Add 'syncRoom' option to allow developers to join rooms without doing a
room initial sync. This is a breaking change.
2015-08-04 12:57:30 +01:00
Kegan Dougal
54a5c38b66 Do not retry requests which 40[0/1/3]. Set 'errcode' on MatrixErrors 2015-07-29 10:30:07 +01:00
Kegan Dougal
7f9c88e53f Add create/getAlias and sendNotice/sendHtmlNotice methods. 2015-07-28 14:51:26 +01:00
Kegan Dougal
3864472057 Fix test race condition.
It was possible for the test to end (via done()) before the final /events req
was flushed, resulting in a fail as there were requests outstanding. We now wait
until the final flush is done before done()ing.
2015-07-28 13:40:02 +01:00
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