aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.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-1/+23
|\
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-8/+0
| * show status messages in contact detailsDaniel Gultsch2016-04-231-1/+23
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-1/+1
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-1/+1
|\|
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-201-1/+1
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-1/+1
|\|
| * changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+1
* | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-4/+4
|\|
| * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-4/+4
| * set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+0
* | Imports organizedsteckbrief2016-02-121-4/+0
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+1
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-16/+73
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-1/+1
| * code cleanupDaniel Gultsch2015-12-231-3/+4
| * show certificate informationDaniel Gultsch2015-12-231-1/+43
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-9/+0
| * Reset the margins manually after rotatingsaqura2015-10-261-0/+9
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-1/+2
| * Only show that have sessions in fingerprint listAndreas Straub2015-09-061-5/+3
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-1/+8
| * Highlight selected message's fingerprint in listAndreas Straub2015-07-291-1/+4
| * Add INACTIVE state for removed keysAndreas Straub2015-07-211-1/+7
| * Add purge axolotl key optionAndreas Straub2015-07-201-2/+1
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-12/+5
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-48/+1
| * Fix trust status for outgoing messagesAndreas Straub2015-07-191-3/+3
| * Add key trust toggle to ContactDetailsActivityAndreas Straub2015-07-191-10/+39
| * Display trust status in ContactDetailsActivityAndreas Straub2015-07-191-0/+3
| * Adapt prettifyFingerprint() to axolotl FP sizesAndreas Straub2015-07-191-1/+1
| * Fix displaying Contact IdentityKeysAndreas Straub2015-07-191-1/+2
| * Added axolotl activation code to UIAndreas Straub2015-07-191-0/+20
| * reworked handeling of system contactsDaniel Gultsch2015-06-031-22/+20
| * fixed npe when rotating screen in contact details activityDaniel Gultsch2015-04-281-4/+8
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-1/+3
|\ \
* | | Merge trz/rename into trz/rebasesteckbrief2015-10-221-4/+2
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-0/+2
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-471/+0
| |/
* / Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-26/+28
|/
* limit ui refresh rateiNPUTmice2015-02-171-15/+7
* always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-38/+73
* Add block/unblock to contact details menuSam Whited2015-01-211-2/+15
* improved OTR verification part oneDaniel Gultsch2015-01-021-3/+3
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-28/+42
* remove unused imports.Michael2014-11-211-2/+0
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-33/+26
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-4/+2
* Make account status an enumSam Whited2014-11-151-1/+1
* auto register/unregister listenersiNPUTmice2014-11-111-160/+137