conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' (early part) into trz/rename	steckbrief	2017-01-05	0	-0/+0
\|\
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-10-20	100	-846/+3421
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	13	-111/+140
\| \|\ \
\| * \| \|	version name set to beta-3trz/beta-3	steckbrief	2016-05-02	1	-1/+1
\| * \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	22	-71/+560
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-18	10	-80/+94
\| \|\ \ \ \
\| * \ \ \ \	Merge commit 'remotes/origin/trz/rename~4' into trz/rebase	steckbrief	2016-04-18	0	-0/+0
\| \|\ \ \ \ \
* \| \| \| \| \| \|	Hide number of unread message counter if there are no new messages	steckbrief	2016-12-29	1	-3/+5
* \| \| \| \| \| \|	Implement FS#239: Show number of unread messages in conversations overview	steckbrief	2016-12-28	2	-44/+59
* \| \| \| \| \| \|	Fixes FS#237: Enable long click in layout instead of programmatically	steckbrief	2016-10-23	3	-15/+7
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	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	25	-16/+550
* \| \| \| \| \|	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	5	-4/+280
\|/ / / / /
* \| \| \| /	XmppConnectionService.markMessage moved to MessageUtil	steckbrief	2016-05-09	13	-108/+132
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	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	70	-312/+638
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Implements FS#137: build flavors	steckbrief	2016-04-18	4	-50/+89
\| * \| \|	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	71	-275/+573
\| \|\\|
\| \| *	@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	71	-310/+573
\| \| \|\
\| \| \| *	version bump to 1.11.7 + changelog1.11.7	Daniel Gultsch	2016-04-14	2	-2/+7
\| \| \| *	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