aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Contact.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-23/+10
|\
| * removed unused config variablesDaniel Gultsch2016-04-271-3/+1
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-20/+10
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+1
|\ \
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-505/+0
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-5/+14
|\ \ \ | | |/ | |/|
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+11
| * | reset pending subscription request when receiving roster updateDaniel Gultsch2016-02-231-0/+2
| * | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-11/+21
|\| |
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-021-9/+14
| |\ \
| | * | Use a Presence class for presence informationStephen Paul Weber2016-01-241-9/+14
| * | | re-read common name from certificates on startupDaniel Gultsch2016-02-021-2/+7
| |/ /
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-67/+79
|\| |
| * | use presence name not server name when verification is being usedDaniel Gultsch2015-12-191-3/+3
| * | prefer server name over address book name when x509 verification is being usedDaniel Gultsch2015-12-191-1/+4
| * | Optimize importsAndreas Straub2015-07-201-5/+0
| * | Fix displaying Contact IdentityKeysAndreas Straub2015-07-191-64/+0
| * | Reformat code to use tabsAndreas Straub2015-07-191-10/+10
| * | Reworked axolotl protocol layerAndreas Straub2015-07-191-19/+43
| * | CryptoNext persistance layer mockupAndreas Straub2015-07-191-64/+118
| * | reworked handeling of system contactsDaniel Gultsch2015-06-031-2/+10
| * | changed conversation red to material redDaniel Gultsch2015-05-101-2/+2
| * | r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch2015-05-051-7/+19
| |/
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-1/+1
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-11/+31
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+6
|/
* Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-111-1/+1
* improved OTR verification part oneDaniel Gultsch2015-01-021-1/+1
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-16/+36
* more null checks for otr fingerprintsiNPUTmice2014-12-201-1/+1
* don't include empty fingerprints in list of otrfingerprintsiNPUTmice2014-12-201-4/+6
* Use `Locale.US' for string comparisons in searchSam Whited2014-11-171-3/+7
* trim search before searchingiNPUTmice2014-11-171-2/+2
* split search keywords by whitespaces and imply AND operatioriNPUTmice2014-11-171-1/+11
* made tags searchableiNPUTmice2014-11-161-119/+125
* happy hanukkahiNPUTmice2014-11-161-11/+62
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-11/+24
* Create avatar's for JID's w/o localpartsSam Whited2014-11-091-6/+8
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-46/+53
* Add last seen info to the databaseSam Whited2014-11-041-13/+36
* Make conversations the root projectSam Whited2014-10-221-0/+367
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 03:46:03 +0000