conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	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