conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	introduces new message state model	steckbrief	2018-05-05	1	-14/+22
\|
*	Implements FS#245: Implement FiletransferHttp (upload and delete), some ↵	steckbrief	2017-07-31	1	-1/+1
\| \| \| \|	minor bug fixes including to fail a JingleTransfer in case criterias are not met
*	Merge branch 'trz/rebase' into trz/rename	steckbrief	2017-01-05	1	-1/+2
\|\
\| *	Added columns to fileparams table: url, original file name, key and iv	steckbrief	2017-01-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	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	-3/+4
\| \|\ \| \|/ \|/\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-12/+9
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-29	1	-1/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-28	1	-3/+1
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
\| * \| \| \| \|	Imports organized	steckbrief	2016-02-12	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-1/+2
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	1	-1/+2
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-7/+2
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-2/+2
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	1	-1/+2
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	fixed imports	lookshe	2015-10-05	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	1	-3/+4
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	DatabaseBackend updated to serve Conversatiosn Database version and ↵	steckbrief	2016-04-17	1	-12/+9
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* \| \| \| \| \| \| \| \|	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	1	-1/+2
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fixes FS#170: Message Details: Status display has different Text color	steckbrief	2016-03-28	1	-3/+1
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	1	-1/+1
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Fixes FS#95: NPE when opening message details for failed file transfer	steckbrief	2015-12-16	1	-1/+2
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-1/+1
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	1	-7/+2
\| \|_\|/ \|/\| \|
* \| \|	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	1	-2/+2
\| \|/ \|/\| \| \| \| \|	activity to show logcat output and button to copy contents
* \|	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	1	-1/+2
\|/ \| \| \|	picture or not
*	Publishing additional information in message details dialog such as message ↵	steckbrief	2015-10-04	1	-18/+142
\| \| \| \|	type and message status
*	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵	steckbrief	2015-10-04	1	-0/+59
	Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added