aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/menu/message_context.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* externalized string 'Retry decryption'trz/merge_1.10.1steckbrief2016-02-281-1/+1
|
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * Retry decryption from message menufiaxh2016-02-231-0/+4
| |
* | Removed stupid message correctionsteckbrief2016-02-231-4/+0
| |
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/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-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+4
| |
| * refactored message context menuDaniel Gultsch2015-07-021-7/+13
| |
* | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-041-1/+4
| | | | | | | | | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-7/+13
|/
* context menu for files and offered files. fixed #848 fixed #849Daniel Gultsch2015-01-121-2/+2
|
* made file transfers cancelableiNPUTmice2014-11-151-0/+3
|
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+20
Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib