Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0e56dd8bc2 
							
						 
					 
					
						
						
							
							version bump 2.5.0-beta.2  
						
						 
						
						
						
					 
					
						2019-04-27 15:25:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8c5ec7f5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2019-04-27 15:24:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c35f28633 
							
						 
					 
					
						
						
							
							do not synchronize twice when adding status and date bubbles  
						
						 
						
						
						
					 
					
						2019-04-27 15:24:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d8010d7a33 
							
						 
					 
					
						
						
							
							updated transifex config to include conversations strings  
						
						 
						
						
						
					 
					
						2019-04-27 14:49:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcab77a044 
							
						 
					 
					
						
						
							
							wait with presence selection until attachment commit  
						
						 
						
						
						
					 
					
						2019-04-27 14:41:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2ea91909b 
							
						 
					 
					
						
						
							
							introduced type private_file_message to handle attachments in PMs.  fixes   #3372  
						
						 
						
						
						
					 
					
						2019-04-27 11:46:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b55d4bc62f 
							
						 
					 
					
						
						
							
							do not jump out of whispher mode when selecting attach  
						
						 
						
						
						
					 
					
						2019-04-26 17:53:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e30d97439 
							
						 
					 
					
						
						
							
							fixed ui glitch when displaying PM hint over attachments  
						
						 
						
						
						
					 
					
						2019-04-26 17:15:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8de1359746 
							
						 
					 
					
						
						
							
							bump version to 2.5.0-beta + changelog  
						
						 
						
						
						
					 
					
						2019-04-26 12:30:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc70b7e28a 
							
						 
					 
					
						
						
							
							add bookmark when clicking on channel search result  
						
						 
						
						
						
					 
					
						2019-04-26 12:26:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76fb17c972 
							
						 
					 
					
						
						
							
							add contact dialog: warn on suspicious addresses  
						
						 
						
						
						
					 
					
						2019-04-26 12:05:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4348e92e8 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2019-04-26 11:20:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c9ce7bf0 
							
						 
					 
					
						
						
							
							store correcting message in db  
						
						 
						
						
						
					 
					
						2019-04-26 11:18:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef555063d9 
							
						 
					 
					
						
						
							
							rename new welcome resource  
						
						 
						
						
						
					 
					
						2019-04-26 11:18:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a1a9f4f55 
							
						 
					 
					
						
						
							
							put PM hint above edittext.  fixes   #3432  
						
						 
						
						
						
					 
					
						2019-04-26 10:23:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							182a81e3ef 
							
						 
					 
					
						
						
							
							only show opened FAB when some accounts are enabled  
						
						 
						
						
						
					 
					
						2019-04-26 09:30:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6704db21fb 
							
						 
					 
					
						
						
							
							added Tor support to channel search  
						
						 
						
						
						
					 
					
						2019-04-25 21:10:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9db1c10f45 
							
						 
					 
					
						
						
							
							open FAB when no contacts or bookmarks are found  
						
						 
						
						
						
					 
					
						2019-04-25 19:52:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b61bb9841 
							
						 
					 
					
						
						
							
							rework welcome screens to split use existing account / create new  
						
						 
						
						... 
						
						
						
						closes  #3440  
						
					 
					
						2019-04-25 19:01:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a04b7a1c0f 
							
						 
					 
					
						
						
							
							keyboard event callbacks shoud run on ui thread.  fixes   #3441  
						
						 
						
						
						
					 
					
						2019-04-25 12:27:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff84ee6964 
							
						 
					 
					
						
						
							
							cache channel search results  
						
						 
						
						
						
					 
					
						2019-04-24 13:25:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ba21c9b55f 
							
						 
					 
					
						
						
							
							update gradle  
						
						 
						
						
						
					 
					
						2019-04-24 13:25:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1857fe9e0d 
							
						 
					 
					
						
						
							
							moved layout files from conversations flavor to main  
						
						 
						
						
						
					 
					
						2019-04-22 13:16:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2fa687b8ae 
							
						 
					 
					
						
						
							
							refactor muc search to use http  
						
						 
						
						
						
					 
					
						2019-04-22 13:00:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0f88aa9b4 
							
						 
					 
					
						
						
							
							implement channel discovery over jabber.search.network  
						
						 
						
						
						
					 
					
						2019-04-22 10:42:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7a825231fb 
							
						 
					 
					
						
						
							
							run keyboard listeners on background executor  
						
						 
						
						
						
					 
					
						2019-04-17 18:25:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39bc067405 
							
						 
					 
					
						
						
							
							execute some dismiss error notification and reset error in background  
						
						 
						
						
						
					 
					
						2019-04-17 12:49:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							98734353aa 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2019-04-17 09:56:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d04e2e99f3 
							
						 
					 
					
						
						
							
							use mediated invite on reinvite if user is not member  
						
						 
						
						
						
					 
					
						2019-04-11 08:57:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf7d50692c 
							
						 
					 
					
						
						
							
							use styled warning for message error.  fixes   #3428  
						
						 
						
						
						
					 
					
						2019-04-08 16:32:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ada794e6e 
							
						 
					 
					
						
						
							
							version bump to 2.4.3 + changelog  
						
						 
						
						
						
					 
					
						2019-03-28 09:40:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c6df5191ab 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2019-03-24 20:07:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d390345073 
							
						 
					 
					
						
						
							
							show max file upload size in server info  
						
						 
						
						
						
					 
					
						2019-03-23 07:27:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6322d4c077 
							
						 
					 
					
						
						
							
							renamed button in recording dialog to 'attach'  
						
						 
						
						
						
					 
					
						2019-03-23 07:26:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74301831d2 
							
						 
					 
					
						
						
							
							do sent/received correct based on true counterpart introduces in  f406631512 only for type=groupchat  
						
						 
						
						
						
					 
					
						2019-03-15 12:46:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e998ea816e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						 
						
						
						
					 
					
						2019-03-07 09:10:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							46596e8652 
							
						 
					 
					
						
						
							
							fix backup creation for older installations  
						
						 
						
						... 
						
						
						
						if your Conversations installation is older than December 2016 (version 1.15.0) the backup would
include historic data that a current installation is not able to read on restore.
This commits excludes that data from the backup.
If you had problems importing the backup you need to create a new backup after this patch 
						
					 
					
						2019-03-07 09:08:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Licaon_Kter 
							
						 
					 
					
						
						
						
						
							
						
						
							fca63a8858 
							
						 
					 
					
						
						
							
							Update backup info in Readme  ( #3393 )  
						
						 
						
						... 
						
						
						
						* Update backup info in Readme 
						
					 
					
						2019-03-06 08:23:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							016e394897 
							
						 
					 
					
						
						
							
							version bump to 2.4.2 + changelog  
						
						 
						
						
						
					 
					
						2019-03-03 15:04:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9b0e13179 
							
						 
					 
					
						
						
							
							fixed syntax errors in french translations  
						
						 
						
						
						
					 
					
						2019-03-03 08:52:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ec0b9b9a72 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2019-03-03 08:35:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7dea9dded 
							
						 
					 
					
						
						
							
							fixed security exception when attempting to display image in notification  
						
						 
						
						
						
					 
					
						2019-03-03 08:32:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							875f0b9943 
							
						 
					 
					
						
						
							
							find activity even if wrapped in context wrapper.  fixes   #3396  
						
						 
						
						
						
					 
					
						2019-03-03 08:31:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f406631512 
							
						 
					 
					
						
						
							
							double check that muc message is ours if true jid is known  
						
						 
						
						
						
					 
					
						2019-03-02 08:36:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a29a5fd491 
							
						 
					 
					
						
						
							
							copy intent extras in eventreceiver  
						
						 
						
						
						
					 
					
						2019-02-27 14:16:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							417a6e8307 
							
						 
					 
					
						
						
							
							use proper theme in restore activity.  fixes   #3389  
						
						 
						
						
						
					 
					
						2019-02-25 20:26:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a243cdb944 
							
						 
					 
					
						
						
							
							version bump to 2.4.1 + changelog  
						
						 
						
						
						
					 
					
						2019-02-23 10:34:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24a51d8715 
							
						 
					 
					
						
						
							
							do null check before splitting error message for processing  
						
						 
						
						
						
					 
					
						2019-02-23 10:24:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b79a2447b2 
							
						 
					 
					
						
						
							
							bump version to 2.4.0  
						
						 
						
						
						
					 
					
						2019-02-22 18:19:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							895a140ec5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2019-02-22 15:05:50 +01:00