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	97	-844/+3405
\|\
\| *	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	38	-631/+790
\| *	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	4	-9/+41
\| *	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	22	-15/+547
\| *	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	4	-3/+267
\| \|/
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	13	-111/+140
\|\\|
\| *	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	21	-70/+559
\|\\|
\| *	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	64	-305/+554
\| \|\
\| * \|	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	13	-20/+390
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-18	8	-80/+42
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Implements FS#137: build flavors	steckbrief	2016-04-18	2	-50/+37
\| * \|	Related to FS#199: fixed merge hickups (message correction setting removed, k...	steckbrief	2016-04-18	2	-8/+1
\| * \|	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
\| * \|	removed unused string	lookshe	2016-04-17	1	-1/+0
\| * \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	64	-250/+538
\| \|\ \ \| \|/ / \|/\| / \| \|/
* \|	@Overrides addedtrz/merge_1.11.7	lookshe	2016-04-17	1	-0/+6
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	64	-285/+538
\|\ \
\| * \|	always notify by default in conferences	Daniel Gultsch	2016-04-14	2	-3/+1
\| * \|	removed unnecessary call to stopSelf() after logging out	Daniel Gultsch	2016-04-14	1	-5/+11
\| * \|	add setting for quick sharing	Daniel Gultsch	2016-04-14	3	-17/+51
\| * \|	removed unused call to cancel events	Daniel Gultsch	2016-04-14	1	-1/+0
\| * \|	create Config varibale to show the disable foreground service button	Daniel Gultsch	2016-04-13	2	-3/+6
\| * \|	hacky workaround to determine if uri points to private file on < lolipop	Daniel Gultsch	2016-04-13	3	-9/+25
\| * \|	return own jid as true counterpart on self messages in muc	Daniel Gultsch	2016-04-13	1	-0/+3
\| * \|	added share uri button to conference details	Daniel Gultsch	2016-04-12	15	-14/+43
\| * \|	reverse order in contact chooser	Daniel Gultsch	2016-04-12	1	-1/+1
\| * \|	minor code cleanup	Daniel Gultsch	2016-04-12	1	-3/+1
\| * \|	republish avatar if server offers non-persistent pep :-(	Daniel Gultsch	2016-04-11	4	-37/+144
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-04-10	29	-86/+27
\| * \|	don't throw IO exception at end of stream	Daniel Gultsch	2016-04-10	1	-1/+0