conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-1/+3
\|\
\| *	republish pgp signature when changing status	Daniel Gultsch	2016-05-05	1	-1/+4
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	1	-0/+6
\|\ \
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-1/+1
\|\\| \|
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-4/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	allow to delete attachments. fixes #1539	Daniel Gultsch	2016-03-23	1	-2/+1
\| * \|	only add image files to media scanner	Daniel Gultsch	2016-03-23	1	-3/+1
* \| \|	Fixes FS#151 - Missing button on image-links	lookshe	2016-03-07	1	-1/+0
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-7/+6
\|\\| \|
\| * \|	check for uuid change when decrypting pgp messages	Daniel Gultsch	2016-02-21	1	-7/+6
* \| \|	Imports organized	steckbrief	2016-02-12	1	-1/+0
* \| \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-9/+6
* \| \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-35/+81
\|\\| \|
\| * \|	encrypt pgp messages to self	Daniel Gultsch	2015-11-26	1	-8/+8
\| * \|	pgp fixes and revert configuration changes	Daniel Gultsch	2015-11-25	1	-2/+10
\| * \|	Merge pull request #1558 from fiaxh/pgp_api_9.0	Daniel Gultsch	2015-11-24	1	-13/+29
\| \|\ \
\| \| * \|	Use OpenPGP-API 9.0	fiaxh	2015-11-09	1	-13/+29
\| * \| \|	PgpEngine: Get account from conversation instead of from contact. fixes #1568...	fiaxh	2015-11-15	1	-3/+3
\| \|/ /
\| * \|	Decrypt PGP messages in background	fiaxh	2015-10-28	1	-0/+19
\| * \|	Optimize imports	Andreas Straub	2015-07-20	1	-7/+8
\| * \|	renamed HttpConnection to HttpDownloadConnection	Daniel Gultsch	2015-07-10	1	-1/+1
\| * \|	changed mime type handling	Daniel Gultsch	2015-07-01	1	-1/+1
\| * \|	made httpconnection (download) ready all kind of filesfeature/http_upload	Daniel Gultsch	2015-06-30	1	-2/+2
\| * \|	refactored bodyContainsDownloadable to be more flexible	Daniel Gultsch	2015-06-30	1	-1/+1
\| * \|	untested pgp support for http upload	Daniel Gultsch	2015-06-29	1	-5/+9
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-1/+2
\|\ \ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	1	-10/+8
\|\\| \|
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	1	-2/+3
\|\\| \|
\| * \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-369/+0
* \| \|	Fixes FS#37 - Remove special treatment of unicode hearts	lookshe	2015-08-16	1	-2/+2
* \| \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-8/+12
\|/ /
* \|	implementation for downloading only when enabled wlan	lookshe	2015-04-12	1	-0/+3
* \|	no trim of messages or password	lookshe	2015-04-11	1	-1/+1
\|/
*	do not check image file size over http if accepted file size is 0	Daniel Gultsch	2015-01-11	1	-3/+6
*	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	1	-20/+1
*	support for pgp files	iNPUTmice	2014-11-15	1	-2/+4
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-7/+7
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-27/+13
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-18/+27
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+385