conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-0/+58
\|\
\| *	services.filetransfer.httpupload moved to new namespace ↵	steckbrief	2016-08-23	1	-1/+1
\| \| \| \| \| \| \| \|	services.filetransfer.http.upload; delete parts of services.filetransfer.http moved to .delete package
\| *	Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵	steckbrief	2016-08-22	1	-0/+8
\| \| \| \| \| \| \| \|	added
\| *	FileTransfer reworked (first steps - functionality as is), HttpUpload	steckbrief	2016-05-29	1	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	separated, some bugfixes - HttpUpload moved into own package - FileTransfer managed by a central manager class, several FileTransferService implementation can be used - Security initializations moved to ConversationsPlusApplication - Access to PowerManager moved to ConversationsPlusApplication - Removed unused code fragments - Access to HttpConnectionManager is now static
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-1/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
\| *	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Implementing the FileObserver in a separate class, with mask to watch only deletions not everything - Add observation of all directories which could contain a sent/received file - Change observers if the folder names are changed via settings - markMessage method moved from XmppConnectionService to MessageUtil
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	1	-0/+2
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-0/+1
\| \|\
* \| \|	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-0/+2
\| \|/ \|/\|
* \|	Imports organized	steckbrief	2016-02-12	1	-2/+1
\| \|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-0/+13
\|\\|
\| *	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-0/+12
\| \| \| \| \| \| \| \|	distinguishes between image resizing and compressing/saving
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-06	1	-0/+20
\|\\|
\| *	FileBackend splitted into several util classes for separate concerns: ↵	steckbrief	2015-11-06	1	-0/+21
\| \| \| \| \| \| \| \|	AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	1	-0/+4
\|\\|
\| *	Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵	steckbrief	2015-10-23	1	-0/+4
\| \| \| \| \| \| \| \|	values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* \|	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	1	-0/+2
\|\\|
\| *	Access to preferences moved to global utility class ↵	steckbrief	2015-10-21	1	-0/+2
\| \| \| \| \| \| \| \|	ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* \|	fix imports and namespaces	steckbrief	2015-10-05	1	-0/+2
\|/
*	Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵	steckbrief	2015-10-05	1	-0/+62
	access to app information