conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	7	-27/+118
\|\
\| *	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	5	-30/+72
\| *	Javadoc added and access to xmppConnectionService moved	steckbrief	2016-08-23	1	-3/+11
\| *	Fixes FS#229: prompt for confirmation before deleting a file	steckbrief	2016-08-23	2	-9/+39
\| *	Confirmation dialog added before sending delete command for remote file	steckbrief	2016-08-23	5	-15/+59
\| *	services.filetransfer.httpupload moved to new namespace services.filetransfer...	steckbrief	2016-08-23	1	-1/+1
\| *	Basic filetransfer http delete implementation; Exceptions for IqPacketError a...	steckbrief	2016-08-22	1	-3/+8
\| *	FileTransfer reworked (first steps - functionality as is), HttpUpload	steckbrief	2016-05-29	3	-5/+7
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	1	-3/+4
\|\\|
\| *	XmppConnectionService.markMessage moved to MessageUtil	steckbrief	2016-05-09	4	-9/+11
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	1	-12/+9
\|\\|
\| *	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	1	-5/+3
\| *	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	4	-10/+52
\| \|\
\| \| *	Related to FS#199: Removed unnecessary differentiation between a conversation...	steckbrief	2016-04-18	2	-4/+1
\| \| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	5	-11/+56
\| \| \|\ \| \|_\|/ \|/\| \|
\| * \|	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	1	-12/+9
\| \|/
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	2	-6/+76
\|\\|
\| *	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	2	-6/+75
\| *	Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences	steckbrief	2016-04-06	8	-78/+56
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	6	-10/+43
\| \|\ \| \|/ \|/\|
\| *	Fixes FS#180: Conference notification icon missing	lookshe	2016-04-01	1	-1/+6
\| *	Fixes FS#179: Avoid showing always empty list of ressources for mucs	steckbrief	2016-03-30	1	-1/+3
\| *	Logging for FS#80 to identify calling method	lookshe	2016-03-30	1	-0/+2
\| *	Fixes FS#172: Conversations list not updated on status changes	steckbrief	2016-03-29	1	-20/+9
\| *	Removed unnecessary import	steckbrief	2016-03-29	1	-1/+0
\| *	Avoid unnecessary text change on activate account button	steckbrief	2016-03-29	1	-2/+3
\| *	Introduction of a TextViewUtil to easily set attributes for TextViews	steckbrief	2016-03-29	5	-69/+24
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	2	-2/+4
\|\\|
\| *	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	12	-86/+50
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-28	1	-3/+1
\|\\|
\| *	Merge branch 'master' of repos.thedevstack.de:conversations-plus	steckbrief	2016-03-28	1	-2/+23
\| \|\
\| \| *	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	1	-2/+23
\| * \|	Fixes FS#170: Message Details: Status display has different Text color	steckbrief	2016-03-28	2	-4/+2
\| \|/
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	5	-13/+32
\| \|\ \| \|/ \|/\|
\| *	Correct notifications to user if swiping with disabled or not connected accou...	lookshe	2016-03-22	1	-25/+37
* \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\|\\|
\| *	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
\| *	fixed merge error	lookshe	2016-03-20	1	-1/+1
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	2	-19/+25
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	4	-59/+100
\| \|\
\| * \|	Fixes FS#164	lookshe	2016-03-18	1	-8/+0
\| * \|	completely implements FS#161	lookshe	2016-03-17	1	-1/+9
\| * \|	once again: FS#34 - review all calls for String.trim()	lookshe	2016-03-14	1	-1/+1
* \| \|	fixed merge errors	lookshe	2016-03-20	1	-1/+1
\| \|/ \|/\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-6/+3
\|\\|
\| *	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	2	-7/+4
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	1	-3/+3
\| \|\ \| \|/ \|/\|
\| *	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	3	-77/+10
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+1
\|\\|
\| *	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	4	-17/+8