conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-0/+8
*	Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences	steckbrief	2016-04-06	1	-0/+43
*	Finally fixes FS#142	lookshe	2016-03-07	1	-4/+0
*	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	1	-0/+4
*	Fixes FS#48 and FS#136trz/merge_1.10.0	lookshe	2016-02-28	1	-3/+0
*	Removed unnecessary dependencies to XmppConnectionService and added allowMess...	steckbrief	2016-02-23	1	-0/+4
*	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...	steckbrief	2015-12-16	1	-0/+8
*	Implements FS#26: Introduction of dialog to choose whether to resize a pictur...	steckbrief	2015-11-03	1	-1/+2
*	Implements FS#24: Introduce setting for picture resizing	steckbrief	2015-10-30	1	-0/+13
*	Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...	steckbrief	2015-10-23	1	-0/+15
*	Access to preferences moved to global utility class ConversationsPlusPreferen...	steckbrief	2015-10-21	1	-0/+294