conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-81/+0
*	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-3/+19
\|\
\| *	disable all really weak cipher suites	Boris Wachtmeister	2015-03-07	1	-0/+9
\| *	added config option to disable string prep in jids	iNPUTmice	2015-03-05	1	-0/+1
\| *	added typing notifications through XEP-0085. fixed #210	iNPUTmice	2015-02-21	1	-0/+5
\| *	limit ui refresh rate	iNPUTmice	2015-02-17	1	-1/+2
\| *	Use platform ciphers as well, just prefer ours	Sam Whited	2015-02-02	1	-2/+2
* \|	Merge master-origin	steckbrief	2015-02-20	1	-0/+28
\|\\|
\| *	added more ciphers for old openssl versions	iNPUTmice	2015-02-02	1	-1/+3
\| *	Harden the TLS connection cipher suites	Sam Whited	2015-01-14	1	-0/+26
* \|	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-1/+0
* \|	Merge branch 'master' of ssh://git.fucktheforce.de/conversations	lookshe	2015-01-03	1	-0/+8
\|\\|
\| *	clean up conversation history after swtiching to a different conversation	iNPUTmice	2014-12-17	1	-0/+1
\| *	Handle time comparisons using longs	Sam Whited	2014-12-16	1	-1/+1
\| *	go through mam history page by page. load mam dynamically on scroll	iNPUTmice	2014-12-15	1	-2/+4
\| *	various mam improvments	iNPUTmice	2014-12-13	1	-1/+3
\| *	added max history age (default 1w). automatically sort newly added mam messages	iNPUTmice	2014-12-10	1	-0/+2
\| *	cleanup: removed unused emoticon parsing	iNPUTmice	2014-12-09	1	-1/+0
* \|	remaining part of my patch	lookshe	2015-01-03	1	-0/+1
\|/
*	progress for ibb transfers	iNPUTmice	2014-11-15	1	-0/+2
*	support for pgp files	iNPUTmice	2014-11-15	1	-1/+1
*	progress for http images as well. fixed open button for sent files	iNPUTmice	2014-11-15	1	-0/+1
*	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/+25