Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f99f21ab9b 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-06-15 14:11:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b9b7257a9 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-06-09 21:00:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a018935b23 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-06-08 20:17:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d89d7ade84 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-05-29 13:00:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25f6651848 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-05-27 20:07:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d84cf4e6d1 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-05-22 17:53:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							16eb1bfbd0 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-05-04 13:19:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf92ef6cd3 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-05-02 11:05:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77f4513862 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-04-10 21:19:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e94e06246b 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-04-04 20:21:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							815c534da8 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-03-13 17:43:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24aefa109c 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-03-06 21:35:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad60bc002c 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-02-19 11:14:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3f0503a91 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-02-15 12:35:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20f6a4704c 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-01-20 17:18:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							635210d278 
							
						 
					 
					
						
						
							
							pulled translations for 1.9.0 release from transifex  
						
						 
						
						
						
					 
					
						2016-01-14 21:52:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d122d224bb 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-01-12 16:43:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d38ba906f 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2016-01-11 11:19:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae491764f2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-12-20 19:37:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b9fc7ebe24 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-12-07 13:54:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b60c902810 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						 
						
						
						
					 
					
						2015-12-02 17:27:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1738673c53 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-10-14 23:05:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							beca748634 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-10-13 23:36:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b13ba0e5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-09-15 22:56:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							999d65c187 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-09-14 16:53:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc9f6d91ac 
							
						 
					 
					
						
						
							
							pulled updated translations from transifex  
						
						 
						
						
						
					 
					
						2015-08-28 13:04:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb70df7a34 
							
						 
					 
					
						
						
							
							added XEP number for http file upload  
						
						 
						
						
						
					 
					
						2015-08-27 19:18:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							98e7d9c74e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-08-24 21:24:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							730a5c644b 
							
						 
					 
					
						
						
							
							renamed plain text to unencrypted.  fixes   #1331  
						
						 
						
						
						
					 
					
						2015-08-24 21:15:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c822c9b75 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-08-19 13:03:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b91d0bf75 
							
						 
					 
					
						
						
							
							sync translations with transifex  
						
						 
						
						
						
					 
					
						2015-08-03 14:04:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ab0d5d1c1 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						 
						
						
						
					 
					
						2015-07-20 19:13:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15b880f3a1 
							
						 
					 
					
						
						
							
							pulled translations  
						
						 
						
						
						
					 
					
						2015-07-18 00:02:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd66549d8 
							
						 
					 
					
						
						
							
							made 'check image on http host' message more generic.  fixed   #1281  
						
						 
						
						
						
					 
					
						2015-07-16 13:25:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4ec7a7df1 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-05-20 12:26:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f2a83a684 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-04-26 10:48:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							da367dd752 
							
						 
					 
					
						
						
							
							Add option to remove manually approved certificates  
						
						 
						
						... 
						
						
						
						- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options" 
						
					 
					
						2015-04-19 18:08:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							defb127d6e 
							
						 
					 
					
						
						
							
							Merge branch 'dont_trust_cas_preference' of  https://github.com/BrianBlade/Conversations  into BrianBlade-dont_trust_cas_preference  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml 
						
					 
					
						2015-04-14 15:17:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							878066ca99 
							
						 
					 
					
						
						
							
							Add option to use MTM without default TrustManager  
						
						 
						
						... 
						
						
						
						Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked. 
						
					 
					
						2015-04-11 15:13:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							dace8ba3d3 
							
						 
					 
					
						
						
							
							Enable end-conversation by swipe gesture  
						
						 
						
						... 
						
						
						
						Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged() 
						
					 
					
						2015-04-08 23:29:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							64d6a2970e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-04-01 20:26:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ad8f1902d1 
							
						 
					 
					
						
						
							
							pulled translations  
						
						 
						
						
						
					 
					
						2015-03-22 18:56:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4aab45533a 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						 
						
						
						
					 
					
						2015-03-16 11:52:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6907f1e0 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						 
						
						
						
					 
					
						2015-02-27 17:20:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3e8314459c 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						 
						
						
						
					 
					
						2015-02-23 21:56:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6e6959614 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-02-16 16:56:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							33530a9e30 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						 
						
						
						
					 
					
						2015-02-01 17:04:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							ce5c6c6257 
							
						 
					 
					
						
						
							
							Removes some unused strings (the legacy SSL stuff)  
						
						 
						
						
						
					 
					
						2015-02-01 08:58:35 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							e76a9c06c3 
							
						 
					 
					
						
						
							
							Remove title_activity_conversations and use app_name instead  
						
						 
						
						
						
					 
					
						2015-01-30 17:02:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							14fc520ec0 
							
						 
					 
					
						
						
							
							updated translations  
						
						 
						
						
						
					 
					
						2015-01-25 16:36:57 +01:00