conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| \|\
\| \| *	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
\| \| \|\
\| \| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-06	1	-0/+43
\| \| \|\ \
* \| \| \| \|	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
\| \|_\|/ \|/\| \|
* \| \|	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	3	-6/+122
\| \|/ \|/\|
* \|	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
\|\\|
\| *	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
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	3	-2/+161
\| \|\ \
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-28	1	-3/+1
\| \|\ \ \
\| * \| \| \|	wrong import in new classtrz/1.11.2.1	lookshe	2016-03-27	1	-1/+1
\| * \| \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-27	1	-0/+20
\| \|\ \ \ \
* \| \| \| \| \|	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
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	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
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	16	-101/+226
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'master' of repos.thedevstack.de:conversations-plus	steckbrief	2016-03-28	3	-3/+44
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	3	-3/+44
* \| \|	Fixes FS#170: Message Details: Status display has different Text color	steckbrief	2016-03-28	2	-4/+2
* \| \|	Implements FS#176: error logging for httpupload improved	steckbrief	2016-03-28	1	-1/+7
\|/ /
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	14	-38/+83
\|\\|
\| *	FS#169 - Merge Conversations 1.11.2 into Conversations+ dev	lookshe	2016-03-25	1	-0/+2
\| *	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\| \|\
\| * \	Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1	lookshe	2016-03-20	1	-0/+20
\| \|\ \
\| \| * \	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-0/+20
\| \| \|\ \
* \| \| \| \|	Correct notifications to user if swiping with disabled or not connected accou...	lookshe	2016-03-22	1	-25/+37
* \| \| \| \|	Fixes FS#87 - Crash on load messages after delete account	lookshe	2016-03-22	1	-1/+5
* \| \| \| \|	One more fix in Message.equals() (FS#104)	lookshe	2016-03-21	1	-4/+19
* \| \| \| \|	Show file name instead of mime type (FS#102)	lookshe	2016-03-20	1	-1/+1
* \| \| \| \|	FS#104 - Fix Message.equals()	lookshe	2016-03-20	1	-18/+14
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Fixes FS#168 - Not possible to share more than one picture at once	lookshe	2016-03-20	1	-59/+83
* \| \| \|	fixed merge error	lookshe	2016-03-20	1	-1/+1
* \| \| \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	3	-19/+27
\|\\| \| \|
\| * \| \|	fixed merge errors	lookshe	2016-03-20	1	-1/+1
\| \|/ /
* \| /	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	8	-74/+115
\|\\| \| \| \|/ \|/\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	2	-88/+3
\| \|\
* \| \|	Fixes FS#167: Resized images are larger than original images	steckbrief	2016-03-18	1	-2/+2