| 
							
							
								 iNPUTmice | 69ef17efc0 | migrated some otr stuff to new jid classes | 2014-11-09 17:46:00 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cb1a36da79 | Merge pull request #642 from SamWhited/accountgetjid Rework `Account.getJid()' to return full JIDs | 2014-11-09 17:06:09 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 180a0e4408 | Rework `Account.getJid()' to return full JIDs Remove `Account.getFullJid()' | 2014-11-09 10:57:22 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ad6fef063b | fixed null pointer in message merger | 2014-11-09 16:47:31 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 377bd49ee8 | refactored code to always contain full jid for counterpart | 2014-11-09 16:21:13 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2b99b694eb | fixed full jid for account | 2014-11-09 16:20:36 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 1a3327f2b1 | Create avatar's for JID's w/o localparts | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 778fb9de6c | Fix letter avatar selection in MUC | 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 | bf9207456e | Update another chunk of stuff to use JID objects | 2014-11-09 07:00:40 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | f15900426d | 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 | 4d7bee2e38 | fixed #634 | 2014-11-09 10:51:54 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 96563aca52 | Add last seen info to the database Fixes #612 | 2014-11-04 16:41:35 -05: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 |  |