aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-111-1/+0
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-111-7/+12
|\
| * renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-101-1/+1
| * changed mime type handlingDaniel Gultsch2015-07-011-1/+1
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-2/+2
| * refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-301-1/+1
| * untested pgp support for http uploadDaniel Gultsch2015-06-291-5/+9
* | implementation for downloading only when enabled wlanlookshe2015-04-121-0/+3
* | no trim of messages or passwordlookshe2015-04-111-1/+1
|/
* do not check image file size over http if accepted file size is 0Daniel Gultsch2015-01-111-3/+6
* some mime and pgp fixes for file transferiNPUTmice2014-11-151-20/+1
* support for pgp filesiNPUTmice2014-11-151-2/+4
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-7/+7
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-27/+13
* Merge branch 'gradle' into developmentSam Whited2014-10-301-18/+27
* Make conversations the root projectSam Whited2014-10-221-0/+385