aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-271-26/+30
|\
| * hide fingerprints in UI if encryption is disabledDaniel Gultsch2016-05-251-26/+30
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-221-1/+1
|\|
| * show hint in subject quick edit. only show subject as presetDaniel Gultsch2016-05-221-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-151-2/+2
|\|
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-8/+0
* | readd last seen info to contactDetailsChristian Schneppe2016-05-141-1/+8
* | add share contact to ContactDetailsChristian Schneppe2016-05-141-0/+18
* | do not show last-seen metric in UIDaniel Gultsch2016-05-131-8/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-2/+24
|\|
| * show status messages in contact detailsDaniel Gultsch2016-04-231-1/+23
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-1/+1
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-1/+1
|\|
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-201-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+1
|\|
| * changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-4/+4
|\|
| * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-4/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-02-231-1/+0
|\|
| * set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-1/+1
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-1/+1
* | copy commitsChristian S2015-12-281-1/+44
|\|
| * code cleanupDaniel Gultsch2015-12-231-3/+4
| * show certificate informationDaniel Gultsch2015-12-231-1/+43
* | copy commitsChristian S2015-11-291-9/+0
|\|
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-9/+0
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-0/+9
|\|
| * Reset the margins manually after rotatingsaqura2015-10-261-0/+9
* | copy commitsChristian S2015-10-171-1/+2
|\|
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-1/+2
* | Version 1.6.9Christian S2015-09-121-5/+3
|\|
| * Only show that have sessions in fingerprint listAndreas Straub2015-09-061-5/+3
* | copy commitsChristian S2015-08-081-1/+7
|\|
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-1/+8
* | copy commitsChristian S2015-08-021-1/+4
|\|
| * Highlight selected message's fingerprint in listAndreas Straub2015-07-291-1/+4
* | copy commitsChristian S2015-07-231-1/+7
|\|
| * Add INACTIVE state for removed keysAndreas Straub2015-07-211-1/+7
* | copy commitsChristian S2015-07-201-15/+13
|\|
| * 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
* | resize avatar viewsChristian S2015-07-081-1/+2