conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-02-09	3	-2/+3
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-02-09	1	-6/+7
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	4	-87/+7
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	4	-65/+62
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	1	-3/+3
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-15	1	-2/+12
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-13	18	-240/+246
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-08	1	-1/+12
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-04	1	-1/+1
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	6	-189/+54
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-11	2	-208/+98
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	25	-58/+89
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-06	3	-2/+15
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	3	-16/+44
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	2	-9/+7
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-1/+1
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	26	-217/+217
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	17	-579/+226
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	7	-170/+249
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	6	-13/+19
\|\\|
* \|	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	22	-344/+236
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-15	3	-36/+64
\|\\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-05	5	-35/+12
\|\\|
* \|	fixed importstrz/1.5.2.2	lookshe	2015-10-05	1	-1/+1
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	6	-9/+40
\|\\|
\| *	moved merged files to correct location	lookshe	2015-08-16	2	-166/+0
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	2	-0/+166
\| \|\
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	126	-26217/+0
* \| \|	fixes FS#44 - IOException if content-length is not present	lookshe	2015-08-21	1	-3/+3
\| \|/ \|/\|
* \|	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	4	-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	4	-169/+263
* \|	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
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	61	-2117/+3770
* \|	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