conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	.jar removedtrz/test	lookshe	2016-03-07	1	-1/+1
\|
*	dependency for EnhancedListView added	lookshe	2016-03-07	2	-0/+1
\|
*	compile error	lookshe	2016-03-07	1	-1/+0
\|
*	nearly same as 1.10.1	lookshe	2016-03-07	1	-6/+8
\|
*	new version to build	lookshe	2016-03-07	1	-2/+2
\|
*	test for swipe out bug FS#150	lookshe	2016-03-07	1	-2/+3
\|
*	Fixes: FS#94 - wrong size on emojicon keyboardtrz/1.10.1.1	lookshe	2016-03-06	2	-3/+20
\|
*	Implements: FS#142 - Fix Conference notifications	lookshe	2016-03-06	2	-7/+5
\|
*	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	20	-981/+1331
\|
*	Readme updated	steckbrief	2016-03-02	1	-0/+5
\|
*	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	34	-142/+13
\|
*	Fixes FS#148: Remove 'store' hint from chat-markers	steckbrief	2016-03-02	1	-2/+1
\|
*	externalized string 'Retry decryption'trz/merge_1.10.1	steckbrief	2016-02-28	3	-1/+3
\|
*	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	26	-100/+238
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml
\| *	version bump to 1.10.1 and changelog1.10.1	Daniel Gultsch	2016-02-26	2	-2/+6
\| \|
\| *	disallow message correction by default. fixes #1720	Daniel Gultsch	2016-02-26	2	-2/+2
\| \|
\| *	execute pending mam queries every time we come online	Daniel Gultsch	2016-02-26	1	-1/+1
\| \|
\| *	hide add account icons when single_account is set to true	Daniel Gultsch	2016-02-24	2	-1/+5
\| \|
\| *	optionally lock conference domains as well and hide known domains in ui	Daniel Gultsch	2016-02-24	10	-22/+76
\| \|
\| *	made hard coded choice for encryptions more flexible and disable parsing	Daniel Gultsch	2016-02-24	6	-26/+66
\| \|
\| *	Merge pull request #1715 from fiaxh/gpg_decryption_failed	Daniel Gultsch	2016-02-24	5	-2/+21
\| \|\ \| \| \| \| \| \|	PGP Retry decryption from message menu
\| \| *	Retry decryption from message menu	fiaxh	2016-02-23	5	-2/+21
\| \| \|
\| * \|	set noMessagesLeftOnServer before conference configuration fetch	Daniel Gultsch	2016-02-23	2	-2/+2
\| \| \|
\| * \|	update notification after message correction	Daniel Gultsch	2016-02-23	1	-0/+1
\| \| \|
\| * \|	reset pending subscription request when receiving roster update	Daniel Gultsch	2016-02-23	1	-0/+2
\| \| \|
\| * \|	Revert "disable predexing on travis"	Daniel Gultsch	2016-02-23	2	-103/+95
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28.
\| * \|	disable predexing on travis	Daniel Gultsch	2016-02-23	2	-95/+103
\| \| \|
\| * \|	made presences object final in contact	Daniel Gultsch	2016-02-23	1	-5/+1
\| \| \|
\| * \|	fixed typo in travis.yml	Daniel Gultsch	2016-02-23	1	-1/+1
\| \| \|
\| * \|	fixed formating in travis config	Daniel Gultsch	2016-02-23	1	-1/+1
\| \| \|
\| * \|	added remark that users don't need their own app server	Daniel Gultsch	2016-02-23	1	-1/+3
\| \| \|
\| * \|	tell travis to build free version	Daniel Gultsch	2016-02-23	1	-0/+2
\| \| \|
\| * \|	update build instructions in readme	Daniel Gultsch	2016-02-23	1	-2/+4
\| \|/
\| *	properly trigger show load more messages in mucs	Daniel Gultsch	2016-02-22	1	-2/+10
\| \|
\| *	turned muc errors into enum. added error codes for service shutdown	Daniel Gultsch	2016-02-22	6	-39/+54
\| \|
* \|	Fixes FS#48 and FS#136trz/merge_1.10.0	lookshe	2016-02-28	5	-24/+3
\| \| \| \| \| \| \| \| \| \|	- corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage
* \|	Unused imports / methods removed	steckbrief	2016-02-24	3	-27/+0
\| \|
* \|	Fixes FS#89 after merge conflict	steckbrief	2016-02-24	1	-3/+6
\| \|
* \|	Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵	steckbrief	2016-02-24	2	-11/+1
\| \| \| \| \| \| \| \|	for auto downloading image links moved to global Utility Class)
* \|	Readded MessageDetailsDialog to message context menu after merge	steckbrief	2016-02-24	1	-0/+4
\| \|
* \|	Reviewed commit for FS#34 after merge	steckbrief	2016-02-24	2	-2/+2
\| \|
* \|	Packet sending helper moved to XmppSendUtil and methods in ↵	steckbrief	2016-02-23	2	-18/+17
\| \| \| \| \| \| \| \|	XmppConnectionService marked as deprecated
* \|	Removed stupid message correction	steckbrief	2016-02-23	34	-167/+10
\| \|
* \|	Removed useless 'button-message' to load more messages. Implementation ↵	steckbrief	2016-02-23	21	-92/+8
\| \| \| \| \| \| \| \|	already done with a more convenient method
* \|	Changed access to presences according to new Presence representation in C	steckbrief	2016-02-23	3	-14/+15
\| \|
* \|	Removed non-existing member variable	steckbrief	2016-02-23	1	-1/+1
\| \|
* \|	Explicit applicationId removed	steckbrief	2016-02-23	1	-1/+0
\| \|
* \|	Fix visibility of updateStatusMessages method that LoadMoreMessages can work	steckbrief	2016-02-23	1	-1/+1
\| \|
* \|	Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)	steckbrief	2016-02-23	1	-0/+15
\| \|
* \|	Removed unnecessary dependencies to XmppConnectionService and added ↵	steckbrief	2016-02-23	5	-43/+11
\| \| \| \| \| \| \| \|	allowMessageCorrection to preferences