aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * e2e: Route decrypted messages back upDr. David Alan Gilbert2018-02-253-12/+52
| * e2e: Decrypt m.room.encryptedDr. David Alan Gilbert2018-02-253-0/+125
| * e2e: handle m.room_keyDr. David Alan Gilbert2018-02-251-2/+77
| * e2e: Provide storage for inbound megolm sessionsDr. David Alan Gilbert2018-02-251-0/+100
| * e2e: Handle the decrypted olm messagesDr. David Alan Gilbert2018-02-251-0/+86
| * e2e: decrypt olm encrypted messageDr. David Alan Gilbert2018-02-251-1/+121
| * e2e: Parse received d2d m.room.encrypted messagesDr. David Alan Gilbert2018-02-253-1/+58
| * e2e: Route key count from syncDr. David Alan Gilbert2018-02-252-1/+7
| * e2e: Reorg sync to parse d2d messagesDr. David Alan Gilbert2018-02-251-11/+52
| * e2e: Wire in sqlite3 to hold e2e databasesDr. David Alan Gilbert2018-02-252-1/+90
| * e2e: Parse key upload returnDr. David Alan Gilbert2018-02-251-1/+20
| * e2e: Create and send one time keysDr. David Alan Gilbert2018-02-251-1/+119
| * e2e: parse sync_key_counts to decide on key sendingDr David Alan Gilbert2018-02-252-0/+45
| * e2e: Retrieve or create Olm account state, send keysDr. David Alan Gilbert2018-02-253-2/+170
| * e2e: get_id_keysDr. David Alan Gilbert2018-02-251-0/+58
| * e2e: get_randomDr. David Alan Gilbert2018-02-251-0/+20
| * e2e: Restore OLM account state from Purple account dataDr. David Alan Gilbert2018-02-251-0/+77
| * e2e: Store OLM account state to the Purple Account dataDr. David Alan Gilbert2018-02-252-0/+53
| * e2e: Add clear_memDr. David Alan Gilbert2018-02-251-0/+15
| * matrix-json: Add debug to dump json to stderrDr. David Alan Gilbert2018-02-252-0/+18
| * e2e: Add matrix_sign_jsonDr. David Alan Gilbert2018-02-252-0/+48
| * e2e: Create MatrixE2EData type and matrix-e2e.[ch] filesDr. David Alan Gilbert2018-02-254-0/+62
| * e2e: Add matrix_api_upload_keysDr. David Alan Gilbert2018-02-252-0/+70
| * Canonical json generatorDr. David Alan Gilbert2018-02-252-0/+107
| * matrix-json: Replace tabsDr. David Alan Gilbert2018-02-251-45/+45
| * e2e: Link with libolmDr. David Alan Gilbert2018-02-253-0/+15
* | Merge pull request #73 from penguin42/chunked-72Dave Gilbert2018-03-251-11/+25
|\ \ | |/ |/|
| * api: Handle chunked messagesDr. David Alan Gilbert2018-03-251-11/+25
|/
* Merge pull request #62 from radiocane/mediaDave Gilbert2018-02-243-65/+137
|\
| * [matrix-room] Update thumbnail request to r0.3.0White_Rabbit2018-02-221-11/+32
| * Improve media handlingWhite_Rabbit2018-02-223-64/+115
* | Merge pull request #29 from zamaudio/join-roomDave Gilbert2018-02-211-2/+2
|\ \
| * | matrix-api: Fix join by alias or room-idDamien Zammit2017-12-091-2/+2
| |/
* | Merge pull request #66 from radiocane/masterDave Gilbert2018-02-201-2/+11
|\ \
| * | [README] Add Ubuntu pre-built binaries. Fixes #58White_Rabbit2017-11-161-2/+11
| |/
* | Merge pull request #69 from penguin42/typing-crash-fixDave Gilbert2018-02-201-9/+13
|\ \
| * | typing: Fix crash on typing notification to someone not presentDr. David Alan Gilbert2018-02-201-9/+13
| |/
* | Merge pull request #68 from radiocane/w_r/small_stuffDave Gilbert2018-02-201-1/+1
|\ \ | |/ |/|
| * [Makefile] Change fixed pkg-config into variable PKG_CONFIGWhite_Rabbit2017-12-151-1/+1
|/
* Merge pull request #60 from radiocane/masterMatthew Hodgson2017-09-271-1/+1
|\
| * [README] Add xenial-specific libglib packageWhite_Rabbit2017-09-271-1/+1
|/
* Merge pull request #56 from penguin42/response-too-long-hack1Dave Gilbert2017-09-021-1/+1
|\
| * bump up max reply sizeDr. David Alan Gilbert2017-09-021-1/+1
|/
* Merge pull request #53 from vn971/patch-1Richard van der Hoff2017-07-241-0/+1
|\
| * rewordingVasya Novikov2017-07-241-1/+1
| * mention OLM in readmeVasya Novikov2017-07-241-0/+1
|/
* Merge pull request #38 from EionRobb/typing-notifications3Richard van der Hoff2017-05-307-2/+206
|\
| * Responding to PR commentsEion Robb2017-05-285-15/+16
| * Merge branch 'master' into typing-notifications3Eion Robb2017-05-285-12/+47
| |\ | |/ |/|
* | Merge pull request #47 from EionRobb/html-messagesMatthew Hodgson2017-05-282-4/+16
|\ \