Daniel Gultsch 75977818ea Merge branch 'master' into development		2015-05-21 09:19:26 +02:00
..
crypto	OTR: Fix onContactStatusChanged & dont archive OTR	2015-04-21 22:35:35 +02:00
entities	added mam stuff to new message parser	2015-05-20 03:48:14 +02:00
generator	r/o support for vcard avatars. pep avatars will be prefered	2015-05-05 06:17:34 +02:00
http	Use platform ciphers as well, just prefer ours	2015-02-02 11:16:22 -05:00
parser	proper error parsing. some clean up	2015-05-20 03:48:14 +02:00
persistance	Force Nameprepping of JID domain parts	2015-05-14 15:52:55 +02:00
services	added ShortcutBadger as a dependency to create unread counts on launcher icon	2015-05-20 12:47:04 +02:00
ui	fixed with attaching wrong files when returning to activity and background service is still alive	2015-05-21 05:21:22 +02:00
utils	added a few location questions	2015-05-14 12:08:43 +02:00
xml	provide helper function for getting the content of a child directly	2015-05-20 03:48:14 +02:00
xmpp	rewrote parser code. mam id and possible other stuff still missing. also massivly untested	2015-05-20 03:48:14 +02:00
Config.java	use same socket time out for jingle and xmpp connections	2015-05-18 08:48:08 +02:00