conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	steckbrief	2015-06-19	1	-2/+4
*	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	5	-0/+33
*	changed received and read confirmation setting to one list and put it to sett...	lookshe	2015-04-14	4	-13/+7
*	check with lowercase to also match JPEG, JPeg ...	lookshe	2015-04-13	1	-1/+1
*	changed last message in overview also to EmojiconTextView for displaying smil...	lookshe	2015-04-12	1	-1/+3
*	better and perhaps faster way for checking if a message is downloadable	lookshe	2015-04-12	1	-10/+18
*	implementation for downloading only when enabled wlan	lookshe	2015-04-12	4	-3/+30
*	added settings for accepting and downloading files	lookshe	2015-04-12	1	-1/+2
*	whatsapp-like smiley implementation	lookshe	2015-04-12	3	-19/+143
*	whatsapp-like smiley implemantation	lookshe	2015-04-12	1	-1/+2
*	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...	steckbrief	2015-04-11	4	-19/+25
\|\
\| *	show online status under avatar in same way for muc as the send button does	lookshe	2015-04-11	1	-13/+18
\| *	differ between received and read message	lookshe	2015-04-11	3	-6/+7
* \|	Color choose dialog	steckbrief	2015-04-11	1	-10/+2
\|/
*	no trim of messages or password	lookshe	2015-04-11	5	-9/+11
*	correct parsing of led color	lookshe	2015-04-11	1	-1/+1
*	timestamp parsing reverted	steckbrief	2015-03-31	1	-5/+20
*	Configurable LED color (Attention: Expert setting because currently only text...	steckbrief	2015-03-31	1	-1/+10
*	Changes for emoticon parser reactivated	steckbrief	2015-03-31	2	-6/+8
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	48	-517/+1609
\|\
\| *	properly set chat states when receiving otr status messages	iNPUTmice	2015-03-21	1	-1/+1
\| *	respond to unreadable OTR messages with error message. fixed #1021	iNPUTmice	2015-03-21	5	-3/+42
\| *	wait for session iq to return sucessfully before sending other stanzas. fixed...	iNPUTmice	2015-03-20	1	-26/+42
\| *	don't update presence for muc messages	iNPUTmice	2015-03-19	1	-5/+2
\| *	Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen	Daniel Gultsch	2015-03-19	4	-8/+24
\| \|\
\| \| *	# add delivery receipts for private muc msgs	BrianBlade	2015-03-18	4	-8/+24
\| * \|	Merge pull request #1043 from strb/choose_contact_multiple_squashed	Daniel Gultsch	2015-03-18	2	-6/+121
\| \|\ \
\| \| * \|	Added multiple select to Choose Contact Activity	Andreas Straub	2015-03-18	2	-6/+121
\| * \| \|	Merge pull request #1036 from QuentinC/development	Daniel Gultsch	2015-03-18	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Green led color is better with "full-green"	Quentin	2015-03-04	1	-1/+1
\| * \| \| \|	Set file size also for cached avatars	Holger Weiß	2015-03-17	1	-29/+31
\| \| \|/ / \| \|/\| \|
\| * \| \|	Do not Strigprep JIDs from database	Mateusz "maxmati" Nowoty?ski	2015-03-11	4	-11/+13
\| * \| \|	add context menu entries for geo uris	iNPUTmice	2015-03-11	1	-17/+33
\| * \| \|	open location directly from notification	iNPUTmice	2015-03-10	1	-0/+25
\| * \| \|	show geo uris as 'location' in overview	iNPUTmice	2015-03-10	1	-1/+7
\| \| \|/ \| \|/\|
\| * \|	Merge pull request #1022 from Boris-de/cipher_blacklist	Daniel Gultsch	2015-03-08	2	-0/+25
\| \|\ \
\| \| * \|	disable all really weak cipher suites	Boris Wachtmeister	2015-03-07	2	-0/+25
\| * \| \|	display geo uris as location. show 'send loction' in share menu if request lo...	iNPUTmice	2015-03-07	5	-48/+215
\| \|/ /
\| * \|	fixed enter is send option	iNPUTmice	2015-03-06	2	-6/+10
\| * \|	fixed npe in message parser	iNPUTmice	2015-03-06	1	-4/+4
\| * \|	avoid unnecessary thread creation	iNPUTmice	2015-03-05	3	-17/+29
\| * \|	added config option to disable string prep in jids	iNPUTmice	2015-03-05	2	-3/+5
\| * \|	experimantal in memory jid caching	iNPUTmice	2015-03-04	1	-0/+15
\| \|/
\| *	added methods to count number of unread messages	Daniel Gultsch	2015-03-02	2	-0/+21
\| *	mark all sent messages up to a marker as displayed	Daniel Gultsch	2015-03-01	2	-13/+19
\| *	merge messages with related status (unsend, send, send_received)	iNPUTmice	2015-03-01	1	-1/+17
\| *	catching out of memory run time exception in hasEnabledAccounts()	iNPUTmice	2015-02-28	1	-0/+2
\| *	use conversations green in notification led	iNPUTmice	2015-02-27	1	-1/+1
\| *	Merge pull request #1006 from QuentinC/development	Daniel Gultsch	2015-02-27	1	-0/+1
\| \|\
\| \| *	Update NotificationService.java	QuentinC	2015-02-27	1	-1/+1