Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a5d2e35b5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-24 12:05:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbd45d3ee5 
							
						 
					 
					
						
						
							
							changed design language to match BTBV proposal  
						
						... 
						
						
						
						* untrusted messages have red background
* unverified message have normal background and red lock 
						
					 
					
						2016-11-24 11:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2ec7165381 
							
						 
					 
					
						
						
							
							update the conversations view (and the lock icon) after receiving device list  
						
						
						
					 
					
						2016-11-24 11:28:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20d3a41b52 
							
						 
					 
					
						
						
							
							explictly scan for aztec and qr codes only  
						
						
						
					 
					
						2016-11-23 11:01:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							839ef8e14b 
							
						 
					 
					
						
						
							
							introduced blind trust before verification mode  
						
						... 
						
						
						
						read more about the concept on https://gultsch.de/trust.html  
						
					 
					
						2016-11-23 10:42:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4720ac94d3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-11-22 22:32:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07fe434cc7 
							
						 
					 
					
						
						
							
							added share button to account details  
						
						
						
					 
					
						2016-11-22 22:31:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2268c6a6f 
							
						 
					 
					
						
						
							
							show proper avatar for 'self' contact.  fixes   #2138  
						
						
						
					 
					
						2016-11-22 12:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d76b0a3104 
							
						 
					 
					
						
						
							
							offer verification directly from the trust keys screen  
						
						
						
					 
					
						2016-11-22 12:03:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7e0fd153 
							
						 
					 
					
						
						
							
							use aztec code instead of qr  
						
						
						
					 
					
						2016-11-21 12:01:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6631705aea 
							
						 
					 
					
						
						
							
							use constants for some preferences  
						
						
						
					 
					
						2016-11-21 11:03:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b99346a4b 
							
						 
					 
					
						
						
							
							when swiping don't clean startup counter entirely. just don't count last startup  
						
						
						
					 
					
						2016-11-21 10:48:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c31b96920 
							
						 
					 
					
						
						
							
							Merge pull request  #2130  from da2x/patch-2  
						
						... 
						
						
						
						Fix up the langauge in some Settings strings 
						
					 
					
						2016-11-20 00:39:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64e8035f6d 
							
						 
					 
					
						
						
							
							introduced custom tls socket factory to make tls1.2 work for http connections  
						
						
						
					 
					
						2016-11-20 00:39:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71aa6d3a4 
							
						 
					 
					
						
						
							
							remove omemo devices from annoucement after 7 days of inactivity  
						
						
						
					 
					
						2016-11-19 21:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2614706d39 
							
						 
					 
					
						
						
							
							don't show omemo keys by default in account details  
						
						
						
					 
					
						2016-11-19 21:32:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb639f3fdd 
							
						 
					 
					
						
						
							
							don't use xmpp uri for self verification if account is disabled  
						
						
						
					 
					
						2016-11-19 21:31:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6362799d56 
							
						 
					 
					
						
						
							
							save last activation time in fingerprint status  
						
						
						
					 
					
						2016-11-19 13:34:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40c747660d 
							
						 
					 
					
						
						
							
							removed some unecessary locking  
						
						
						
					 
					
						2016-11-19 13:34:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8132480b82 
							
						 
					 
					
						
						
							
							close socket after failed stream open  
						
						
						
					 
					
						2016-11-19 12:20:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bf2876e09 
							
						 
					 
					
						
						
							
							check if thread was interrupted before doing operations on socket  
						
						
						
					 
					
						2016-11-19 10:44:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1820b163a1 
							
						 
					 
					
						
						
							
							fixed regression that would crash create contact dialog.  fixes   #2131  
						
						
						
					 
					
						2016-11-19 10:29:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Aleksandersen 
							
						 
					 
					
						
						
						
						
							
						
						
							965f73f95a 
							
						 
					 
					
						
						
							
							Fix up the langauge in some Settings strings  
						
						
						
					 
					
						2016-11-19 05:00:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9b3be3f1 
							
						 
					 
					
						
						
							
							show 'clear devices' button underneath own devices  
						
						
						
					 
					
						2016-11-18 21:49:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a86a36f570 
							
						 
					 
					
						
						
							
							removed some unecessary logging from omemo message generation  
						
						
						
					 
					
						2016-11-18 20:13:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01f92ef4ee 
							
						 
					 
					
						
						
							
							lower own otr fingerprint  
						
						
						
					 
					
						2016-11-18 20:12:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d68b7cfcfc 
							
						 
					 
					
						
						
							
							issue ping after network change  
						
						
						
					 
					
						2016-11-18 14:00:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fef601b4ae 
							
						 
					 
					
						
						
							
							lower reconnection time  
						
						
						
					 
					
						2016-11-18 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0303c28ad9 
							
						 
					 
					
						
						
							
							synchronzie on xmpp service around all state changes  
						
						
						
					 
					
						2016-11-18 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed2445c1d 
							
						 
					 
					
						
						
							
							don't reset last connect time on network change  
						
						
						
					 
					
						2016-11-18 13:55:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ee8f8a74 
							
						 
					 
					
						
						
							
							use lower case otr fingerprints for comparison  
						
						
						
					 
					
						2016-11-18 13:13:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d9a9e63ad 
							
						 
					 
					
						
						
							
							removed some very verbose logging from axolotl service  
						
						
						
					 
					
						2016-11-18 13:03:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99a41265b8 
							
						 
					 
					
						
						
							
							lower casing fingerprints when parsing URI  
						
						
						
					 
					
						2016-11-18 13:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							211354ee26 
							
						 
					 
					
						
						
							
							put omemo fingerprint in own uri (qr code / nfc)  
						
						
						
					 
					
						2016-11-17 22:28:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e2e42cb11 
							
						 
					 
					
						
						
							
							parse omemo fingerprints from uris  
						
						
						
					 
					
						2016-11-17 20:09:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3f3b360eee 
							
						 
					 
					
						
						
							
							fixed back and forth between Welcome- and EditAccountActivity  
						
						
						
					 
					
						2016-11-17 11:40:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad9a8c2281 
							
						 
					 
					
						
						
							
							use base64.nowrap for omemo keys  
						
						
						
					 
					
						2016-11-17 10:58:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d965e96ed 
							
						 
					 
					
						
						
							
							reset startup count when swiped away (only count kills)  
						
						
						
					 
					
						2016-11-17 10:58:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d8bff08f1f 
							
						 
					 
					
						
						
							
							slightly darken verified icon + mark inactive  
						
						
						
					 
					
						2016-11-16 09:39:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ec63900ef3 
							
						 
					 
					
						
						
							
							work around -1 in next encryption  
						
						
						
					 
					
						2016-11-15 21:11:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48afeb571b 
							
						 
					 
					
						
						
							
							refactor omemo fingerprint UI code  
						
						
						
					 
					
						2016-11-15 20:00:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e84af51272 
							
						 
					 
					
						
						
							
							distinguish between general i/o error and write exception when copying files  
						
						
						
					 
					
						2016-11-15 15:43:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d61b00604d 
							
						 
					 
					
						
						
							
							fixed enabling trust toggle. unknown->untrusted  
						
						
						
					 
					
						2016-11-15 15:14:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05fc15be3d 
							
						 
					 
					
						
						
							
							refactore trust enum to be FingerprintStatus class with trust and active  
						
						
						
					 
					
						2016-11-14 22:27:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6da8b50d95 
							
						 
					 
					
						
						
							
							increase restart threshold  
						
						
						
					 
					
						2016-11-14 19:49:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a753e28ad2 
							
						 
					 
					
						
						
							
							pulled ru translation from transifex  
						
						
						
					 
					
						2016-11-13 19:26:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d3167b520 
							
						 
					 
					
						
						
							
							extract affiliations from unavailable presence  
						
						
						
					 
					
						2016-11-13 19:25:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							035d0c7957 
							
						 
					 
					
						
						
							
							Stop automagically select default encryption  
						
						... 
						
						
						
						Selecting a default encryption (in our case OMEMO) has several down sides.
First of all users might have perfectly valid reasons not to use encryption
at all such as using the same private server. Second of all the way it was
implemented Conversations would automatically fall back to plain text as soon
as the conditions changed (recipient switches to device with no encryption)
which lead to unexpected situations.
Thirdly having a default encryptions speaks against the 'mission
statement' of Conversations of not forcing its security and privacey
aspects upon the user.
And last but not least the goal of implementing this feature in the
first place: Be encrypted by default didn't work at all. I don't think
there was a single user that we succesfully 'tricked' into using OMEMO
who otherwise wouldn't have used it. 
						
					 
					
						2016-11-13 17:11:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bec048407a 
							
						 
					 
					
						
						
							
							offer message correction in private convs  
						
						
						
					 
					
						2016-11-12 20:25:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe62ef32ae 
							
						 
					 
					
						
						
							
							don't add outcasts or non-members in members-only rooms back to list  
						
						
						
					 
					
						2016-11-12 20:21:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c2cd4807 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-11 15:01:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e8cc959a7f 
							
						 
					 
					
						
						
							
							don't offer message correction in anonymous mucs  
						
						
						
					 
					
						2016-11-11 15:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb4952c89e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-08 21:37:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							698ddadbee 
							
						 
					 
					
						
						
							
							brought restart threshold down to 8 times in 8h  
						
						
						
					 
					
						2016-11-08 21:37:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ef8d0a746 
							
						 
					 
					
						
						
							
							don't mark previous conversation as read when processing pending intent.  fixes   #2079  
						
						
						
					 
					
						2016-11-08 12:42:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bca8f11c9c 
							
						 
					 
					
						
						
							
							add frequent restart detection  
						
						
						
					 
					
						2016-11-08 12:20:07 +01:00 
						 
				 
			
				
					
						
							
							
								Ignacio Quezada 
							
						 
					 
					
						
						
						
						
							
						
						
							297c0a792f 
							
						 
					 
					
						
						
							
							Private files using a boolean flag from Config.java.  
						
						
						
					 
					
						2016-11-08 11:45:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a57599da2 
							
						 
					 
					
						
						
							
							lower case incoming dns records  
						
						
						
					 
					
						2016-11-08 10:14:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00b3d5ee35 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-11-08 10:08:58 +01:00 
						 
				 
			
				
					
						
							
							
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							d341904c4d 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
					 
					
						2016-11-08 01:46:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7978fd768e 
							
						 
					 
					
						
						
							
							fixed regression of showing delivery failed after receipt  
						
						
						
					 
					
						2016-11-07 21:57:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9edbddd7e1 
							
						 
					 
					
						
						
							
							show warning in account details when data saver is enabled  
						
						
						
					 
					
						2016-11-07 10:49:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c004857f6 
							
						 
					 
					
						
						
							
							handle file attachment when missing connection  
						
						
						
					 
					
						2016-11-02 15:21:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							544c5b4a21 
							
						 
					 
					
						
						
							
							removed unnecessary push_mode  
						
						
						
					 
					
						2016-11-02 11:04:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e582b9fc10 
							
						 
					 
					
						
						
							
							leaving low ping timeout mode after coming online  
						
						
						
					 
					
						2016-11-02 09:36:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20ddba2aa9 
							
						 
					 
					
						
						
							
							fixed npe when jingle partner is using unknown candidate  
						
						
						
					 
					
						2016-11-01 10:27:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07a71d312a 
							
						 
					 
					
						
						
							
							extracting stanza-id where by=account  
						
						
						
					 
					
						2016-10-31 12:07:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5181b22e0 
							
						 
					 
					
						
						
							
							always use ipv4 localhost when using orbot http proxy  
						
						
						
					 
					
						2016-10-31 09:53:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffebb4677a 
							
						 
					 
					
						
						
							
							Revert "use file provider on android M as well"  
						
						... 
						
						
						
						This reverts commit a4020e85f6 
						
					 
					
						2016-10-30 20:27:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a44f35ed69 
							
						 
					 
					
						
						
							
							schedule correct wakeup call when in low ping timeout mode  
						
						
						
					 
					
						2016-10-29 21:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8557120ef8 
							
						 
					 
					
						
						
							
							add error message to failed messages. accessible via context menu  
						
						
						
					 
					
						2016-10-26 12:26:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4020e85f6 
							
						 
					 
					
						
						
							
							use file provider on android M as well  
						
						
						
					 
					
						2016-10-23 09:03:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8c1bb058da 
							
						 
					 
					
						
						
							
							connect instantly in low ping mode after going offline  
						
						
						
					 
					
						2016-10-23 09:03:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							10398cab51 
							
						 
					 
					
						
						
							
							don't leave low timeout mode prematurely  
						
						
						
					 
					
						2016-10-20 20:04:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2696b66ba 
							
						 
					 
					
						
						
							
							Merge branch 'feature-remove-merge-separator' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-remove-merge-separator  
						
						
						
					 
					
						2016-10-20 18:18:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52d4be4249 
							
						 
					 
					
						
						
							
							Merge branch 'feature-remove-spans' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-remove-spans  
						
						
						
					 
					
						2016-10-20 18:10:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f62ff6736 
							
						 
					 
					
						
						
							
							introduced low ping timeout mode after gcm push  
						
						
						
					 
					
						2016-10-20 18:02:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							44ce5df359 
							
						 
					 
					
						
						
							
							write prepped string to db. use display version everywhere else  
						
						
						
					 
					
						2016-10-20 17:31:46 +02:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4e15ba97 
							
						 
					 
					
						
						
							
							Remove MERGE_SEPARATOR  
						
						
						
					 
					
						2016-10-20 01:03:51 +03:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							8835f08cf7 
							
						 
					 
					
						
						
							
							Remove spans on copying or pasting a text  
						
						
						
					 
					
						2016-10-19 20:47:41 +03:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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