conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-92/+0
\| \| \| \| \| \|	"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
*	changed received and read confirmation setting to one list and put it to ↵	lookshe	2015-04-14	1	-2/+3
\| \| \| \|	settings class
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
\| *	avoid unnecessary thread creation	iNPUTmice	2015-03-05	1	-1/+1
\| \|
* \|	Merge master-origin	steckbrief	2015-02-20	1	-0/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.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/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
\| *	adapt caps on whether or not message confirmation is on	iNPUTmice	2015-01-26	1	-0/+8
\| \|
* \|	- Avoiding accessing shared preferences to know if emoticons should be ↵	steckbrief	2015-01-20	1	-14/+19
\|/ \| \| \| \| \|	parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
*	remove unused imports.	Michael	2014-11-21	1	-1/+0
\|
*	turn on foreground service in expert settings	iNPUTmice	2014-11-15	1	-0/+2
\|
*	It builds again!	Sam Whited	2014-11-09	1	-2/+4
\|
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+74