aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* remove unused imports.Michael2014-11-211-1/+0
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-1/+1
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-5/+13
* sent read marker to full jidiNPUTmice2014-11-191-2/+2
* better usage of synchronized in some placesiNPUTmice2014-11-181-5/+1
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-4/+2
* added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+4
* initial smp supportiNPUTmice2014-11-111-2/+28
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-5/+5
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-34/+40
* Make conversations the root projectSam Whited2014-10-221-0/+500