conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	introduces new message state model	steckbrief	2018-05-05	1	-134/+121
\|
*	introduces cancel status for file transfers, fixes NPE in file sharing after ↵	steckbrief	2018-02-16	1	-0/+5
\| \| \| \|	picture resize
*	properly handle downloadable links0.0.8-beta2	steckbrief	2018-01-31	1	-2/+10
\|
*	Implements FS#245: Implement FiletransferHttp (upload and delete), some ↵	steckbrief	2017-07-31	1	-1/+2
\| \| \| \|	minor bug fixes including to fail a JingleTransfer in case criterias are not met
*	relates FS#241: Implementation of http download based on okhttp	steckbrief	2017-02-06	1	-10/+98
\|
*	Merge branch 'trz/rebase' into trz/rename	steckbrief	2017-01-05	1	-3/+64
\|\
\| *	Added columns to fileparams table: url, original file name, key and iv	steckbrief	2017-01-04	1	-3/+66
\| \| \| \| \| \| \| \| \| \|	auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	1	-25/+46
\| \|\ \| \|/ \|/\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	1	-0/+16
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-0/+14
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
* \| \| \| \|	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	1	-25/+36
\| \| \| \| \|
* \| \| \| \|	Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵	steckbrief	2016-08-22	1	-0/+10
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	added
* \| \| \|	XmppConnectionService.markMessage moved to MessageUtil	steckbrief	2016-05-09	1	-0/+16
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* \| \|	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	1	-0/+13
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	- 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
* \|	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	1	-1/+2
\| \|
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-0/+22
\|\\|
\| *	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-0/+22
\| \|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-3/+3
\|/
*	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-0/+72
	distinguishes between image resizing and compressing/saving