Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						 
						
						
						
					 
					
						2015-01-02 01:21:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							193d2645e6 
							
						 
					 
					
						
						
							
							code cleanup for change password stuff  
						
						 
						
						
						
					 
					
						2014-12-25 22:28:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d9dca2fe 
							
						 
					 
					
						
						
							
							Add ability to change password on server  
						
						 
						
						... 
						
						
						
						Fixes  #260  
						
					 
					
						2014-12-25 21:38:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							01107e31ae 
							
						 
					 
					
						
						
							
							Add more server compatibility info.  
						
						 
						
						... 
						
						
						
						Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
						
					 
					
						2014-12-23 12:44:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e43ac27e8f 
							
						 
					 
					
						
						
							
							Accessibility: Add missing image descriptions  
						
						 
						
						
						
					 
					
						2014-11-29 08:03:35 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dcebc120ac 
							
						 
					 
					
						
						
							
							show dynamic tags in contacts activity as well  
						
						 
						
						
						
					 
					
						2014-11-18 14:24:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cf00f3fade 
							
						 
					 
					
						
						
							
							happy hanukkah  
						
						 
						
						
						
					 
					
						2014-11-16 17:21:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2067b9bd8d 
							
						 
					 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity  
						
						 
						
						
						
					 
					
						2014-11-16 02:10:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e33fc26cbe 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd2ff0d88 
							
						 
					 
					
						
						
							
							initial smp support  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8d5d6b2b5 
							
						 
					 
					
						
						
							
							reformated license a bit  
						
						 
						
						
						
					 
					
						2014-11-04 23:47:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							df786cbf01 
							
						 
					 
					
						
						
							
							Shorten license text and fix height of scrollview  
						
						 
						
						
						
					 
					
						2014-11-04 13:26:48 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							7b67f1a19c 
							
						 
					 
					
						
						
							
							Use normal text size and color  
						
						 
						
						
						
					 
					
						2014-11-04 13:17:15 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55c81eaf15 
							
						 
					 
					
						
						
							
							Make links clickable in about text  
						
						 
						
						
						
					 
					
						2014-11-04 13:09:56 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f10dd428ba 
							
						 
					 
					
						
						
							
							Convert about dialog to activity  
						
						 
						
						
						
					 
					
						2014-11-04 12:48:46 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5a56e8e7 
							
						 
					 
					
						
						
							
							show avatar in editaccount  
						
						 
						
						
						
					 
					
						2014-11-04 17:38:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							39ae34d3e6 
							
						 
					 
					
						
						
							
							Wrap "last seen" time.  
						
						 
						
						... 
						
						
						
						Fixes  #611  
						
					 
					
						2014-11-03 08:28:20 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							46f147a82c 
							
						 
					 
					
						
						
							
							Merge branch 'gradle' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 
					
						2014-10-30 15:33:13 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							281ce3105f 
							
						 
					 
					
						
						
							
							Make conversations the root project  
						
						 
						
						
						
					 
					
						2014-10-22 15:47:11 -04:00