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	62	-143/+2900
\|\
\| *	Fixes FS#29: Own Avatar not loaded	steckbrief	2016-09-29	1	-3/+9
\| *	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	36	-631/+775
\| *	Fixes FS#230: Uncaught NullPointerException in DNSHelper	steckbrief	2016-08-26	1	-7/+12
\| *	Fixes conditions for cplus db upgrades	steckbrief	2016-08-23	1	-2/+2
\| *	Javadoc added and access to xmppConnectionService moved	steckbrief	2016-08-23	2	-5/+14
\| *	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	6	-23/+84
\| *	services.filetransfer.httpupload moved to new namespace services.filetransfer...	steckbrief	2016-08-23	11	-11/+11
\| *	xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ...	steckbrief	2016-08-23	15	-28/+22
\| *	Improved error handling for httpupload	steckbrief	2016-08-22	1	-4/+7
\| *	Basic filetransfer http delete implementation; Exceptions for IqPacketError a...	steckbrief	2016-08-22	20	-15/+542
\| *	Merge remote-tracking branch 'remotes/origin/filetransfer'	steckbrief	2016-08-22	46	-205/+1679
\| \|\
\| \| *	Related to FS#131, FS#129, FS#220:	steckbrief	2016-06-06	14	-83/+472
\| \| *	FileTransfer reworked (first steps - functionality as is), HttpUpload	steckbrief	2016-05-29	39	-199/+1165
\| \| *	Fixed javadoc of HttpUploadHint	steckbrief	2016-05-26	1	-1/+11
\| \| *	Fixed javadoc of PubSub Element Generation/Parsing	steckbrief	2016-05-26	3	-5/+114
\| * \|	Implements FS#227: Store password encrypted in internal database	steckbrief	2016-07-16	3	-3/+131
\| \|/
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	3	-3/+97
\|\\|
\| *	XmppConnectionService.markMessage moved to MessageUtil	steckbrief	2016-05-09	13	-108/+132
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	9	-13/+397
\|\\|
\| *	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	8	-48/+138
\| *	Related to FS#134: check if oldversion is smaller then new version on upgradi...	steckbrief	2016-04-23	1	-2/+1
\| *	Removed download decision MUST if the message contains jabber:x:oob:oob/url	steckbrief	2016-04-19	1	-3/+0
\| *	Persist Message.treatAsDownloadable	steckbrief	2016-04-19	2	-2/+15
\| *	Related to FS#134: Set Message flags according to httpupload hint	steckbrief	2016-04-19	3	-0/+9
\| *	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	20	-188/+384
\| \|\
\| \| *	Implements FS#137: build flavors	steckbrief	2016-04-18	2	-50/+37
\| \| *	Related to FS#199: Removed unnecessary build configuration variable to hide d...	steckbrief	2016-04-18	2	-6/+3
\| \| *	Related to FS#199: Removed unnecessary differentiation between a conversation...	steckbrief	2016-04-18	3	-16/+1
\| \| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	20	-134/+361
\| \| \|\ \| \|_\|/ \|/\| \|
\| * \|	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	11	-20/+367
\| \|/
\| *	Fixed null pointer exception in case of IOException before uploading file to ...	steckbrief	2016-04-16	1	-2/+7
\| *	Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'	steckbrief	2016-04-07	1	-1/+1
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	2	-0/+48
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	3	-6/+124
\|\\|
\| *	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	3	-6/+122
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	1	-0/+43
\|\\|
\| *	Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences	steckbrief	2016-04-06	12	-144/+134
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	17	-53/+196
\| \|\ \| \|/ \|/\|
\| *	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	3	-0/+6
\| *	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
* \|	fixed installation error "W/PackageManager: Can't install because provider na...trz/beta-1	lookshe	2016-04-03	1	-20/+0
* \|	fixed build error	lookshe	2016-04-03	1	-0/+2
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-0/+75
\|\\|
\| *	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	6	-69/+99