conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| \| \| \| \| \| \| \| \| \|	save state of treatAsDownloadable() and set on error to specified value
* \| \|	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
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
\| * \	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	2	-4/+7
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
* \| \| \|	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
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	fixed imports	lookshe	2015-10-05	4	-10/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'trz/rename' into trz/rebase	lookshe	2015-10-05	30	-9405/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* \| \| \| \| \| \| \|	Moved all avatar related work to AvatarService	steckbrief	2016-01-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- publishAvatar moved from XmppConnectionService to AvatarService
* \| \| \| \| \| \| \|	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	9	-23/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- fetchAvatar, fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from XmppConnectionService to AvatarService - Several unused imports removed - XmppSendUtil introduced to enable presencePacket and iqPacket sending without using XmppConnectionService since the account has everything needed - UiUpdateHelper introduced to enable UI updates without using XmppConnectionService directly
* \| \| \| \| \| \| \|	Fixes FS#107, Implements FS#77	steckbrief	2016-01-08	1	-1/+11
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show the number of online resources in account view and enable show resources by clicking on the account jid
* \| \| \| \| \| \|	Log error in case logcat command could not be executed; Show toast in case ↵	steckbrief	2015-12-17	1	-1/+1
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nothing is copied
* \| \| \| \| \|	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵	steckbrief	2015-12-16	1	-2/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	distinguishes between image resizing and compressing/saving
* \| \| \| \| \|	Fixes FS#95: NPE when opening message details for failed file transfer	steckbrief	2015-12-16	1	-1/+2
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	7	-19/+67
\| \| \| \| \|
* \| \| \| \|	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	3	-16/+44
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	2	-15/+8
\| \|_\|/ \|/\| \|
* \| \|	Implements FS#67: Introduce central logging class to use log prefix, new ↵	steckbrief	2015-11-20	6	-13/+44
\| \| \| \| \| \| \| \| \| \| \| \|	activity to show logcat output and button to copy contents
* \| \|	FileBackend splitted into several util classes for separate concerns: ↵	steckbrief	2015-11-06	5	-19/+13
\| \|/ \|/\| \| \| \| \|	AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* \|	Implements FS#26: Introduction of dialog to choose whether to resize a ↵	steckbrief	2015-11-03	10	-121/+351
\| \| \| \| \| \| \| \|	picture or not
* \|	Implements FS#24: Introduce setting for picture resizing	steckbrief	2015-10-30	1	-0/+1
\| \|
* \|	Access to preferences moved to global utility class ↵	steckbrief	2015-10-21	9	-143/+107
\| \| \| \| \| \| \| \|	ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* \|	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
\| \|
* \|	Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵	steckbrief	2015-10-05	1	-2/+2
\|/ \| \| \|	access to app information