Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							de0272fd1a 
							
						 
					 
					
						
						
							
							integrate trust manager into conversations  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd90f2140d 
							
						 
					 
					
						
						
							
							fixed search in abstractsearchablelistitem  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf85d30421 
							
						 
					 
					
						
						
							
							fixed hint color for edit message  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81fbb36f1 
							
						 
					 
					
						
						
							
							migrated alert dialogs to app compat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d25ecc21b 
							
						 
					 
					
						
						
							
							remove pre api 21 theme  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d49fb5873e 
							
						 
					 
					
						
						
							
							switch about activity to appcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe4ebb6244 
							
						 
					 
					
						
						
							
							reference support actionbar in all activities  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e89427d5e 
							
						 
					 
					
						
						
							
							started work on migrating to appcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							454f68799e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-07 12:35:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0deffef8da 
							
						 
					 
					
						
						
							
							fixed concurrent modification when killing mam queries  
						
						
						
					 
					
						2018-03-01 08:27:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7557de5479 
							
						 
					 
					
						
						
							
							use java 8 in push management service  
						
						
						
					 
					
						2018-02-25 14:39:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4ac8b3122 
							
						 
					 
					
						
						
							
							fixed push registration  
						
						
						
					 
					
						2018-02-25 14:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e09fac1da 
							
						 
					 
					
						
						
							
							do not merge bug reports  
						
						
						
					 
					
						2018-02-25 14:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							47dfe3c2e2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-02-25 14:22:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							63cd8e5981 
							
						 
					 
					
						
						
							
							added config param to use a random resource at every bind  
						
						
						
					 
					
						2018-02-24 20:47:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4013123279 
							
						 
					 
					
						
						
							
							MAM: rework hasMessagesLeft to account for prosody’s missing count  
						
						
						
					 
					
						2018-02-24 10:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							90ace36b18 
							
						 
					 
					
						
						
							
							only explicitly request device list for users not in roster fixups  
						
						
						
					 
					
						2018-02-24 10:03:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a09d63d9a4 
							
						 
					 
					
						
						
							
							only explicitly request device list for users not in roster  
						
						
						
					 
					
						2018-02-24 09:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03fa58634b 
							
						 
					 
					
						
						
							
							kill mam query when archiving conversation  
						
						
						
					 
					
						2018-02-24 09:39:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d5c2a3e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2018-02-23 23:12:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7725cb8311 
							
						 
					 
					
						
						
							
							MAM: look at total count for completness. parse fin correctly  
						
						
						
					 
					
						2018-02-23 23:11:54 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							8713fc8a06 
							
						 
					 
					
						
						
							
							Use 'Jabber' instead of 'XMPP' in the welcome message  
						
						
						
					 
					
						2018-02-22 22:04:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81e5e471e 
							
						 
					 
					
						
						
							
							request disco items before disco#info on first connect  
						
						... 
						
						
						
						should make initial connect faster because code is not waiting for omemo code to run 
						
					 
					
						2018-02-20 17:36:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e7094af9d5 
							
						 
					 
					
						
						
							
							warn when attempting to write stanza to an unbound stream  
						
						
						
					 
					
						2018-02-20 17:03:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72cf702e75 
							
						 
					 
					
						
						
							
							mark error notifications as sensitve and local only.  fixes   #2795  
						
						
						
					 
					
						2018-02-20 08:22:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c35ac11a42 
							
						 
					 
					
						
						
							
							check if axolotl service is initialized before displaying keys  
						
						
						
					 
					
						2018-02-19 17:26:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							742727504f 
							
						 
					 
					
						
						
							
							fixed handling of self address messages w/o remoteMsgId  
						
						
						
					 
					
						2018-02-19 15:52:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							014cf66c87 
							
						 
					 
					
						
						
							
							do not allow insecure bind  
						
						
						
					 
					
						2018-02-18 21:54:03 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							17c6d8827c 
							
						 
					 
					
						
						
							
							Make use of Namespace.DATA constant  
						
						
						
					 
					
						2018-02-16 16:12:53 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							9af7b7ae1e 
							
						 
					 
					
						
						
							
							Namespace: Add constant for 'jabber ❌ data'  
						
						
						
					 
					
						2018-02-16 16:12:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f3cfa0bb 
							
						 
					 
					
						
						
							
							only allow a number of white listed headers according to http upload v0.5  
						
						
						
					 
					
						2018-02-16 11:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							3fa205d463 
							
						 
					 
					
						
						
							
							Don't add account if user cancels.  Fixes   #2797  
						
						
						
					 
					
						2018-02-15 14:40:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7d9b39f7 
							
						 
					 
					
						
						
							
							Pass invite XMPP URI along instead of JID  
						
						
						
					 
					
						2018-02-14 17:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d2b65982 
							
						 
					 
					
						
						
							
							XmppUri: Add toString() method  
						
						
						
					 
					
						2018-02-14 17:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3e755ceb1 
							
						 
					 
					
						
						
							
							null check on invite object  
						
						
						
					 
					
						2018-02-13 15:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Christoph Scholz 
							
						 
					 
					
						
						
						
						
							
						
						
							9360f5c960 
							
						 
					 
					
						
						
							
							allow roster action with name  
						
						
						
					 
					
						2018-02-12 20:00:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6650c0bd57 
							
						 
					 
					
						
						
							
							always copy firefoxe’s shared files  
						
						
						
					 
					
						2018-02-12 12:31:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eed2d93145 
							
						 
					 
					
						
						
							
							integrate intent integrator to finish activity when needed  
						
						
						
					 
					
						2018-02-12 11:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64928d0ff1 
							
						 
					 
					
						
						
							
							http upload: do not crash on invalid slot responses  
						
						
						
					 
					
						2018-02-11 17:54:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2ac1db225 
							
						 
					 
					
						
						
							
							do not cross reference bookmarks and conversations  
						
						
						
					 
					
						2018-02-10 19:06:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb2513615 
							
						 
					 
					
						
						
							
							always persist current nick (in bookmark and database)  
						
						
						
					 
					
						2018-02-10 16:24:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64c956904d 
							
						 
					 
					
						
						
							
							don't cancel animation when switching accounts w/o init  
						
						
						
					 
					
						2018-02-10 13:32:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b3561e80f2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-02-10 12:21:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e8e8be82c 
							
						 
					 
					
						
						
							
							Merge pull request  #2780  from linkmauve/patch-1  
						
						... 
						
						
						
						Fix the French translation for the add_back string 
						
					 
					
						2018-02-10 12:19:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f828b89cbd 
							
						 
					 
					
						
						
							
							skip empty srv records  
						
						
						
					 
					
						2018-02-10 12:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							facc56bc7b 
							
						 
					 
					
						
						
							
							return to welcome activity after deleting last account  
						
						
						
					 
					
						2018-02-10 10:45:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97406ecf51 
							
						 
					 
					
						
						
							
							skip animations for startup activities  
						
						
						
					 
					
						2018-02-09 22:19:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d33fca09cf 
							
						 
					 
					
						
						
							
							add null checks to huawei settings code  
						
						
						
					 
					
						2018-02-09 22:11:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5335cda50c 
							
						 
					 
					
						
						
							
							do not put setup activites on stack twice  
						
						
						
					 
					
						2018-02-09 20:09:58 +01:00 
						 
				 
			
				
					
						
							
							
								linkmauve 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e373d82dc 
							
						 
					 
					
						
						
							
							Fix the French translation for the add_back string  
						
						... 
						
						
						
						It was translated to something like “add again”, which doesn’t carry the same meaning and can be confusing for users.
It would be useful to also check how it has been translated in other languages, and add a source comment for future translators. 
						
					 
					
						2018-02-05 19:30:32 +01:00