conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-2/+2
\|\
\| *	changed single_account config into more simple lock_settings	Daniel Gultsch	2016-02-27	1	-2/+2
* \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	1	-1/+4
\|\\|
\| *	hide add account icons when single_account is set to true	Daniel Gultsch	2016-02-24	1	-0/+3
\| *	made hard coded choice for encryptions more flexible and disable parsing	Daniel Gultsch	2016-02-24	1	-1/+1
* \|	Imports organized	steckbrief	2016-02-12	1	-3/+2
* \|	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-40/+147
\|\\|
\| *	use extract account from intent method and final EXTRA_ACCOUNT variable	Daniel Gultsch	2016-01-22	1	-1/+1
\| *	fixed crashes when activity got destroyed when selecting pgp key	Daniel Gultsch	2015-12-01	1	-35/+73
\| *	Use OpenPGP-API 9.0	fiaxh	2015-11-09	1	-2/+10
\| *	open manage account + certificate chooser when cbe mode is enabled	Daniel Gultsch	2015-10-20	1	-4/+20
\| *	add config variable to enable x509 verification	Daniel Gultsch	2015-10-12	1	-2/+9
\| *	initial UI work to allow setting up accounts from certifcates	Daniel Gultsch	2015-10-09	1	-2/+36
\| *	added config.java variable to hide openpgp as an encryption method	Daniel Gultsch	2015-08-05	1	-0/+2
\| *	Optimize imports	Andreas Straub	2015-07-20	1	-8/+9
\| *	fixed disable account when sliding and not clicking the toggle	iNPUTmice	2015-04-13	1	-2/+2
\| *	Add toggle account-state switch	BrianBlade	2015-04-01	1	-0/+8
* \|	Merge tag '1.5.2' into trz/rebase	lookshe	2015-08-11	1	-0/+8
\|/
*	limit ui refresh rate	iNPUTmice	2015-02-17	1	-8/+7
*	disable / enable all accounts	Daniel Gultsch	2015-01-03	1	-16/+84
*	auto register/unregister listeners	iNPUTmice	2014-11-11	1	-13/+1
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-1/+1
*	Update more files to use JID objects	Sam Whited	2014-11-09	1	-2/+2
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-0/+1
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+217