conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-237/+0
*	changed last message in overview also to EmojiconTextView for displaying smil...	lookshe	2015-04-12	1	-1/+3
*	show online status under avatar in same way for muc as the send button does	lookshe	2015-04-11	1	-13/+18
*	Changes for emoticon parser reactivated	steckbrief	2015-03-31	1	-1/+3
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-3/+92
\|\
\| *	properly remove invalid avatar	iNPUTmice	2015-02-22	1	-0/+1
\| *	always call to cancel before loading new avatars	iNPUTmice	2015-02-18	1	-12/+14
\| *	made image view background more colorful while waiting on actual avatar to load	iNPUTmice	2015-02-15	1	-1/+1
\| *	loading avatars in seperate tasks	iNPUTmice	2015-02-15	1	-2/+88
* \|	Merge master-origin	steckbrief	2015-02-20	1	-93/+41
\|\\|
\| *	fixed missing image preview	iNPUTmice	2015-01-20	1	-1/+1
\| *	reworked message preview / message meta information (ie file offered, receive...	Daniel Gultsch	2015-01-12	1	-91/+32
\| *	Add XEP-0245 (/me command) support	Sam Whited	2015-01-11	1	-9/+10
* \|	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-3/+25
* \|	Setting added for parsing emoticons or not	Tristan Zur	2015-01-11	1	-1/+4
* \|	Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter fo...	Tristan Zur	2015-01-10	1	-1/+2
* \|	Merge branch 'master' of ssh://git.fucktheforce.de/conversations	lookshe	2015-01-03	1	-10/+9
\|\\|
\| *	Add support for XEP-0191 (Blocking command)	Sam Whited	2014-12-22	1	-9/+9
\| *	cleanup: removed unused emoticon parsing	iNPUTmice	2014-12-09	1	-5/+1
* \|	remaining part of my patch	lookshe	2015-01-03	1	-3/+2
\|/
*	fixed description in notifications and conversation overview	iNPUTmice	2014-11-15	1	-1/+11
*	adepted conversationadapter to deal with files	iNPUTmice	2014-11-15	1	-3/+21
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-1/+1
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-6/+10
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+135