conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	externalized string 'Retry decryption'trz/merge_1.10.1	steckbrief	2016-02-28	1	-1/+1
\|
*	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-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 menu	fiaxh	2016-02-23	1	-0/+4
\| \|
* \|	Removed stupid message correction	steckbrief	2016-02-23	1	-4/+0
\| \|
* \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-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 #864	Daniel Gultsch	2016-02-15	1	-0/+4
\| \|
\| *	refactored message context menu	Daniel Gultsch	2015-07-02	1	-7/+13
\| \|
* \|	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵	steckbrief	2015-10-04	1	-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.1	lookshe	2015-08-11	1	-7/+13
\|/
*	context menu for files and offered files. fixed #848 fixed #849	Daniel Gultsch	2015-01-12	1	-2/+2
\|
*	made file transfers cancelable	iNPUTmice	2014-11-15	1	-0/+3
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-0/+20
	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib