Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3423d6ffe
							
						
					 | 
					
						
						
							
							include pgp signature only in non anonymous mucs
						
						
						
						
						
					 | 
					
						2016-10-19 12:31:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dce8149aae
							
						
					 | 
					
						
						
							
							retrigger key selection if openpgp key was deleted
						
						
						
						
						
					 | 
					
						2016-10-19 11:53:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7226fc0010
							
						
					 | 
					
						
						
							
							update conversation in database background thread
						
						
						
						
						
					 | 
					
						2016-10-18 13:06:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							50780debf7
							
						
					 | 
					
						
						
							
							don't trigger context menu in message adapter manually. fixes #2077
						
						
						
						
						
					 | 
					
						2016-10-18 11:16:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8c21caec9
							
						
					 | 
					
						
						
							
							Merge branch 'feature-selection' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-selection
						
						
						
						
						
					 | 
					
						2016-10-17 09:53:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							22d13a3dcd
							
						
					 | 
					
						
						
							
							add exception handling when loading default resource
						
						
						
						
						
					 | 
					
						2016-10-17 09:53:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc02e2b498
							
						
					 | 
					
						
						
							
							small code reformation in pgp decryption service
						
						
						
						
						
					 | 
					
						2016-10-17 09:52:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6371d2b7a9
							
						
					 | 
					
						
						
							
							Merge pull request #2063 from thacoon/patch-1
						
						
						
						
						
						
						
						Fix OpenPGP link 
						
					 | 
					
						2016-10-13 12:21:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a73b8d76e
							
						
					 | 
					
						
						
							
							clarified fineprint a little bit
						
						
						
						
						
					 | 
					
						2016-10-13 12:17:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6cfa27741
							
						
					 | 
					
						
						
							
							synchronize access to json key storage in account model
						
						
						
						
						
					 | 
					
						2016-10-13 11:27:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							501152bcfd
							
						
					 | 
					
						
						
							
							version bump to 1.14.6 + changelog
						
						
						
						
						
					 | 
					
						2016-10-10 17:54:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e54fd5c92
							
						
					 | 
					
						
						
							
							don't use sending state on muc pms without smacks
						
						
						
						
						
					 | 
					
						2016-10-09 19:40:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd1c05a7c3
							
						
					 | 
					
						
						
							
							add password to direct muc invite
						
						
						
						
						
					 | 
					
						2016-10-09 19:40:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7d51b8890
							
						
					 | 
					
						
						
							
							pulled more translations from transifex
						
						
						
						
						
					 | 
					
						2016-10-09 18:06:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5bdb04490
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-10-09 11:13:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							74087b873f
							
						
					 | 
					
						
						
							
							added disclaimer that conversations.im account is 8 euro / year
						
						
						
						
						
					 | 
					
						2016-10-08 18:24:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Constantin Soffner
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad8b9eb054
							
						
					 | 
					
						
						
							
							Fix OpenPGP link
						
						
						
						
						
						
						
						I have just updated the link to the OpenPGP website. 
						
					 | 
					
						2016-10-08 14:40:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3ef8d4978
							
						
					 | 
					
						
						
							
							fetch new conference configuration on every conf update
						
						
						
						
						
					 | 
					
						2016-10-08 12:10:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9efef24a04
							
						
					 | 
					
						
						
							
							reset sending to waiting on every error
						
						
						
						
						
					 | 
					
						2016-10-07 14:54:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a73a6b139
							
						
					 | 
					
						
						
							
							fixed account hash calculation
						
						
						
						
						
					 | 
					
						2016-10-07 14:54:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f7f82da7b
							
						
					 | 
					
						
						
							
							respond to chat marker request only when mutual presence subscription exists
						
						
						
						
						
					 | 
					
						2016-10-07 10:05:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							26e33de79a
							
						
					 | 
					
						
						
							
							create new instances of key manager every time it's used
						
						
						
						
						
					 | 
					
						2016-10-07 10:04:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							187825d6c6
							
						
					 | 
					
						
						
							
							warn user if account is offline during avatar publication
						
						
						
						
						
					 | 
					
						2016-10-06 22:06:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d5f23213b
							
						
					 | 
					
						
						
							
							refresh error notification after 'try again'
						
						
						
						
						
					 | 
					
						2016-10-06 22:05:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0af13fc746
							
						
					 | 
					
						
						
							
							be more careful parsing integers in omemo
						
						
						
						
						
					 | 
					
						2016-10-06 22:05:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5530b0b0e2
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations
						
						
						
						
						
					 | 
					
						2016-10-06 18:39:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							40e5090bdd
							
						
					 | 
					
						
						
							
							issue ping after push was received
						
						
						
						
						
					 | 
					
						2016-10-06 18:09:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f060f477f
							
						
					 | 
					
						
						
							
							parse smacks delay from messages
						
						
						
						
						
					 | 
					
						2016-10-06 18:09:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d8cb92e43
							
						
					 | 
					
						
						
							
							try to fix messages stuck at sending
						
						
						
						
						
					 | 
					
						2016-10-06 17:23:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							27af6a4b1e
							
						
					 | 
					
						
						
							
							Add client recommandition to readme. fixes #2048
						
						
						
						
						
					 | 
					
						2016-10-05 09:05:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							082c06a486
							
						
					 | 
					
						
						
							
							make error notification dismissable. fixes #1815
						
						
						
						
						
					 | 
					
						2016-10-04 11:16:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ac0e9267d
							
						
					 | 
					
						
						
							
							fixed omemo shown as unavailable in 1:1 chats
						
						
						
						
						
					 | 
					
						2016-10-03 21:04:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cea52b0722
							
						
					 | 
					
						
						
							
							resolve take photo uri for internal use
						
						
						
						
						
					 | 
					
						2016-10-03 18:26:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4a883848c
							
						
					 | 
					
						
						
							
							properly index take photo uris from file provider
						
						
						
						
						
					 | 
					
						2016-10-03 11:25:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6e7def9db
							
						
					 | 
					
						
						
							
							add more logging to attaching file process
						
						
						
						
						
					 | 
					
						2016-10-03 11:13:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c6d1d19d5
							
						
					 | 
					
						
						
							
							when activating omemo in conference always check preferences
						
						
						
						
						
					 | 
					
						2016-10-03 10:42:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcd6ef8f84
							
						
					 | 
					
						
						
							
							explicit logging when copying files to storage
						
						
						
						
						
					 | 
					
						2016-10-03 10:13:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6c2ff9782
							
						
					 | 
					
						
						
							
							version bump to 1.14.5 + changelog
						
						
						
						
						
					 | 
					
						2016-10-01 15:49:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0fb9fd9ee
							
						
					 | 
					
						
						
							
							added nick to conference jid example
						
						
						
						
						
					 | 
					
						2016-09-28 13:20:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e275fd8143
							
						
					 | 
					
						
						
							
							Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notification
						
						
						
						
						
						
						
						Dismiss the notification when replying from a wear notification [needs review!] 
						
					 | 
					
						2016-09-28 12:39:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							43f5dfe174
							
						
					 | 
					
						
						
							
							simplified code that invokes the export logs service
						
						
						
						
						
					 | 
					
						2016-09-28 12:35:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0dbcce58f
							
						
					 | 
					
						
						
							
							expert 'setting' to remove omemo identity. fixes #2038
						
						
						
						
						
					 | 
					
						2016-09-28 12:24:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniele Gobbetti
							
						 
					 | 
					
						
						
						
						
							
						
						
							41db773b08
							
						
					 | 
					
						
						
							
							Allow to dismiss the notification from a wear reply.
						
						
						
						
						
						
						
						- use different IDs in the same method for the PendingIntent
- fix reply for GPG encrypted replies (untested) 
						
					 | 
					
						2016-09-27 17:39:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cd8917122
							
						
					 | 
					
						
						
							
							remove dubplicate play service dependency from build
						
						
						
						
						
					 | 
					
						2016-09-27 11:45:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb48f67a30
							
						
					 | 
					
						
						
							
							always use ipv4 localhost for Orbot connections
						
						
						
						
						
					 | 
					
						2016-09-27 11:44:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1339b9c464
							
						
					 | 
					
						
						
							
							don't reset encryption choice to auto on archiving
						
						
						
						
						
					 | 
					
						2016-09-24 21:29:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cee3c98a23
							
						
					 | 
					
						
						
							
							version bump to 1.14.4 + changelog
						
						
						
						
						
					 | 
					
						2016-09-24 21:24:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							343d895a26
							
						
					 | 
					
						
						
							
							don't react to null and empty voice replies
						
						
						
						
						
					 | 
					
						2016-09-21 19:04:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							13ed27f91e
							
						
					 | 
					
						
						
							
							don't use file provider for photo uris on android < N. fixes #2030
						
						
						
						
						
					 | 
					
						2016-09-21 18:20:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							401759cdc7
							
						
					 | 
					
						
						
							
							don't wait for disco when not having stream managment
						
						
						
						
						
					 | 
					
						2016-09-21 12:55:40 +02:00 | 
					
					
						
						
							
							
							
						
					 |