conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| * \| \|	No possibility of multiple invocation of log export	fiaxh	2016-02-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	changed single_account config into more simple lock_settings	Daniel Gultsch	2016-02-27	8	-8/+29
\| \|/ / / /
* \| \| \| \|	Fixes FS#151 - Missing button on image-links	lookshe	2016-03-07	4	-5/+6
\| \| \| \| \|
* \| \| \| \|	corrected getRealPathFromUri	lookshe	2016-03-07	1	-2/+3
\| \| \| \| \|
* \| \| \| \|	Implements: FS#142 - Fix Conference notifications	lookshe	2016-03-06	2	-7/+5
\| \| \| \| \|
* \| \| \| \|	Fixes FS#147: Disable OMEMO	steckbrief	2016-03-02	14	-978/+1311
\| \| \| \| \|
* \| \| \| \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	10	-70/+11
\| \| \| \| \|
* \| \| \| \|	Fixes FS#148: Remove 'store' hint from chat-markers	steckbrief	2016-03-02	1	-2/+1
\| \| \| \| \|
* \| \| \| \|	Merge tag '1.10.1' into trz/merge_1.10.1	steckbrief	2016-02-28	20	-94/+221
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	disallow message correction by default. fixes #1720	Daniel Gultsch	2016-02-26	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	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	9	-22/+74
\| \| \| \| \|
\| * \| \| \|	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	3	-1/+17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	PGP Retry decryption from message menu
\| \| * \| \|	Retry decryption from message menu	fiaxh	2016-02-23	3	-1/+17
\| \| \|/ /
\| * \| \|	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
\| \| \| \|
\| * \| \|	made presences object final in contact	Daniel Gultsch	2016-02-23	1	-5/+1
\| \|/ /
\| * \|	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	5	-37/+51
\| \| \|
* \| \|	Fixes FS#48 and FS#136trz/merge_1.10.0	lookshe	2016-02-28	4	-21/+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
\| \| \|
* \| \|	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	1	-18/+9
\| \| \| \| \| \| \| \| \| \| \| \|	XmppConnectionService marked as deprecated
* \| \|	Removed stupid message correction	steckbrief	2016-02-23	6	-110/+10
\| \| \|
* \| \|	Removed useless 'button-message' to load more messages. Implementation ↵	steckbrief	2016-02-23	5	-68/+8
\| \| \| \| \| \| \| \| \| \| \| \|	already done with a more convenient method
* \| \|	Changed access to presences according to new Presence representation in C	steckbrief	2016-02-23	2	-11/+12
\| \| \|
* \| \|	Removed non-existing member variable	steckbrief	2016-02-23	1	-1/+1
\| \| \|
* \| \|	Fix visibility of updateStatusMessages method that LoadMoreMessages can work	steckbrief	2016-02-23	1	-1/+1
\| \| \|
* \| \|	Removed unnecessary dependencies to XmppConnectionService and added ↵	steckbrief	2016-02-23	4	-43/+7
\| \| \| \| \| \| \| \| \| \| \| \|	allowMessageCorrection to preferences
* \| \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	22	-144/+509
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.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/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
\| * \|	show load more messages when auto loading is disabled and messages are still ↵	Daniel Gultsch	2016-02-21	2	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \|	left on server
\| * \|	check for uuid change when decrypting pgp messages	Daniel Gultsch	2016-02-21	1	-7/+6
\| \| \|
\| * \|	some mucs may grant voice to visitors in unmoderated rooms	Daniel Gultsch	2016-02-21	1	-1/+3
\| \| \|
\| * \|	change uuid when replacing messages	Daniel Gultsch	2016-02-20	2	-1/+9
\| \| \|
\| * \|	decrypt pgp message corrections	Daniel Gultsch	2016-02-19	1	-8/+9
\| \| \|
\| * \|	skip avatar ui when pep is not available. fixes #1706	Daniel Gultsch	2016-02-19	1	-5/+5
\| \| \|
\| * \|	don't reset whisper on reInit. fixes #1637	Daniel Gultsch	2016-02-19	1	-3/+0
\| \| \|
\| * \|	never parse show in presences as offline	Daniel Gultsch	2016-02-19	2	-12/+16
\| \| \|
\| * \|	don't log start reason	Daniel Gultsch	2016-02-17	1	-1/+0
\| \| \|
\| * \|	only offer message correction for the very last message	Daniel Gultsch	2016-02-17	4	-8/+37
\| \| \|
\| * \|	fixed regression that caused messages in muc not being send	Daniel Gultsch	2016-02-17	2	-7/+8
\| \| \|
\| * \|	log reason why otr message won't be parsed	Daniel Gultsch	2016-02-16	1	-1/+2
\| \| \|
\| * \|	fixed regression that caused ui to redraw a lot	Daniel Gultsch	2016-02-16	1	-4/+8
\| \| \|
\| * \|	made clear that archiving preferences are server side	Daniel Gultsch	2016-02-16	1	-1/+1
\| \| \|
\| * \|	added setting to opt-out of message correction. renamed preferences and ↵	Daniel Gultsch	2016-02-16	4	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \|	options to settings