conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-04-05	1	-1/+1
\|\
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-1/+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
* \| \|	Fixes FS#172: Conversations list not updated on status changes	steckbrief	2016-03-29	1	-20/+9
\| \|/ \|/\|
* \|	Implements FS#173: Move access to colors to separate helper class	steckbrief	2016-03-29	4	-9/+12
* \|	Fixes FS#166 - Images cannot be opened since storing in private image folder	lookshe	2016-03-27	1	-2/+23
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	1	-3/+3
\|\\|
* \|	Fixes FS#51: Change toggle in Account Management back to standard	steckbrief	2016-03-11	1	-4/+5
* \|	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	1	-6/+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	1	-6/+54
\|\\|
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	6	-152/+309
\|\\|
\| *	Changed access to presences according to new Presence representation in C	steckbrief	2016-02-23	1	-3/+3
\| *	Imports organized	steckbrief	2016-02-12	1	-1/+0
\| *	fixed importstrz/1.5.2.2	lookshe	2015-10-05	1	-3/+3
\| *	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	5	-1146/+0
* \|	Implements FS#64: Show who wrote last message in conversation overview	steckbrief	2016-01-15	1	-2/+12
* \|	Moved all avatar related work to AvatarService	steckbrief	2016-01-13	4	-11/+13
* \|	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-1/+1
* \|	Implements FS#67: Introduce central logging class to use log prefix, new acti...	steckbrief	2015-11-20	1	-1/+1
* \|	FileBackend splitted into several util classes for separate concerns: AvatarU...	steckbrief	2015-11-06	1	-7/+3
* \|	Implements FS#26: Introduction of dialog to choose whether to resize a pictur...	steckbrief	2015-11-03	2	-20/+22
* \|	Access to preferences moved to global utility class ConversationsPlusPreferen...	steckbrief	2015-10-21	3	-9/+7
\|/
*	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...	steckbrief	2015-10-04	2	-1/+66
*	Fixes FS#49: Highlight the selected conversation in list	steckbrief	2015-09-02	1	-4/+6
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	2	-8/+2
*	resolve of some compiler errors	lookshe	2015-08-13	1	-0/+1
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	4	-86/+93
*	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	steckbrief	2015-06-19	1	-2/+5
*	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	1	-0/+4
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	5	-0/+1133