aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-7/+6
|\
| * check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
* | Imports organizedsteckbrief2016-02-121-1/+0
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-9/+6
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-35/+81
|\|
| * encrypt pgp messages to selfDaniel Gultsch2015-11-261-8/+8
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-2/+10
| * Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-241-13/+29
| |\
| | * Use OpenPGP-API 9.0fiaxh2015-11-091-13/+29
| * | PgpEngine: Get account from conversation instead of from contact. fixes #1568...fiaxh2015-11-151-3/+3
| |/
| * Decrypt PGP messages in backgroundfiaxh2015-10-281-0/+19
| * Optimize importsAndreas Straub2015-07-201-7/+8
| * 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 filesDaniel 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
* | 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-11-061-10/+8
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-2/+3
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-369/+0
* | | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-2/+2
* | | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-8/+12
|/ /
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:34:58 +0000