17 Commits

Author	SHA1	Message	Date
iNPUTmice	ccdb0fd971	save server id from mam messages. check for dups before adding mam	2014-12-10 14:08:06 +01:00
iNPUTmice	0ab530932a	added max history age (default 1w). automatically sort newly added mam messages	2014-12-10 14:08:06 +01:00
iNPUTmice	96bbd16ca5	worked around rare npe	2014-12-01 10:58:06 +01:00
iNPUTmice	1122e084a0	simplified message merge condition	2014-11-18 14:49:49 +01:00
iNPUTmice	f41c3eee04	context menu for muc participants + refactor trueCounterpart to use Jid class	2014-11-17 20:02:46 +01:00
iNPUTmice	7a90ca429b	basic arbitrary file transfer	2014-11-15 15:34:11 +01:00
iNPUTmice	3118340ade	fixed possible npe when loading null counterpart into message	2014-11-14 19:49:44 +01:00
iNPUTmice	89ee999e1b	more refactoring for presence selection. removed getTo, getFrom and getJid from Element	2014-11-10 01:24:35 +01:00
iNPUTmice	69ef17efc0	migrated some otr stuff to new jid classes	2014-11-09 17:46:00 +01:00
iNPUTmice	ad6fef063b	fixed null pointer in message merger	2014-11-09 16:47:31 +01:00
iNPUTmice	377bd49ee8	refactored code to always contain full jid for counterpart	2014-11-09 16:21:13 +01:00
Sam Whited	778fb9de6c	Fix letter avatar selection in MUC	2014-11-09 07:00:40 -05:00
Sam Whited	bf9207456e	Update another chunk of stuff to use JID objects	2014-11-09 07:00:40 -05:00
Sam Whited	9053f4aca0	Move a chunk of classes over to using JID objects	2014-11-09 07:00:40 -05:00
iNPUTmice	1ea2e7dc3b	fixed arrayoutofbounds + spelling	2014-11-01 14:33:34 +01:00
Sam Whited	46f147a82c	Merge branch 'gradle' into development ... Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib	2014-10-30 15:33:13 -04:00
Sam Whited	281ce3105f	Make conversations the root project	2014-10-22 15:47:11 -04:00