conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	35	-409/+396
\|\
\| *	fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conference	lookshe	2015-08-16	3	-3/+15
\| *	Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module	lookshe	2015-08-16	22	-137/+8
\| *	Fixes FS#15 - Adding smiley only possible at the end	lookshe	2015-08-16	1	-21/+13
\| *	Fixes FS#37 - Remove special treatment of unicode hearts	lookshe	2015-08-16	7	-29/+21
\| *	- Introduction of SwipeRefreshLayout for conversation view	steckbrief	2015-08-12	5	-169/+271
\| *	Fixes FS#38 - Issues with URLs with multiple dots in file name	lookshe	2015-08-12	1	-7/+18
\| *	Fixes FS#33 - Get back the comment	lookshe	2015-08-12	1	-0/+5
\| *	Fixes FS#20: Limitation of end conversation swipe to left side	steckbrief	2015-08-11	1	-58/+59
* \|	resolve of some compiler errors	lookshe	2015-08-13	3	-1/+3
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	413	-2699/+7139
\|\\|
\| *	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	413	-2701/+7126
\| *	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	6	-2/+42
* \|	App-Name changed to "Conversations+" in strings.xml	steckbrief	2015-06-19	1	-1/+1
* \|	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	steckbrief	2015-06-19	1	-2/+5
* \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	6	-2/+43
* \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	136	-764/+727
\|/
*	moved color picker to libs	lookshe	2015-04-15	21	-665/+0
*	changed received and read confirmation setting to one list and put it to sett...	lookshe	2015-04-14	9	-82/+109
*	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	2	-4/+9
*	better and perhaps faster way for checking if a message is downloadable	lookshe	2015-04-12	1	-10/+18
*	new settings to initialisation of Settings	lookshe	2015-04-12	1	-1/+1
*	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	23	-29/+75
*	add missing resource files	lookshe	2015-04-12	8	-0/+0
*	whatsapp-like smiley implementation	lookshe	2015-04-12	6	-26/+165
*	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	7	-22/+38
\|\
\| *	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	6	-9/+20
* \|	Color choose dialog	steckbrief	2015-04-11	26	-15/+688
\|/
*	no trim of messages or password	lookshe	2015-04-11	7	-9/+15
*	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	3	-1/+17
*	Changes for emoticon parser reactivated	steckbrief	2015-03-31	2	-6/+8
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	82	-610/+2937
\|\
\| *	pulled translations	iNPUTmice	2015-03-22	5	-0/+21
\| *	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
\| *	pulled more translations	iNPUTmice	2015-03-19	1	-0/+5
\| *	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	4	-6/+134
\| \|\ \
\| \| * \|	Added multiple select to Choose Contact Activity	Andreas Straub	2015-03-18	4	-6/+134
\| * \| \|	Merge pull request #1036 from QuentinC/development	Daniel Gultsch	2015-03-18	1	-1/+1
\| \|\ \ \