aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-10-13Merge remote-tracking branch 'origin/pedroc/android_e2e' into pedroc/android_...pedroGitt
2016-10-13- Fix encrypt API (update lencrypted ength)PedroGitt
2016-10-12Temp commit: debug in progresspedroGitt
2016-10-11- Add OlmSession unit testpedroGitt
2016-10-07- Add decryptMessageJni() to olm_session.cpp APIpedroGitt
2016-10-06- Update Unit tests for OlmAccountpedroGitt
2016-10-06Update Account unit testspedroGitt
2016-10-06- Add missing filepedroGitt
2016-10-05First commit adding Olm Lib for AndroidpedroGitt
2016-10-05First commit on depopedroGitt
2016-09-23Merge branch 'rav/megolm_spec'Richard van der Hoff
2016-09-23megolm.rst: link to protobuf specRichard van der Hoff
2016-09-22More review feedbackRichard van der Hoff
2016-09-22Merge branch 'rav/python_fixes'Richard van der Hoff
2016-09-22InboundGroupSession.init no longer requires a separate message_indexRichard van der Hoff
2016-09-22Handle non-base64 chars in pickle filesRichard van der Hoff
2016-09-22megolm.rst: review feedbackRichard van der Hoff
2016-09-22megolm.rst: linkify Ed25519Richard van der Hoff
2016-09-22Megolm.rst: add Background and footerRichard van der Hoff
2016-09-22First stab at a megolm specRichard van der Hoff
2016-09-16Merge pull request #25 from matrix-org/markjh/fix_jenkinsMark Haines
2016-09-16Fix jenkins.shMark Haines
2016-09-16Merge pull request #24 from matrix-org/rav/one_time_keys_commentRichard van der Hoff
2016-09-16Update comment on olm_account_one_time_keysRichard van der Hoff
2016-09-14Fix the release instructionsMark Haines
2016-09-14Changelog and version bump for 1.3.01.3.0Mark Haines
2016-09-14Make release instructions more C+PableMark Haines
2016-09-14Fix the group javascript demoMark Haines
2016-09-13Merge remote-tracking branch 'matrix/master'Mark Haines
2016-09-13Merge pull request #23 from matrix-org/markjh/remove_message_indexMark Haines
2016-09-13Merge pull request #22 from matrix-org/markjh/inbound_group_session_idMark Haines
2016-09-13Remove the messsage index from olm_init_inbound_group_session since it is rea...Mark Haines
2016-09-13Add a test to check the equivalence of session ids for inbound and outbound s...Mark Haines
2016-09-13Add a olm_inbound_group_session_id methodMark Haines
2016-09-13Merge pull request #21 from matrix-org/markjh/fix_session_idsMark Haines
2016-09-13``if`` is not the same as ``for``Mark Haines
2016-09-13Comment on the encoding of the message counter.Mark Haines
2016-09-13Use the ed22519 public key as the group session id.Mark Haines
2016-09-06call double ratchet what it isMatthew Hodgson
2016-09-06Bump version numbers to 1.2.01.2.0Richard van der Hoff
2016-09-06Merge pull request #20 from matrix-org/rav/prep_v1.2.0Richard van der Hoff
2016-09-06Prepare changelog for v1.2.0Richard van der Hoff
2016-09-06Merge pull request #19 from matrix-org/rav/megolm_signingRichard van der Hoff
2016-09-06Sign megolm messagesRichard van der Hoff
2016-09-06Clean up some typosRichard van der Hoff
2016-09-06Merge pull request #18 from matrix-org/rav/pickle_ed25519_in_cRichard van der Hoff
2016-09-06Merge pull request #17 from matrix-org/rav/group_session_error_handlingRichard van der Hoff
2016-09-05Fix error handling for group sessionsRichard van der Hoff
2016-09-05remove js package before buildingRichard van der Hoff
2016-09-05pack the js after buildingRichard van der Hoff