Dima/matrix-js-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 41af7c8883 Merge pull request #185 from matrix-org/matthew/webrtc-promises Matthew Hodgson 2016-08-31 21:00:24 +01:00
  • 7f2070f7b7 fix lint Matthew Hodgson 2016-08-31 20:59:02 +01:00
  • 1cc74ec116 don't break the promise chain if a play() fails Matthew Hodgson 2016-08-31 20:57:08 +01:00
  • 627f662384 PR review Matthew Hodgson 2016-08-31 17:39:06 +01:00
  • c791881c87 fix lint Matthew Hodgson 2016-08-31 16:31:49 +01:00
  • b0782885d5 kill unhandled exceptions where loads and plays race by queuing them as promises Matthew Hodgson 2016-08-31 16:29:14 +01:00
  • d25d60f0f0 make the tests pass again Matthew Hodgson 2016-08-30 23:34:11 +01:00
  • d356e722da Make example actually work Kegsay 2016-08-30 15:11:06 +01:00
  • 84e2fc91ae Merge pull request #183 from matrix-org/rav/reset_megolm_on_member_change Richard van der Hoff 2016-08-30 14:58:18 +01:00
  • 9768fb020c Merge pull request #184 from matrix-org/rav/fix_redactions Richard van der Hoff 2016-08-30 14:53:48 +01:00
  • e25112ad35 Fix exceptions when dealing with redactions Richard van der Hoff 2016-08-30 14:30:12 +01:00
  • e18b446190 unbreak filter text Matthew Hodgson 2016-08-30 01:30:23 +01:00
  • 0848d4ed10 reemit Room.timeline events correctly Matthew Hodgson 2016-08-30 01:13:32 +01:00
  • 7514aea813 make most things work other than Room.timeline firing Matthew Hodgson 2016-08-30 01:11:47 +01:00
  • 58031ab21d fix things until they almost work again... Matthew Hodgson 2016-08-30 00:36:52 +01:00
  • c1c2ca3ec1 tweak doc; make it build Matthew Hodgson 2016-08-29 23:18:19 +01:00
  • b863a363da WIP refactor Matthew Hodgson 2016-08-29 21:08:35 +01:00
  • b42db46abd WIP refactor Matthew Hodgson 2016-08-29 21:06:53 +01:00
  • d46863e199 fix syntax Matthew Hodgson 2016-08-28 23:44:10 +01:00
  • 751ce421cd Merge branch 'develop' into matthew/filtered-timelines Matthew Hodgson 2016-08-28 18:49:54 +01:00
  • 74e1dccf50 0.5.6 v0.5.6 Matthew Hodgson 2016-08-28 16:36:06 +01:00
  • bf3eaa9eb7 Prepare changelog for v0.5.6 Matthew Hodgson 2016-08-28 16:29:34 +01:00
  • b4f22310ea Reset megolm session when people join/leave the room Richard van der Hoff 2016-08-26 11:23:01 +01:00
  • 2da70ca024 Merge pull request #182 from matrix-org/rav/single_key_message Richard van der Hoff 2016-08-24 11:48:54 +01:00
  • 42babbc595 Put all of the megolm keys in one room message Richard van der Hoff 2016-08-24 11:46:22 +01:00
  • ba4735d4a8 Merge pull request #181 from matrix-org/rav/fix_device_blocking Richard van der Hoff 2016-08-24 10:22:18 +01:00
  • 31e7addf2f Reinstate device blocking for simple Olm Richard van der Hoff 2016-08-24 08:04:13 +01:00
  • ba339ffdad Merge pull request #180 from matrix-org/rav/receive_megolm_keys Richard van der Hoff 2016-08-23 17:30:30 +01:00
  • a05cbab7c6 Merge pull request #179 from matrix-org/rav/send_megolm_keys Richard van der Hoff 2016-08-23 17:30:12 +01:00
  • e708e59b15 Add a TODO about batching events Richard van der Hoff 2016-08-23 17:27:47 +01:00
  • dd5878015a WIP filtered timelines Matthew Hodgson 2016-08-23 14:31:47 +01:00
  • c72f613afc Merge pull request #178 from matrix-org/rav/refactor_ensuresessions Richard van der Hoff 2016-08-23 11:19:19 +01:00
  • 1159e0911f support for unpacking megolm keys Richard van der Hoff 2016-08-19 16:08:43 +01:00
  • 9f180179d5 rename m.key event to m.room_key Richard van der Hoff 2016-08-22 18:13:11 +01:00
  • 238700cbdb Send out megolm keys when we start a megolm session Richard van der Hoff 2016-08-22 17:09:24 +01:00
  • df43b19510 Change the result structure for ensureOlmSessionsForUsers Richard van der Hoff 2016-08-22 17:28:06 +01:00
  • e4bfb3ca32 Merge pull request #177 from matrix-org/rav/olmlib Richard van der Hoff 2016-08-22 16:34:17 +01:00
  • 0234410b43 Factor out a function for doing olm encryption Richard van der Hoff 2016-08-19 16:52:04 +01:00
  • 4877edb79b Merge pull request #175 from matrix-org/rav/refactor_deviceinfo Richard van der Hoff 2016-08-22 10:16:48 +01:00
  • 1c4ee62397 Merge pull request #176 from matrix-org/rav/asynchronous_encryption Richard van der Hoff 2016-08-22 10:16:37 +01:00
  • 7ea7e5ac6c Move DeviceInfo and DeviceVerification to separate module Richard van der Hoff 2016-08-18 11:04:29 +01:00
  • 32fa51818b Make encryption asynchronous Richard van der Hoff 2016-08-17 18:18:20 +01:00
  • e0bd05a8c4 Fix lint David Baker 2016-08-18 23:58:06 +01:00
  • a25315a994 Merge pull request #167 from Half-Shot/presence_status David Baker 2016-08-18 11:18:03 +01:00
  • 03e493453b Merge pull request #174 from matrix-org/rav/fix_room_reference Richard van der Hoff 2016-08-18 10:31:45 +01:00
  • 4d6f9da578 Megolm: don't dereference nullable object Richard van der Hoff 2016-08-17 16:21:37 +01:00
  • 783b1feb70 Merge branch 'rav/group_e2e' into develop Richard van der Hoff 2016-08-16 18:10:38 +01:00
  • 9925b327b4 pr feedback Richard van der Hoff 2016-08-16 18:09:37 +01:00
  • f75287b6b9 Merge pull request #170 from matrix-org/dbkr/push_update_rules_expose_func Richard van der Hoff 2016-08-16 17:10:14 +01:00
  • cc72d35c6b Move definition David Baker 2016-08-16 17:02:18 +01:00
  • 89d8133ad2 Implement megolm encryption/decryption Richard van der Hoff 2016-08-15 15:43:39 +01:00
  • e56833c7b2 Merge pull request #172 from matrix-org/rav/refactor_crypto Richard van der Hoff 2016-08-16 15:26:37 +01:00
  • 2c9f8ba598 Factor Olm encryption/decryption out to new classes Richard van der Hoff 2016-08-16 14:29:15 +01:00
  • 1f16bba342 Merge pull request #171 from matrix-org/rav/refactor_deviceinfo Richard van der Hoff 2016-08-16 14:19:45 +01:00
  • 4cde51b3ce Make DeviceInfo more useful, and refactor crypto methods to use it Richard van der Hoff 2016-08-15 17:19:27 +01:00
  • 267e009ae3 Make lint pass David Baker 2016-08-15 18:55:09 +01:00
  • 0ba1a1dabc Update our push rules when they come down stream David Baker 2016-08-15 18:40:12 +01:00
  • 6739da5acb Fix login Richard van der Hoff 2016-08-12 13:30:04 +01:00
  • b0d5e1d844 Merge pull request #169 from matrix-org/rav/move_login_to_base_apis David Baker 2016-08-12 13:10:59 +01:00
  • ea6f526ef9 Merge pull request #168 from matrix-org/rav/clean_up_login David Baker 2016-08-12 13:10:18 +01:00
  • 3a7b1c6dd4 Move login and register methods into base-apis Richard van der Hoff 2016-08-12 13:02:40 +01:00
  • b98e421b8a Remove defaultDeviceDisplayName Richard van der Hoff 2016-08-12 12:49:33 +01:00
  • d9318a60e4 0.5.5 v0.5.5 David Baker 2016-08-11 17:24:20 +01:00
  • 2fd569a61a Prepare changelog for v0.5.5 David Baker 2016-08-11 17:17:28 +01:00
  • 1bd5d12665 Fixed setPresence opts Will Hunt 2016-08-11 13:37:53 +01:00
  • 02de5e96ba Add presenceStatusMsg to User Will Hunt 2016-08-10 11:35:01 +01:00
  • bc56213010 Add status_msg to setPresence Will Hunt 2016-08-09 17:23:30 +01:00
  • 34919d1b96 Merge pull request #166 from matrix-org/rav/stop_sync_when_stopped David Baker 2016-08-11 10:31:29 +01:00
  • cc08de9c64 Make sure we actually stop the sync loop on logout Richard van der Hoff 2016-08-11 01:13:52 +01:00
  • 6432a64442 Merge pull request #164 from matrix-org/dbkr/fix_user_level_zero Richard van der Hoff 2016-08-05 14:29:49 +01:00
  • 1f18dabca0 Add unit test David Baker 2016-08-05 14:28:12 +01:00
  • f74b49de4b Zero is a valid power level David Baker 2016-08-05 11:54:38 +01:00
  • 6aeb265c19 Merge pull request #163 from matrix-org/rav/check_sig_on_device_keys Richard van der Hoff 2016-08-04 15:45:39 +01:00
  • f10467e81f Verify e2e keys on download Richard van der Hoff 2016-08-04 15:26:02 +01:00
  • 6001077c34 Merge pull request #162 from matrix-org/rav/refactor_matrix_client Richard van der Hoff 2016-08-04 14:56:54 +01:00
  • ad6eec329d Factor crypto stuff out of MatrixClient Richard van der Hoff 2016-08-04 09:03:39 +01:00
  • d9867ba458 Merge pull request #161 from matrix-org/rav/refactor_key_upload Richard van der Hoff 2016-08-04 12:05:41 +01:00
  • 6dc7e624d3 Fix device key signing Richard van der Hoff 2016-08-04 11:25:38 +01:00
  • 24957a1445 Refactor device key upload Richard van der Hoff 2016-08-04 09:08:04 +01:00
  • e2d67db5d4 Fix missing semicolon Richard van der Hoff 2016-08-04 09:18:26 +01:00
  • 6c59966339 Merge pull request #158 from matrix-org/rav/devices_api David Baker 2016-08-03 16:12:23 +01:00
  • b4223d3790 Merge pull request #160 from matrix-org/dbkr/deactivate_account Richard van der Hoff 2016-08-03 15:40:43 +01:00
  • 9f6d9208f2 changelog David Baker 2016-08-03 15:26:52 +01:00
  • 35d45f0280 Add deactivate account function David Baker 2016-08-03 15:26:05 +01:00
  • c288e6c7ec Merge pull request #159 from matrix-org/rav/device_name_for_e2e_keys Richard van der Hoff 2016-08-03 14:32:02 +01:00
  • bb946c65d1 client.listDeviceKeys: Expose device display name Richard van der Hoff 2016-08-03 14:13:31 +01:00
  • 13fe22bc86 Wrappers for devices API Richard van der Hoff 2016-08-03 14:11:19 +01:00
  • f139e6e6c2 Merge pull request #157 from matrix-org/dbkr/logout_api Richard van der Hoff 2016-08-02 16:19:49 +01:00
  • 364fe3ba47 Oops, s/MatrixClient/MatrixBaseApis/ David Baker 2016-08-02 15:53:29 +01:00
  • 8b9b37cc91 Move to base APIs David Baker 2016-08-02 15:44:54 +01:00
  • 7895d1daa0 appease linter David Baker 2016-08-02 15:36:36 +01:00
  • 93a9f76f69 Add logout David Baker 2016-08-02 14:52:24 +01:00
  • 4e2edfc771 Merge pull request #156 from matrix-org/dbkr/fix_email_registration Richard van der Hoff 2016-07-29 16:51:49 +01:00
  • f4d53e25cc Remove all the device_id setting from the JS SDK David Baker 2016-07-29 16:45:22 +01:00
  • da324c020b lint David Baker 2016-07-29 14:47:24 +01:00
  • f63015e4c4 Fix email registration David Baker 2016-07-29 14:40:53 +01:00
  • 61cf53deee Merge pull request #155 from matrix-org/rav/refactor_matrix_client David Baker 2016-07-29 10:32:41 +01:00
  • 57ff963fae Merge pull request #154 from matrix-org/rav/fix_crypto_test David Baker 2016-07-29 10:24:10 +01:00
  • 32744b23a0 Merge pull request #153 from matrix-org/rav/fail_build_on_test_fail David Baker 2016-07-29 10:22:39 +01:00
  • 6c25110682 Factor out MatrixClient methods to MatrixBaseApis Richard van der Hoff 2016-07-28 14:51:32 +01:00