aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
|\ \
| * | Fix whitespace and a memleakEion Robb2017-05-282-9/+11
| * | Support HTML formatting on sending/receiving messagesEion Robb2017-05-232-5/+15
|/ /
* | Merge pull request #46 from penguin42/fixesDave Gilbert2017-05-271-1/+1
|\ \
| * | Fix image uploadDr. David Alan Gilbert2017-05-271-1/+1
|/ /
* | Merge pull request #44 from penguin42/fixesDave Gilbert2017-04-171-3/+1
|\ \
| * | Fix image downloadDr. David Alan Gilbert2017-04-171-3/+1
|/ /
* | Merge pull request #40 from EionRobb/reuse-device-idRichard van der Hoff2017-03-133-4/+13
|\ \
| * | Re-use the device-id provided by the serverEion Robb2017-03-123-4/+13
* | | Merge pull request #39 from EionRobb/room-topicsRichard van der Hoff2017-03-131-0/+16
|\ \ \ | |/ / |/| |
| * | Support display of room topicsEion Robb2017-03-121-0/+16
|/ /
| * Fix crash when typing in a non-matrix MUCEion Robb2017-03-131-3/+2
| * Send/receive typing notificationsEion Robb2017-03-127-2/+206
|/
* Merge pull request #24 from zamaudio/enable-inviteRichard van der Hoff2017-01-055-2/+78
|\
| * Enable room invites when matrix handle is knownDamien Zammit2017-01-055-2/+78
* | Merge pull request #25 from penguin42/escaping-fixRichard van der Hoff2017-01-031-5/+11
|\ \
| * | Escape incoming message bodiesDr. David Alan Gilbert2017-01-021-5/+11
| |/
* | Merge pull request #23 from penguin42/send-imagesRichard van der Hoff2017-01-033-7/+92
|\ \ | |/ |/|
| * Download thumbnails for images that are too largeDr. David Alan Gilbert2016-12-271-7/+22
| * Add matrix_api_download_thumbDr. David Alan Gilbert2016-12-272-0/+70
|/
* Merge pull request #21 from penguin42/send-imagesRichard van der Hoff2016-11-205-12/+252
|\
| * Download imagesDr. David Alan Gilbert2016-11-132-2/+161