aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-1/+0
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-161-2/+7
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-1/+7
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-5/+1
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-6/+1
| * only add image files to media scannerDaniel Gultsch2016-03-231-3/+1
* | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-8/+3
* | Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...steckbrief2016-02-131-1/+2
* | Imports organizedsteckbrief2016-02-121-5/+0
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-3/+2
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-24/+61
|\|
| * initial tor supportDaniel Gultsch2015-12-011-1/+10
| * use Conversations 1.x.y as user agent string in http upload and downloadDaniel Gultsch2015-09-231-0/+1
| * work around a NPE caused by arace condition in the http uploadDaniel Gultsch2015-09-151-3/+6
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-1/+8
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-101-0/+4
| * use content-type in http slot request and stick with during uploadDaniel Gultsch2015-08-011-1/+4
| * fixed calculated file size in http slot requestDaniel Gultsch2015-08-011-15/+13
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-011-18/+6
| * use gcm for file encryption over httpDaniel Gultsch2015-07-291-6/+26
| * changed logging. (work around logcat null pointerDaniel Gultsch2015-07-281-1/+1
| * attempt to fix the delay problemDaniel Gultsch2015-07-201-3/+5
| * Optimize importsAndreas Straub2015-07-201-1/+1
| * Encrypt files for HTTP upload in encrypted chatsAndreas Straub2015-07-191-1/+3
| * bugfix: accept status code 201 on http uploadDaniel Gultsch2015-07-191-1/+1
| * renamed downloadable to transferableDaniel Gultsch2015-07-101-5/+5
| * get file upload ready to work with httpsDaniel Gultsch2015-07-101-0/+5
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-2/+2
| * untested pgp support for http uploadDaniel Gultsch2015-06-291-1/+22
| * added trigger to Config.java to always enable aes encryption for uploaded filesDaniel Gultsch2015-06-291-0/+13
| * show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-0/+1
| * initial http upload supportDaniel Gultsch2015-06-291-0/+164
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-1/+2
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-4/+4
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-4/+6
* Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-0/+204
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 03:41:53 +0000