aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Conversation.java (unfollow)
Commit message (Expand)AuthorFilesLines
2014-11-16parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice1-4/+2
2014-11-11added snackbar to indicate smp. more error handling in verify activityiNPUTmice1-0/+4
2014-11-11initial smp supportiNPUTmice1-2/+28
2014-11-10added snackbar to indicate smp. more error handling in verify activityiNPUTmice1-0/+4
2014-11-10initial smp supportiNPUTmice1-2/+28
2014-11-09refactored code to always contain full jid for counterpartiNPUTmice1-5/+5
2014-11-09Move a chunk of classes over to using JID objectsSam Whited1-34/+40
2014-10-22Make conversations the root projectSam Whited1-0/+0