conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes FS#155: Check FileHelper vs. FileUtils	steckbrief	2016-03-12	1	-6/+3
\|
*	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	1	-9/+0
\|
*	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	1	-1/+2
\|
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	3	-15/+16
\|\
\| *	Imports organized	steckbrief	2016-02-12	2	-3/+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-16	1	-2/+91
\| \|\ \| \|/ \|/\|
\| *	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	3	-0/+157
\| \|\
\| * \|	fixed imports	lookshe	2015-10-05	1	-2/+2
\| \| \|
\| * \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	2	-166/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* \| \|	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-2/+90
\| \| \| \| \| \| \| \| \| \| \| \|	distinguishes between image resizing and compressing/saving
* \| \|	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-14/+34
\| \| \|
* \| \|	Fix flagging no more messages on server for conversation	steckbrief	2015-12-06	2	-1/+14
\| \| \|
* \| \|	Implements FS#83: Reload from last received message	steckbrief	2015-12-04	2	-13/+40
\| \| \|
* \| \|	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	1	-3/+3
\| \|/ \|/\| \| \| \| \|	activity to show logcat output and button to copy contents
* \|	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	3	-0/+157
\| \| \| \| \| \| \| \|	picture or not
* \|	added comment for clarification, why the timestamp of the first msg of msg ↵	steckbrief	2015-10-17	1	-1/+1
\| \| \| \| \| \| \| \|	list is needed to query older msgs with mam
* \|	Removed unused imports	steckbrief	2015-10-15	1	-4/+0
\| \|
* \|	Fixes FS#81 - avoid jumps after loading messages	steckbrief	2015-10-15	1	-10/+32
\|/
*	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵	steckbrief	2015-10-04	1	-0/+47
\| \| \| \| \| \| \|	Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
*	moved merged files to correct location0.0.3	lookshe	2015-08-16	2	-0/+166