aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-8/+8
|\|
* | 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
|\|
* | Merge trz/rename into trz/rebasesteckbrief2015-10-221-1/+2
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-197-1166/+0
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-2/+2
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-113-30/+40
|/
* implementation for downloading only when enabled wlanlookshe2015-04-121-0/+3
* no trim of messages or passwordlookshe2015-04-111-1/+1
* respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-211-3/+15
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+14
* otr4j: update to 0.22Michael2015-01-201-0/+6
* do not check image file size over http if accepted file size is 0Daniel Gultsch2015-01-111-3/+6
* some further otr improvementsDaniel Gultsch2015-01-021-1/+1
* prefer PLAIN over DIGEST-MD5Daniel Gultsch2015-01-021-1/+1
* improved OTR verification part oneDaniel Gultsch2015-01-021-3/+3
* mark otr messages as no-store for mamiNPUTmice2014-12-101-0/+1
* fixed digest-md5iNPUTmice2014-12-041-0/+4
* Make sure SASL tokenizer strips stringsSam Whited2014-12-022-1/+5
* remove unused imports.Michael2014-11-211-2/+0
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-3/+7
* Don't escape passwords in SASLSam Whited2014-11-151-2/+2
* Cache SCRAM-SHA-1 keys for current sessionSam Whited2014-11-151-10/+47
* Add auth method pinningSam Whited2014-11-154-3/+30
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-151-22/+5
|\
| * some mime and pgp fixes for file transferiNPUTmice2014-11-151-20/+1
| * support for pgp filesiNPUTmice2014-11-151-2/+4
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-151-17/+55
|\ \ | |/ |/|
| * initial smp supportiNPUTmice2014-11-111-17/+55
* | Improve auth error handling and state machineSam Whited2014-11-154-32/+36
* | Add SCRAM-SHA1 supportSam Whited2014-11-146-80/+375
* | Refactor authentication codeSam Whited2014-11-123-0/+124
|/
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-092-8/+8
* Move a chunk of classes over to using JID objectsSam Whited2014-11-092-33/+17
* Merge branch 'gradle' into developmentSam Whited2014-10-301-18/+27
* Make conversations the root projectSam Whited2014-10-222-0/+616