Commit Graph

  • 6e0b2de99f fix lint Matthew Hodgson 2016-09-16 03:19:20 +01:00
  • 0633d7d3f6 track raw displayname on user objects Matthew Hodgson 2016-09-16 03:18:47 +01:00
  • 2765720b76 unbreak NPE where megolm's decryptEvent doesn't return a result Matthew Hodgson 2016-09-15 20:09:41 +01:00
  • 71f23ffce1 Merge branch 'develop' into markjh/megolm Mark Haines 2016-09-15 17:10:02 +01:00
  • 1863af147d Merge pull request #206 from matrix-org/markjh/ed25519 Mark Haines 2016-09-15 17:07:52 +01:00
  • 0d5d74674e Remove spurious senderKey argument Mark Haines 2016-09-15 16:46:28 +01:00
  • 45ed0884df Document return type Mark Haines 2016-09-15 16:42:40 +01:00
  • 45e9f59fdc Poke jenkins Mark Haines 2016-09-15 16:40:02 +01:00
  • bde6a171f6 Add getKeysProved and getKeysClaimed methods to MatrixEvent. Mark Haines 2016-09-15 16:26:43 +01:00
  • 49a74755a8 Merge pull request #204 from matrix-org/markjh/oh_hai_reliability Mark Haines 2016-09-15 14:44:06 +01:00
  • 2fbef8638f Fix grammar Mark Haines 2016-09-15 14:43:23 +01:00
  • eb4166afe3 Whitespace Mark Haines 2016-09-15 14:36:53 +01:00
  • b3beaacec7 Remove unnecessary dep Mark Haines 2016-09-15 14:26:05 +01:00
  • 355b728a57 Remove unnecessary semicolon; Mark Haines 2016-09-15 14:23:30 +01:00
  • 577b0e8f1b Add a test to check the olm version Mark Haines 2016-09-15 14:08:25 +01:00
  • 35d99564c1 Rate limit the oh hai pings Mark Haines 2016-09-15 14:07:40 +01:00
  • 6f9bb38232 Include our device key in megolm messages Mark Haines 2016-09-15 11:56:56 +01:00
  • d02c205910 Rename the "content" variable to avoid shadowing Mark Haines 2016-09-15 11:46:49 +01:00
  • 38681202dc Add olm version to client. Add semicolons. Mark Haines 2016-09-14 20:03:31 +01:00
  • 0d20a0acf0 Add a test to check that we have the right version of Olm Mark Haines 2016-09-14 19:59:32 +01:00
  • 9277a86403 Add the accidentally deleted sessionId documentation back Mark Haines 2016-09-14 19:35:31 +01:00
  • 5ec8688cf6 Semicolon Mark Haines 2016-09-14 19:26:44 +01:00
  • 6ae82a9cb4 Fix syntax error Mark Haines 2016-09-14 19:20:46 +01:00
  • 72a4b92022 Send a 'm.new_device' when we get a message for an unknown group session Mark Haines 2016-09-14 19:16:24 +01:00
  • 0cc68bc125 Update the olm library version to 1.3.0 Mark Haines 2016-09-14 14:24:21 +01:00
  • 6ca917f4db Merge pull request #196 from matrix-org/matthew/filtered-timelines v0.6.0-rc1 Matthew Hodgson 2016-09-12 15:56:55 +01:00
  • 8a848deddc unbreak mocks in tests Matthew Hodgson 2016-09-12 15:52:10 +01:00
  • 2ebd4b15a4 Merge pull request #203 from matrix-org/markjh/try_catch David Baker 2016-09-12 14:32:46 +01:00
  • f0274f3f26 Wrap the crypto event handlers in try/catch blocks Mark Haines 2016-09-12 11:44:31 +01:00
  • 85b2e5d758 fix refactoring bug; emit timelineReset after updating _liveTimeline Matthew Hodgson 2016-09-11 03:23:43 +01:00
  • eef03882ad don't forget to emit timelineResets for normal room resets Matthew Hodgson 2016-09-11 03:23:15 +01:00
  • f7e5d962c0 Merge branch 'develop' into matthew/filtered-timelines Matthew Hodgson 2016-09-11 02:38:50 +01:00
  • 87c6a40b3f reemit timelineReset correctly from Sync Matthew Hodgson 2016-09-11 02:15:29 +01:00
  • e614e17a71 correctly notify when timelineSets get reset Matthew Hodgson 2016-09-10 10:44:48 +01:00
  • b4dc5e620b oops, unbreak notif pagination Matthew Hodgson 2016-09-10 01:36:12 +01:00
  • 0713e65fc5 fix lint Matthew Hodgson 2016-09-10 00:58:16 +01:00
  • b69f6cf70a don't double-add events in Room.addEventsToTimeline also, ignore notif events from initialSync as their time ordering is wrong Matthew Hodgson 2016-09-10 00:52:39 +01:00
  • 2c6409a67a special case 'end' token Matthew Hodgson 2016-09-09 18:45:15 +01:00
  • ad7db78829 only consider rooms when paginating EventTimelines with rooms Matthew Hodgson 2016-09-09 18:05:43 +01:00
  • bd9e3e5794 only call setEventMetadata on unfiltered timelineSets Matthew Hodgson 2016-09-09 17:42:24 +01:00
  • bd32ed5598 refactr paginateNotifTimeline out of existence Matthew Hodgson 2016-09-09 16:49:39 +01:00
  • 5a5257a598 fix comment Matthew Hodgson 2016-09-09 16:41:29 +01:00
  • 75b6ebf287 revert comment position Matthew Hodgson 2016-09-09 16:35:38 +01:00
  • a9d3ae4ef8 fix tests Matthew Hodgson 2016-09-09 16:34:02 +01:00
  • d480b6cf3e remove unnecessary getUnfilteredTimelineSet() Matthew Hodgson 2016-09-09 16:06:10 +01:00
  • fdb640e361 Merge pull request #202 from matrix-org/rav/decryption_warnings Richard van der Hoff 2016-09-09 14:09:05 +01:00
  • 924a8533f1 Merge pull request #201 from matrix-org/rav/DisplayName Richard van der Hoff 2016-09-09 14:08:36 +01:00
  • 72b4f270ff Show warnings on to-device decryption fail Richard van der Hoff 2016-09-09 12:35:01 +01:00
  • 946539e32d s/Displayname/DisplayName/ Richard van der Hoff 2016-09-09 11:31:17 +01:00
  • 9882fed6d7 Merge branch 'develop' into matthew/filtered-timelines Matthew Hodgson 2016-09-09 11:12:42 +01:00
  • 93f45c0a94 reemit notif timeline events correctly Matthew Hodgson 2016-09-09 02:28:01 +01:00
  • c6d358a6f3 doc Room.timeline event correctly Matthew Hodgson 2016-09-09 02:27:51 +01:00
  • 2e4c362ccd make /notification pagination actually work Matthew Hodgson 2016-09-09 02:08:39 +01:00
  • f959e1a134 incorporate PR feedback Matthew Hodgson 2016-09-08 22:38:39 +01:00
  • 7dfc4a404c initial PR fixes Matthew Hodgson 2016-09-08 17:51:14 +01:00
  • 2af349eb72 Merge pull request #200 from matrix-org/rav/oh_hai_new_device Richard van der Hoff 2016-09-08 16:20:59 +01:00
  • 43f3a1e8b3 Merge pull request #199 from matrix-org/rav/share_megolm_state Richard van der Hoff 2016-09-08 16:18:48 +01:00
  • 13c186dfbe fix lint Matthew Hodgson 2016-09-08 15:29:53 +01:00
  • 4d88736d13 add much-needed room.getUnfilteredTimelineSet() helper Matthew Hodgson 2016-09-08 14:37:26 +01:00
  • 1da633e28a Handle new device announcements Richard van der Hoff 2016-09-08 14:10:45 +01:00
  • 879da47f0e Send an "oh hai" message to other e2e users Richard van der Hoff 2016-09-08 07:30:48 +01:00
  • cacafb461d Share the current ratchet with new members Richard van der Hoff 2016-09-08 13:45:12 +01:00
  • 15e285c6b4 Merge pull request #198 from matrix-org/rav/refactor_crypto Richard van der Hoff 2016-09-08 13:35:38 +01:00
  • 71c33420f6 Move crypto bits into a subdirectory Richard van der Hoff 2016-09-08 09:47:55 +01:00
  • e7f70bba5c Merge pull request #197 from matrix-org/rav/refactor_crypto_event_handler Richard van der Hoff 2016-09-08 09:44:31 +01:00
  • e4ec2aa55f maintain the global notification timeline set. Matthew Hodgson 2016-09-08 02:57:49 +01:00
  • fc495a5f1e fix lint Matthew Hodgson 2016-09-08 00:18:17 +01:00
  • 6fe4dfcad0 Refactor event handling in Crypto Richard van der Hoff 2016-09-07 22:10:52 +01:00
  • dac820f957 actually filter /messages Matthew Hodgson 2016-09-07 22:04:12 +01:00
  • 91f8df8d19 make EventTimeline take an EventTimelineSet Matthew Hodgson 2016-09-07 21:17:06 +01:00
  • 9b507f6c6c Merge branch 'develop' into matthew/filtered-timelines Matthew Hodgson 2016-09-07 20:34:57 +01:00
  • 5e583d3c50 populate up filtered timelineSets vaguely correctly Matthew Hodgson 2016-09-07 19:45:30 +01:00
  • d706b57fe9 Merge pull request #195 from matrix-org/rav/lazy_olm Richard van der Hoff 2016-09-07 19:19:07 +01:00
  • 1063a16013 Don't create Olm sessions proactively Richard van der Hoff 2016-09-07 18:44:02 +01:00
  • 46a2073427 Merge pull request #194 from matrix-org/rav/use_todevice_events Richard van der Hoff 2016-09-07 14:01:57 +01:00
  • d7bb9574e7 Merge pull request #193 from matrix-org/rav/update_readme Richard van der Hoff 2016-09-07 14:00:24 +01:00
  • 9c18893ae5 Use to-device events for key sharing Richard van der Hoff 2016-09-07 13:56:54 +01:00
  • 4503c320e5 README: callbacks deprecated Richard van der Hoff 2016-09-07 11:35:33 +01:00
  • c4995bd153 fix filtering Matthew Hodgson 2016-09-07 02:17:03 +01:00
  • af0f5b37d8 Bump to olm 1.2.0 Richard van der Hoff 2016-09-06 22:29:33 +01:00
  • b9ba4671b4 Merge pull request #192 from matrix-org/rav/verified_megolm_senders Richard van der Hoff 2016-09-06 22:22:20 +01:00
  • 50b8f13037 Fix sender verification for megolm messages Richard van der Hoff 2016-09-06 16:38:16 +01:00
  • 4aa9dca608 Merge pull request #191 from matrix-org/rav/ciphertext_field Richard van der Hoff 2016-09-06 16:25:35 +01:00
  • 98dc5328a0 Use ciphertext instead of body in megolm events Richard van der Hoff 2016-09-06 16:23:23 +01:00
  • 408671b58a Megolm: Remove check for signature field Richard van der Hoff 2016-09-06 15:59:57 +01:00
  • 1bda527e3d export EventTimelineSet Matthew Hodgson 2016-09-06 01:04:23 +01:00
  • e0f1b9ebf0 Merge pull request #189 from matrix-org/rav/get_olm_sessions_for_user Richard van der Hoff 2016-09-05 10:38:57 +01:00
  • 55127aa43f Merge pull request #190 from matrix-org/rav/get_stored_devices Richard van der Hoff 2016-09-05 10:38:12 +01:00
  • 888fbe3549 fix some lint Matthew Hodgson 2016-09-05 02:44:46 +01:00
  • ed5c061566 move getOrCreateClient from sync.js to client.js Matthew Hodgson 2016-09-05 02:44:24 +01:00
  • df6b1d1471 Add debug methods to get the state of OlmSessions Richard van der Hoff 2016-09-05 00:03:21 +01:00
  • 5e0f09075d MatrixClient.getStoredDevicesForUser Richard van der Hoff 2016-09-04 23:31:38 +01:00
  • 2daa1b6007 change TimelineWindow to take a timelineSet rather than a Room Matthew Hodgson 2016-09-04 13:57:56 +01:00
  • 4ff2ad9fac s/EventTimelineList/EventTimelineSet/g at vdh's req Matthew Hodgson 2016-09-03 22:27:29 +01:00
  • ba06e8091f Merge branch 'develop' into matthew/filtered-timelines Matthew Hodgson 2016-09-03 13:33:15 +01:00
  • 692b3107ac Merge pull request #188 from matrix-org/rav/cleanups Richard van der Hoff 2016-09-02 15:39:15 +01:00
  • 6baf9e1c37 Olm-related cleanups Richard van der Hoff 2016-09-02 11:33:50 +01:00
  • c07e662b90 Update to olm 1.1.0 Richard van der Hoff 2016-09-02 11:18:58 +01:00
  • aca8b32e5b Merge pull request #186 from matrix-org/matthew/uninterrupted-audio Matthew Hodgson 2016-09-01 10:54:20 +01:00
  • 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 Matthew Hodgson 2016-08-31 21:52:24 +01:00