conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-17	5	-11/+56
\|\
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-04-07	2	-6/+76
\| \|\ \| \|/ \|/\|
* \|	Implements FS#187: Add single line copy to logcat view	steckbrief	2016-04-07	2	-6/+75
* \|	Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences	steckbrief	2016-04-06	8	-78/+56
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	6	-10/+43
\|\\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	2	-2/+4
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-28	1	-3/+1
\| \|\ \
* \| \| \|	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	1	-0/+2
* \| \| \|	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	5	-69/+24
\| \|_\|/ \|/\| \|
* \| \|	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	12	-86/+50
\| \|/ \|/\|
* \|	Merge branch 'master' of repos.thedevstack.de:conversations-plus	steckbrief	2016-03-28	1	-2/+23
\|\ \
\| * \|	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	1	-2/+23
* \| \|	Fixes FS#170: Message Details: Status display has different Text color	steckbrief	2016-03-28	2	-4/+2
\|/ /
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	5	-13/+32
\|\\|
\| *	Merge branch 'trz/rename' into trz/rebase	lookshe	2016-03-20	1	-59/+83
\| \|\
* \| \|	Correct notifications to user if swiping with disabled or not connected accou...	lookshe	2016-03-22	1	-25/+37
\| \|/ \|/\|
* \|	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	2	-19/+25
\|\\|
\| *	fixed merge errors	lookshe	2016-03-20	1	-1/+1
* \|	Merge branch 'trz/rebase' (early part) into trz/rename	lookshe	2016-03-20	4	-59/+100
\|\\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-12	1	-6/+3
\| \|\
* \| \|	Fixes FS#164	lookshe	2016-03-18	1	-8/+0
* \| \|	completely implements FS#161	lookshe	2016-03-17	1	-1/+9
* \| \|	once again: FS#34 - review all calls for String.trim()	lookshe	2016-03-14	1	-1/+1
\| \|/ \|/\|
* \|	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	2	-7/+4
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	1	-3/+3
\|\\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+1
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	2	-4/+7
\| \|\ \
* \| \| \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	3	-77/+10
\| \|_\|/ \|/\| \|
* \| \|	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	4	-17/+8
\| \|/ \|/\|
* \|	Fixes FS#157: Trigger loading messages from MAM in MUC does not end	steckbrief	2016-03-10	1	-2/+1
* \|	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	2	-4/+6
* \|	reset link and highlight colors to system default	steckbrief	2016-03-08	1	-17/+20
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	13	-204/+400
\|\\|
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	37	-1201/+3965
\|\\|
\| *	Changed access to presences according to new Presence representation in C	steckbrief	2016-02-23	1	-3/+3
\| *	Imports organized	steckbrief	2016-02-12	5	-6/+2
\| *	Compilation errors and merge mixups fixed	steckbrief	2016-02-11	1	-6/+7
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-17	1	-1/+1
\| \|\
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	2	-3/+93
\| \|\ \
\| * \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	3	-2/+32
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-7/+2
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	2	-2/+33
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	5	-1/+229
\| \|\ \ \ \ \ \