conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Improved error handling for filetransfer:http:delete, Check for httpupload fe...	steckbrief	2017-01-11	1	-8/+0
*	Merge branch 'trz/rebase' into trz/rename	steckbrief	2017-01-05	2	-57/+49
\|\
\| *	Fixed NPE in FileParams.setKeyAndIv	steckbrief	2017-01-04	1	-11/+13
\| *	Added columns to fileparams table: url, original file name, key and ivtrz/beta-5	steckbrief	2017-01-04	1	-0/+42
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	17	-4161/+2
\|/
*	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	4	-183/+160
*	Basic filetransfer http delete implementation; Exceptions for IqPacketError a...	steckbrief	2016-08-22	2	-0/+40
*	Implements FS#227: Store password encrypted in internal database	steckbrief	2016-07-16	1	-2/+6
*	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	1	-0/+1
*	Removed download decision MUST if the message contains jabber:x:oob:oob/url	steckbrief	2016-04-19	1	-3/+0
*	Related to FS#134: Set Message flags according to httpupload hint	steckbrief	2016-04-19	1	-0/+4
*	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	2	-9/+4
\|\
\| *	Related to FS#199: Removed unnecessary differentiation between a conversation...	steckbrief	2016-04-18	1	-12/+0
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	2	-1/+8
* \|	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	1	-0/+10
\|/
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	4	-17/+45
*	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	1	-1/+1
*	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
*	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
*	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	1	-11/+2
*	completely implements FS#161	lookshe	2016-03-17	1	-9/+31
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	2	-9/+22
*	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	2	-106/+3
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	5	-36/+118
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	12	-543/+1166
*	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-2/+1
*	Implements FS#67: Introduce central logging class to use log prefix, new acti...	steckbrief	2015-11-20	1	-11/+11
*	Access to preferences moved to global utility class ConversationsPlusPreferen...	steckbrief	2015-10-21	1	-1/+2
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	4	-29/+51
*	resolve of some compiler errors	lookshe	2015-08-13	1	-1/+1
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	11	-218/+328
*	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	3	-0/+15
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	14	-0/+3447