aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * Add matrix_api_download_fileDr. David Alan Gilbert2016-11-132-0/+60
| * Pass body/len/content_type to completion callbackDr. David Alan Gilbert2016-11-134-9/+30
| * Fix bogus matrix_api_upload_file urlDr. David Alan Gilbert2016-11-031-1/+1
|/
* Merge pull request #19 from brycied00d/HTML_Escape_FixRichard van der Hoff2016-10-251-3/+9
|\
| * Unescape the HTML-escaped HTML.Bryce Chidester2016-10-251-3/+9
* | Merge pull request #17 from penguin42/masterRichard van der Hoff2016-10-162-2/+24
|\|
| * Allow building on libpurple 2.10.xDr. David Alan Gilbert2016-10-162-2/+24
|/
* Merge pull request #14 from penguin42/masterRichard van der Hoff2016-09-047-21/+363
|\
| * Add my self to AUTHORS.rstDr. David Alan Gilbert2016-09-031-0/+2
| * Send inserted imagesDr. David Alan Gilbert2016-09-032-2/+220
| * event hooksDr. David Alan Gilbert2016-09-033-2/+26
| * api: Upload a fileDr. David Alan Gilbert2016-09-032-0/+57
| * api: Allow extra_headers to be passedDr. David Alan Gilbert2016-09-031-5/+10
| * api: Allow binary data to be sentDr. David Alan Gilbert2016-09-031-17/+53
|/
* we require CS API r0.0.0.Richard van der Hoff2016-08-231-1/+1
* Merge pull request #12 from penguin42/emoteRichard van der Hoff2016-07-112-5/+24
|\
| * Send outgoing emotesDr. David Alan Gilbert2016-07-102-3/+9
| * Handle incoming emotesDr. David Alan Gilbert2016-07-101-2/+15
* | Merge pull request #11 from penguin42/empty-room-nameRichard van der Hoff2016-07-111-1/+1
|\|
| * Ignore empty m.room.nameDr. David Alan Gilbert2016-07-031-1/+1
|/
* Update AUTHORS/CONTRIBUTING/CHANGESRichard van der Hoff2016-01-043-0/+12