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-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
\| * \|	fixed 'connecting…' button	Daniel Gultsch	2016-04-10	1	-3/+6
\| * \|	moved authentication into seperate method. force close socket before changing...	Daniel Gultsch	2016-04-10	1	-38/+44
\| * \|	introduced setting to turn of notification led	Daniel Gultsch	2016-04-09	3	-5/+15
\| * \|	use startdate as lower bound when querying archive with after=x	Daniel Gultsch	2016-04-09	1	-13/+3
\| * \|	don't show contact details when in conversations with self	Daniel Gultsch	2016-04-09	3	-1/+8
\| * \|	use last received message id when querying archive	Daniel Gultsch	2016-04-09	1	-7/+17
\| * \|	transform nimbuzz workaround into a more general 'waitForDisco' condition	Daniel Gultsch	2016-04-09	1	-6/+11
\| * \|	add required disco#items query to timeout list	Daniel Gultsch	2016-04-08	1	-1/+4
\| * \|	removed ernoexception in exchange for a regular exeption to prevent verify er...	Daniel Gultsch	2016-04-08	1	-3/+2
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-04-08	2	-3/+23
\| * \|	check file owner when attaching files or using them as avatar	Daniel Gultsch	2016-04-07	4	-2/+55
\| * \|	prevent null pointer when checking http upload max size	Daniel Gultsch	2016-04-07	1	-6/+6
\| * \|	better detect broken pep	Daniel Gultsch	2016-04-05	2	-2/+10
\| * \|	switched around info and items query to avoid race condition	Daniel Gultsch	2016-04-04	1	-1/+1
\| * \|	pulled translations from transifex	Daniel Gultsch	2016-04-04	12	-26/+71
\| * \|	removed unnecessary wait for disconnect	Daniel Gultsch	2016-04-04	1	-6/+0
\| * \|	made sure the disco#items query has returned before finalizing the bind	Daniel Gultsch	2016-04-04	1	-12/+24
* \| \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-16	2	-3/+8
\|\ \ \ \| \| \|/ \| \|/\|