iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								e0f012dba1
								
							
						 | 
						
							
							
								
								fixed resending for files as well
							
							
							
							
							
						 | 
						
							2014-11-15 15:34:12 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								cc4f3702a8
								
							
						 | 
						
							
							
								
								made file transfers cancelable
							
							
							
							
							
						 | 
						
							2014-11-15 15:34:12 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								16847a30c8
								
							
						 | 
						
							
							
								
								support for pgp files
							
							
							
							
							
						 | 
						
							2014-11-15 15:34:12 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								dac12be53e
								
							
						 | 
						
							
							
								
								copy non local files to private storage first
							
							
							
							
							
						 | 
						
							2014-11-15 15:34:11 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								02cbda68a7
								
							
						 | 
						
							
							
								
								bug fixes and various improvements for file transfer
							
							
							
							
							
						 | 
						
							2014-11-15 15:34:11 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								7a90ca429b
								
							
						 | 
						
							
							
								
								basic arbitrary file transfer
							
							
							
							
							
						 | 
						
							2014-11-15 15:34:11 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								fce78abb1c
								
							
						 | 
						
							
							
								
								temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds
							
							
							
							
							
						 | 
						
							2014-11-11 00:16:43 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								89ee999e1b
								
							
						 | 
						
							
							
								
								more refactoring for presence selection. removed getTo, getFrom and getJid from Element
							
							
							
							
							
						 | 
						
							2014-11-10 01:24:35 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								69ef17efc0
								
							
						 | 
						
							
							
								
								migrated some otr stuff to new jid classes
							
							
							
							
							
						 | 
						
							2014-11-09 17:46:00 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								c310ada8b3
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2014-11-09 17:05:20 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								e9af0d4ca7
								
							
						 | 
						
							
							
								
								Merge branch 'master' into development
							
							
							
							
							
						 | 
						
							2014-11-09 17:02:49 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								61f046a675
								
							
						 | 
						
							
							
								
								make avatar service not break on empty names
							
							
							
							
							
						 | 
						
							2014-11-09 17:02:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								180a0e4408
								
							
						 | 
						
							
							
								
								Rework `Account.getJid()' to return full JIDs
							
							
							
							
							
							
							
							Remove `Account.getFullJid()' 
							
						 | 
						
							2014-11-09 10:57:22 -05:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								377bd49ee8
								
							
						 | 
						
							
							
								
								refactored code to always contain full jid for counterpart
							
							
							
							
							
						 | 
						
							2014-11-09 16:21:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								1a3327f2b1
								
							
						 | 
						
							
							
								
								Create avatar's for JID's w/o localparts
							
							
							
							
							
						 | 
						
							2014-11-09 07:00:40 -05:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								5ce0cd3802
								
							
						 | 
						
							
							
								
								Fields that we sync on should be final
							
							
							
							
							
						 | 
						
							2014-11-09 07:00:40 -05:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								9db624ec7b
								
							
						 | 
						
							
							
								
								It builds again!
							
							
							
							
							
						 | 
						
							2014-11-09 07:00:40 -05:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								f108fc5a5c
								
							
						 | 
						
							
							
								
								Update more files to use JID objects
							
							
							
							
							
						 | 
						
							2014-11-09 07:00:40 -05:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								9053f4aca0
								
							
						 | 
						
							
							
								
								Move a chunk of classes over to using JID objects
							
							
							
							
							
						 | 
						
							2014-11-09 07:00:40 -05:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								2253814519
								
							
						 | 
						
							
							
								
								fixed notifications for images
							
							
							
							
							
						 | 
						
							2014-11-05 21:37:40 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								6a43bda4d7
								
							
						 | 
						
							
							
								
								fixed #617
							
							
							
							
							
						 | 
						
							2014-11-05 00:06:07 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								1ea2e7dc3b
								
							
						 | 
						
							
							
								
								fixed arrayoutofbounds + spelling
							
							
							
							
							
						 | 
						
							2014-11-01 14:33:34 +01: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 |