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 
							
						 
					 
					
						
						
						
						
							
						
						
							2a73b8d76e 
							
						 
					 
					
						
						
							
							clarified fineprint a little bit  
						
						 
						
						
						
					 
					
						2016-10-13 12:17:20 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							187825d6c6 
							
						 
					 
					
						
						
							
							warn user if account is offline during avatar publication  
						
						 
						
						
						
					 
					
						2016-10-06 22:06:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ac0e9267d 
							
						 
					 
					
						
						
							
							fixed omemo shown as unavailable in 1:1 chats  
						
						 
						
						
						
					 
					
						2016-10-03 21:04:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0fb9fd9ee 
							
						 
					 
					
						
						
							
							added nick to conference jid example  
						
						 
						
						
						
					 
					
						2016-09-28 13:20:52 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							de7c0c5121 
							
						 
					 
					
						
						
							
							Merge pull request  #2028  from Mishiranu/feature-more-tables  
						
						 
						
						... 
						
						
						
						Fix "Server info" table layout 
						
					 
					
						2016-09-20 16:43:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							9aaa5b78f4 
							
						 
					 
					
						
						
							
							Update Russian translation  
						
						 
						
						
						
					 
					
						2016-09-20 16:15:46 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							18ab826413 
							
						 
					 
					
						
						
							
							Fix "More table" layout  
						
						 
						
						... 
						
						
						
						Retain "More table" visibility on screen orientation change 
						
					 
					
						2016-09-20 16:10:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5790d4c4ab 
							
						 
					 
					
						
						
							
							fixed styling in blocking dialog  
						
						 
						
						
						
					 
					
						2016-09-20 14:21:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bda624723 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-09-20 11:22:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7eac903277 
							
						 
					 
					
						
						
							
							add support for XEP-0377: Spam Reporting  
						
						 
						
						
						
					 
					
						2016-09-18 23:21:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b904d4de1 
							
						 
					 
					
						
						
							
							use proper paddings in dialogs on android < 5  
						
						 
						
						
						
					 
					
						2016-09-18 20:09:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							3e6747c880 
							
						 
					 
					
						
						
							
							Add "Select text" context menu option  
						
						 
						
						
						
					 
					
						2016-09-17 01:18:34 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af55aeca58 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-09-16 12:29:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00cbf8458a 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-09-08 11:19:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9f13a9f2 
							
						 
					 
					
						
						
							
							provide hint on why conference can not be encrypted  
						
						 
						
						
						
					 
					
						2016-09-08 11:01:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							416481bb65 
							
						 
					 
					
						
						
							
							be a bit more careful when deleting and deactivating accounts  
						
						 
						
						
						
					 
					
						2016-09-07 14:34:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d2c32e63 
							
						 
					 
					
						
						
							
							show server not found muc error  
						
						 
						
						
						
					 
					
						2016-09-06 12:15:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1dc55f72e3 
							
						 
					 
					
						
						
							
							don't use fileprovider when opening files on android M and below  
						
						 
						
						
						
					 
					
						2016-09-04 22:59:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd54dc5aff 
							
						 
					 
					
						
						
							
							wrap dynamic tags into multiple lines.  fixes   #2003  
						
						 
						
						
						
					 
					
						2016-08-26 16:34:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76cbb4f727 
							
						 
					 
					
						
						
							
							some multi-window optimizations. set min width to 300  
						
						 
						
						
						
					 
					
						2016-08-26 16:05:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f931c08da7 
							
						 
					 
					
						
						
							
							add snackbar for request presence subscription  
						
						 
						
						
						
					 
					
						2016-08-26 10:19:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							910b38ec13 
							
						 
					 
					
						
						
							
							add file provider to share files on android n  
						
						 
						
						
						
					 
					
						2016-08-25 22:41:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							542626758d 
							
						 
					 
					
						
						
							
							use N style stacked notifications  
						
						 
						
						
						
					 
					
						2016-08-25 15:20:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0038565c5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-08-19 21:47:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							285d86b375 
							
						 
					 
					
						
						
							
							display error status for missing internet permission  
						
						 
						
						
						
					 
					
						2016-08-19 21:47:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2a139a4b47 
							
						 
					 
					
						
						
							
							Merge pull request  #1987  from licaon-kter/patch-2  
						
						 
						
						... 
						
						
						
						Make 'export log' option function clearer 
						
					 
					
						2016-08-16 10:49:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0528a47b8a 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-08-16 10:45:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d3859b22 
							
						 
					 
					
						
						
							
							add payment required error  
						
						 
						
						
						
					 
					
						2016-08-16 10:39:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							81b0f60860 
							
						 
					 
					
						
						
							
							Clear export option function  
						
						 
						
						
						
					 
					
						2016-08-11 21:07:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0e96e0a796 
							
						 
					 
					
						
						
							
							show identity type for device selection  
						
						 
						
						
						
					 
					
						2016-07-28 22:58:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							04976fe333 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-07-28 22:41:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							701140fe92 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-07-27 20:01:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3409399ef1 
							
						 
					 
					
						
						
							
							display specific error message when password is too weak on registration  
						
						 
						
						
						
					 
					
						2016-07-25 15:57:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e90e333f29 
							
						 
					 
					
						
						
							
							allow message correction by default since security implications are negligible  
						
						 
						
						... 
						
						
						
						Conversations only allows correction of the *last* message. so nudging a message into oblivion by adding a message correction doesn't work. also conversations checks the fingerprint for encrypted messages 
						
					 
					
						2016-07-17 22:42:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e50d4831f 
							
						 
					 
					
						
						
							
							show toast hint when touching inactive omemo fingerprints  
						
						 
						
						
						
					 
					
						2016-07-17 20:31:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1db85e582e 
							
						 
					 
					
						
						
							
							add more error states for stream errors  
						
						 
						
						
						
					 
					
						2016-07-14 17:05:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be4aa2afc9 
							
						 
					 
					
						
						
							
							show a preview for video files  
						
						 
						
						
						
					 
					
						2016-07-11 21:24:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							09aba0a062 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-07-01 13:08:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e52f662569 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-06-25 13:07:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72a2622c84 
							
						 
					 
					
						
						
							
							introduced share button in contact details. remove show qr  
						
						 
						
						
						
					 
					
						2016-06-24 15:16:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alexxthehood 
							
						 
					 
					
						
						
						
						
							
						
						
							e88f01923f 
							
						 
					 
					
						
						
							
							Update create_conference_dialog.xml  
						
						 
						
						... 
						
						
						
						Updated to the text color attribute so it fits to the bright and dark theme appropriately. 
						
					 
					
						2016-06-21 19:08:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48a7818e88 
							
						 
					 
					
						
						
							
							mark used otr fingprint in contact details and highlight pgp  
						
						 
						
						
						
					 
					
						2016-06-16 12:12:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f99f21ab9b 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-06-15 14:11:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							587fb3cca3 
							
						 
					 
					
						
						
							
							refactored pgp decryption  
						
						 
						
						
						
					 
					
						2016-06-13 13:32:14 +02:00