Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb203f5fd3
							
						
					 | 
					
						
						
							
							Keep draft even when correcting previously sent msg
						
						
						
						
						
						
						
						fixes #1822. Thank you @singhalok641 
						
					 | 
					
						2017-03-04 08:05:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d166309393
							
						
					 | 
					
						
						
							
							Merge branch 'hareshkh-master'
						
						
						
						
						
					 | 
					
						2017-03-03 23:59:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Haresh Khanna
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2d2966b31
							
						
					 | 
					
						
						
							
							Squash : Adds number of unread messages for every conversation. Fixes #2181
						
						
						
						
						
					 | 
					
						2017-03-04 04:26:19 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c789b75cc
							
						
					 | 
					
						
						
							
							fixed messages vanishing after pgp raised error on editing a message
						
						
						
						
						
					 | 
					
						2017-03-03 15:21:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							58595fccfe
							
						
					 | 
					
						
						
							
							show icons in pop menu with reflection. imagespan was not centred vertically
						
						
						
						
						
					 | 
					
						2017-03-03 12:26:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							768d79c621
							
						
					 | 
					
						
						
							
							Merge branch 'issue_#1200' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#1200
						
						
						
						
						
					 | 
					
						2017-03-03 12:01:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							afa34ce15a
							
						
					 | 
					
						
						
							
							block send action while encrypting pgp message
						
						
						
						
						
					 | 
					
						2017-03-03 11:56:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							469cf72e56
							
						
					 | 
					
						
						
							
							make notification icon size depend on 'Large Text' setting
						
						
						
						
						
					 | 
					
						2017-03-03 11:55:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vikiCoder
							
						 
					 | 
					
						
						
						
						
							
						
						
							51ef096e01
							
						
					 | 
					
						
						
							
							fixes #1200 : Added icons for the attach options according to material design guidlines
						
						
						
						
						
					 | 
					
						2017-03-03 16:01:44 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cce653a1f
							
						
					 | 
					
						
						
							
							changed default setting for enter_is_send on devices with keyboard
						
						
						
						
						
					 | 
					
						2017-03-02 13:03:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c740386297
							
						
					 | 
					
						
						
							
							rename the Xmlns class to Namespace
						
						
						
						
						
					 | 
					
						2017-03-01 13:01:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ea1e28267b
							
						
					 | 
					
						
						
							
							bump mam namespace to :2
						
						
						
						
						
					 | 
					
						2017-03-01 12:50:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecd53580c0
							
						
					 | 
					
						
						
							
							show 'show inactive keys' button also when there are no active keys
						
						
						
						
						
					 | 
					
						2017-03-01 12:50:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							23a91e5019
							
						
					 | 
					
						
						
							
							use priority low when creating notification without sound/vibration.
						
						
						
						
						
						
						
						should prevent notifcations showing up in ambient display 
						
					 | 
					
						2017-02-28 15:32:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4cddf31ad2
							
						
					 | 
					
						
						
							
							properly handle onNewIntent() in StartConversations activity
						
						
						
						
						
						
						
						* fixes a glitch a caused xmpp uris not to open when activiy was already started 
						
					 | 
					
						2017-02-28 11:48:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f4c5ff97c
							
						
					 | 
					
						
						
							
							properly trim() incoming imto: uris
						
						
						
						
						
					 | 
					
						2017-02-27 22:48:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7ec82679f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations
						
						
						
						
						
					 | 
					
						2017-02-24 20:00:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e0e81a603
							
						
					 | 
					
						
						
							
							bump notification priority to high as per android design guidelines
						
						
						
						
						
					 | 
					
						2017-02-24 19:59:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c0ff882a9
							
						
					 | 
					
						
						
							
							make x509 verification node world readable
						
						
						
						
						
					 | 
					
						2017-02-24 19:58:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a28116753a
							
						
					 | 
					
						
						
							
							Merge pull request #2315 from licaon-kter/lecagy-typo
						
						
						
						
						
						
						
						Fix a typo in legacy 
						
					 | 
					
						2017-02-19 18:43:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								licaon-kter
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3dd80eec9
							
						
					 | 
					
						
						
							
							Fix a typo in legacy
						
						
						
						
						
					 | 
					
						2017-02-19 15:47:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d00ff0c15
							
						
					 | 
					
						
						
							
							migrate domain and host exemption into seperate class
						
						
						
						
						
					 | 
					
						2017-02-19 13:05:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							abaabae853
							
						
					 | 
					
						
						
							
							only change actionbar display options when changed
						
						
						
						
						
					 | 
					
						2017-02-18 18:08:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							79858278e0
							
						
					 | 
					
						
						
							
							version bump to 1.16.2 + changelog
						
						
						
						
						
					 | 
					
						2017-02-18 18:08:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c69ad8f52c
							
						
					 | 
					
						
						
							
							npe checks
						
						
						
						
						
					 | 
					
						2017-02-17 10:26:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf9ab4d302
							
						
					 | 
					
						
						
							
							synchronize modifications of output stream in tag writer
						
						
						
						
						
					 | 
					
						2017-02-17 10:26:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f0e1b71c0
							
						
					 | 
					
						
						
							
							explicitly turn off vibration when disabled. fixes #1255
						
						
						
						
						
					 | 
					
						2017-02-16 13:31:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							caa16a8517
							
						
					 | 
					
						
						
							
							experimental mam legacy compat layer
						
						
						
						
						
					 | 
					
						2017-02-15 16:42:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e62b62b80
							
						
					 | 
					
						
						
							
							respond to xep-0184 requests in muc pms
						
						
						
						
						
					 | 
					
						2017-02-15 12:09:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7e95d105c
							
						
					 | 
					
						
						
							
							fixed behaviour in message parser when doing mam catchup
						
						
						
						
						
					 | 
					
						2017-02-15 00:08:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb249e0881
							
						
					 | 
					
						
						
							
							only extract stanza-id from live messages when disco feature is set
						
						
						
						
						
					 | 
					
						2017-02-14 23:16:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b90a1fe1db
							
						
					 | 
					
						
						
							
							bump mam namespace
						
						
						
						
						
					 | 
					
						2017-02-14 17:19:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2665c3a1e0
							
						
					 | 
					
						
						
							
							rethink mam catchup strategies
						
						
						
						
						
					 | 
					
						2017-02-14 16:50:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9116782cdc
							
						
					 | 
					
						
						
							
							fixed adhoc conference creation behaviour. properly show errors. fixes #2290
						
						
						
						
						
					 | 
					
						2017-02-13 17:32:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f97be68e
							
						
					 | 
					
						
						
							
							only force close tagwriter before creating a new one
						
						
						
						
						
					 | 
					
						2017-02-13 13:01:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b81ff70e5
							
						
					 | 
					
						
						
							
							clear avatar cache when system name changes
						
						
						
						
						
					 | 
					
						2017-02-10 20:26:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e367cb115
							
						
					 | 
					
						
						
							
							version bump to 1.16.1 + changelog
						
						
						
						
						
					 | 
					
						2017-02-10 14:26:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							edb3f57242
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-02-10 14:19:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							54ae8abcb7
							
						
					 | 
					
						
						
							
							add no_padding, no_wrap to file upload slots
						
						
						
						
						
					 | 
					
						2017-02-10 13:50:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							82385e38f6
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-02-09 20:14:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							55e9067b27
							
						
					 | 
					
						
						
							
							do not auto link non-http URLs
						
						
						
						
						
					 | 
					
						2017-02-09 20:14:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c76b073b8e
							
						
					 | 
					
						
						
							
							do not sync thumbnail creation on cache. fixes #2283
						
						
						
						
						
					 | 
					
						2017-02-09 14:32:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f60dd98d3c
							
						
					 | 
					
						
						
							
							only count push as available when sm is to avoid race conditions
						
						
						
						
						
					 | 
					
						2017-02-08 16:52:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7317f5015a
							
						
					 | 
					
						
						
							
							version bump to 1.16.0 + changelog
						
						
						
						
						
					 | 
					
						2017-02-08 16:51:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6569f20737
							
						
					 | 
					
						
						
							
							update shortcut badger. fixes #2268
						
						
						
						
						
					 | 
					
						2017-02-08 10:49:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9e2ab62b2
							
						
					 | 
					
						
						
							
							add index to message.conversationUuid
						
						
						
						
						
					 | 
					
						2017-02-07 21:17:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							24fab162e2
							
						
					 | 
					
						
						
							
							renamed omemo:// to aesgcm://
						
						
						
						
						
					 | 
					
						2017-02-07 20:07:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							71ad18beb9
							
						
					 | 
					
						
						
							
							support omemo:// style urls
						
						
						
						
						
					 | 
					
						2017-02-07 19:32:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c37117b940
							
						
					 | 
					
						
						
							
							update copyright information
						
						
						
						
						
					 | 
					
						2017-02-07 19:31:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6be3ae8ef0
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-02-07 17:57:24 +01:00 | 
					
					
						
						
							
							
							
						
					 |