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	4	-34/+176
\|\
\| *	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	4	-34/+78
\| *	Fixes FS#230: Uncaught NullPointerException in DNSHelper	steckbrief	2016-08-26	1	-7/+12
\| *	Basic filetransfer http delete implementation; Exceptions for IqPacketError a...	steckbrief	2016-08-22	1	-0/+10
\| *	Implements FS#227: Store password encrypted in internal database	steckbrief	2016-07-16	1	-0/+110
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-05-09	2	-0/+93
\|\\|
\| *	XmppConnectionService.markMessage moved to MessageUtil	steckbrief	2016-05-09	2	-0/+91
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-23	3	-0/+62
\|\\|
\| *	Fixes FS#204: Observe all used directories	steckbrief	2016-04-23	2	-0/+44
\| *	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	2	-1/+41
\| \|\
\| \| *	Implements FS#137: build flavors	steckbrief	2016-04-18	1	-1/+1
\| \| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	1	-0/+40
\| \| \|\ \| \|_\|/ \|/\| \|
\| * \|	DatabaseBackend updated to serve Conversatiosn Database version and Conversat...	steckbrief	2016-04-17	1	-0/+16
\| \|/
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-0/+40
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	1	-0/+48
\|\\|
\| *	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	1	-0/+47
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	1	-0/+36
\| \|\ \| \|/ \|/\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-0/+75
\|\\|
\| *	Introduction of a TextViewUtil to easily set attributes for TextViews	steckbrief	2016-03-29	1	-0/+75
\| *	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	1	-13/+16
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	1	-4/+5
\| \|\ \| \|/ \|/\|
\| *	Show file name instead of mime type (FS#102)	lookshe	2016-03-20	1	-1/+1
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	1	-0/+2
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	1	-1/+8
\| \|\ \| \|/ \|/\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-82/+0
\|\\|
\| *	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	2	-87/+10
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	2	-3/+31
\| \|\ \| \|/ \|/\|
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+2
\|\\|
\| *	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	1	-1/+2
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	1	-1/+4
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	1	-1/+2
\| \|\ \| \|/ \|/\|
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-07	2	-4/+43
\| \|\
\| * \	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	19	-177/+662
\| \|\ \
* \| \| \|	use Build.VERSION_CODES.KITKAT instead of hard coded 19	lookshe	2016-03-08	1	-1/+2
\| \|_\|/ \|/\| \|
* \| \|	corrected getRealPathFromUri	lookshe	2016-03-07	1	-2/+40
\| \|/ \|/\|
* \|	Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...	steckbrief	2016-02-23	1	-0/+8
* \|	Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)	steckbrief	2016-02-23	1	-0/+15
* \|	Imports organized	steckbrief	2016-02-12	3	-5/+0
* \|	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-0/+22
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-01-13	2	-0/+79
\|\\|
\| *	Moved all avatar related work to AvatarService	steckbrief	2016-01-13	2	-0/+78
\| *	Fixes FS#99: Adjust namespace according to XEP-0363	steckbrief	2016-01-04	1	-1/+1
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	2	-0/+132
\|\\|
\| *	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...	steckbrief	2015-12-16	2	-0/+132
\| *	Removed stupid DNS query code	steckbrief	2015-12-11	1	-150/+71
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	3	-126/+3
\|\\|
\| *	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	7	-132/+10
\| *	Fixed compile error in inner class	steckbrief	2015-12-02	1	-1/+1
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	3	-5/+129
\|\\|
\| *	Partially implements FS#6: Conference ID changed to c+bugs@confere	steckbrief	2015-11-20	1	-1/+1