aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/activity_contact_details.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-8/+1
| |
| * show status messages in contact detailsDaniel Gultsch2016-04-231-16/+19
| |
| * Reset the margins manually after rotatingsaqura2015-10-261-0/+1
| |
| * renamed colorsDaniel Gultsch2015-07-131-6/+6
| |
* | Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-041-5/+5
| |
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-6/+6
|/
* always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-0/+7
|
* make use of different dimensions for different screen sizesDaniel Gultsch2015-01-131-4/+10
|
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-12/+7
|
* Wrap "last seen" time.Sam Whited2014-11-031-2/+1
| | | | Fixes #611
* Make conversations the root projectSam Whited2014-10-221-0/+114
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 07:56:51 +0000