dd7f8d28c7 
								
							 
						 
						
							
							
								
								added license file. plus renaming  
							
							
							
						 
						
							2014-06-24 00:57:21 +02:00  
				
					
						
							
							
								 
						
							
								11190947b3 
								
							 
						 
						
							
							
								
								Merge pull request  #225  from diesys/development  
							
							... 
							
							
							
							new icons 
							
						 
						
							2014-06-24 00:55:32 +02:00  
				
					
						
							
							
								 
						
							
								f2a63713cf 
								
							 
						 
						
							
							
								
								Create conversation_mono.svg  
							
							
							
						 
						
							2014-06-23 23:30:03 +02:00  
				
					
						
							
							
								 
						
							
								18d0e57f52 
								
							 
						 
						
							
							
								
								fixed regression with chat markers not working  
							
							
							
						 
						
							2014-06-23 23:29:26 +02:00  
				
					
						
							
							
								 
						
							
								e4f5a905e9 
								
							 
						 
						
							
							
								
								conversation_baloon.svg  
							
							
							
						 
						
							2014-06-23 23:28:43 +02:00  
				
					
						
							
							
								 
						
							
								2aa99ddd39 
								
							 
						 
						
							
							
								
								conversation.svg  
							
							
							
						 
						
							2014-06-23 23:27:02 +02:00  
				
					
						
							
							
								 
						
							
								25e44cbf52 
								
							 
						 
						
							
							
								
								new logo  
							
							
							
						 
						
							2014-06-23 21:57:53 +02:00  
				
					
						
							
							
								 
						
							
								d7656dd420 
								
							 
						 
						
							
							
								
								fix for not being able to send otr encrypted images to offline contacts. unconfirmed  
							
							
							
						 
						
							2014-06-23 21:48:48 +02:00  
				
					
						
							
							
								 
						
							
								bc621bfcfb 
								
							 
						 
						
							
							
								
								Add missing property  
							
							
							
						 
						
							2014-06-23 21:20:39 +02:00  
				
					
						
							
							
								 
						
							
								43e276e325 
								
							 
						 
						
							
							
								
								possible better distribution of contact picture colors  
							
							
							
						 
						
							2014-06-23 21:13:58 +02:00  
				
					
						
							
							
								 
						
							
								f9f5069e52 
								
							 
						 
						
							
							
								
								Add missing javadoc / missing getter (getTTL)  
							
							
							
						 
						
							2014-06-23 21:02:25 +02:00  
				
					
						
							
							
								 
						
							
								c57b0d3ef4 
								
							 
						 
						
							
							
								
								Fix missing source/javadoc archives  
							
							
							
						 
						
							2014-06-23 20:56:38 +02:00  
				
					
						
							
							
								 
						
							
								996bee8836 
								
							 
						 
						
							
							
								
								enabled otr encryption for ibb filetransfer as well  
							
							
							
						 
						
							2014-06-23 16:01:51 +02:00  
				
					
						
							
							
								 
						
							
								c25f1283a1 
								
							 
						 
						
							
							
								
								removed warnings  
							
							
							
						 
						
							2014-06-22 21:44:17 +02:00  
				
					
						
							
							
								 
						
							
								678cc7af10 
								
							 
						 
						
							
							
								
								changelog and version bump to 0.4-beta  
							
							
							
						 
						
							2014-06-22 19:53:43 +02:00  
				
					
						
							
							
								 
						
							
								1374fed31b 
								
							 
						 
						
							
							
								
								fixed   #220  
							
							
							
						 
						
							2014-06-22 18:21:04 +02:00  
				
					
						
							
							
								 
						
							
								fafc5306d7 
								
							 
						 
						
							
							
								
								moved message packet creation into sperate class  
							
							
							
						 
						
							2014-06-22 17:24:47 +02:00  
				
					
						
							
							
								 
						
							
								dcf62a8ac5 
								
							 
						 
						
							
							
								
								Prepare 0.1.0 snapshot  
							
							
							
						 
						
							2014-06-22 16:36:19 +02:00  
				
					
						
							
							
								 
						
							
								0e484dd17f 
								
							 
						 
						
							
							
								
								Add missing javadoc and review new code  
							
							
							
						 
						
							2014-06-22 15:29:51 +02:00  
				
					
						
							
							
								 
						
							
								f559bd14dd 
								
							 
						 
						
							
							
								
								establish otr connection before sending image  
							
							
							
						 
						
							2014-06-22 13:57:57 +02:00  
				
					
						
							
							
								 
						
							
								289d48b633 
								
							 
						 
						
							
							
								
								Add transifex config  
							
							
							
						 
						
							2014-06-22 12:01:13 +02:00  
				
					
						
							
							
								 
						
							
								6409846379 
								
							 
						 
						
							
							
								
								removed duplicate entries  
							
							
							
						 
						
							2014-06-21 22:16:42 +02:00  
				
					
						
							
							
								 
						
							
								ab8b031cc0 
								
							 
						 
						
							
							
								
								Merge branch 'beriain-development' into development  
							
							
							
						 
						
							2014-06-20 19:50:03 +02:00  
				
					
						
							
							
								 
						
							
								545cad41e6 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/beriain/Conversations  into beriain-development  
							
							... 
							
							
							
							Conflicts:
	res/values-eu/strings.xml 
							
						 
						
							2014-06-20 19:49:33 +02:00  
				
					
						
							
							
								 
						
							
								49b7c7779d 
								
							 
						 
						
							
							
								
								fixes for otr file transfer  
							
							
							
						 
						
							2014-06-20 19:28:47 +02:00  
				
					
						
							
							
								 
						
							
								1cf055d2fd 
								
							 
						 
						
							
							
								
								not working version of otr file transfer  
							
							
							
						 
						
							2014-06-20 17:30:19 +02:00  
				
					
						
							
							
								 
						
							
								b16bc24c71 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-06-18 17:15:59 +02:00  
				
					
						
							
							
								 
						
							
								beafb06b6a 
								
							 
						 
						
							
							
								
								clear input field after conference pgp message  
							
							
							
						 
						
							2014-06-16 23:43:45 +02:00  
				
					
						
							
							
								 
						
							
								7e8c68b698 
								
							 
						 
						
							
							
								
								streamlined onpresenceselected listener  
							
							
							
						 
						
							2014-06-16 14:21:22 +02:00  
				
					
						
							
							
								 
						
							
								30a0be2998 
								
							 
						 
						
							
							
								
								fixed bug in intent filter. cleaned share with activity  
							
							
							
						 
						
							2014-06-16 14:06:50 +02:00  
				
					
						
							
							
								 
						
							
								0102032fc5 
								
							 
						 
						
							
							
								
								added share image intent to android manifest for testing purposes  
							
							
							
						 
						
							2014-06-16 14:06:50 +02:00  
				
					
						
							
							
								 
						
							
								41834b5e24 
								
							 
						 
						
							
							
								
								code cleanup / unification  
							
							
							
						 
						
							2014-06-16 14:06:34 +02:00  
				
					
						
							
							
								 
						
							
								b9477edb53 
								
							 
						 
						
							
							
								
								cleanup; removed unnecessary imports and log outputs  
							
							
							
						 
						
							2014-06-16 12:18:04 +02:00  
				
					
						
							
							
								 
						
							
								e6b5713c12 
								
							 
						 
						
							
							
								
								Merge pull request  #211  from kruks23/development  
							
							... 
							
							
							
							Rounded minutes ago and last seen moe exactly 
							
						 
						
							2014-06-15 20:12:40 +02:00  
				
					
						
							
							
								 
						
							
								febf23de1f 
								
							 
						 
						
							
							
								
								Rounded minutes ago and last seen + Update Spanish Translations  
							
							
							
						 
						
							2014-06-15 18:27:20 +02:00  
				
					
						
							
							
								 
						
							
								7a164f7639 
								
							 
						 
						
							
							
								
								Merge pull request  #209  from mrdomino/development  
							
							... 
							
							
							
							Send from our full jid (fixes  #60 ) 
							
						 
						
							2014-06-15 15:38:52 +02:00  
				
					
						
							
							
								 
						
							
								473cef32fa 
								
							 
						 
						
							
							
								
								Send from our full jid ( fixes   #60 )  
							
							... 
							
							
							
							The problem wasn't with sending to bare jids, but rather sending
*from* bare jids, which we did unless we were OTR encrypted for
some reason. Google Talk supports the former, but (probably correctly)
rejects the latter. 
							
						 
						
							2014-06-15 05:38:15 -07:00  
				
					
						
							
							
								 
						
							
								7f1a4a6fb8 
								
							 
						 
						
							
							
								
								infite scrolling  
							
							
							
						 
						
							2014-06-14 16:59:07 +02:00  
				
					
						
							
							
								 
						
							
								7bdee8c19b 
								
							 
						 
						
							
							
								
								fixed   #197  
							
							
							
						 
						
							2014-06-14 14:27:03 +02:00  
				
					
						
							
							
								 
						
							
								471ed7838a 
								
							 
						 
						
							
							
								
								fixed   #204  
							
							
							
						 
						
							2014-06-14 10:29:26 +02:00  
				
					
						
							
							
								 
						
							
								d067448808 
								
							 
						 
						
							
							
								
								offline sending of images  
							
							
							
						 
						
							2014-06-13 18:16:14 +02:00  
				
					
						
							
							
								 
						
							
								028700efe0 
								
							 
						 
						
							
							
								
								Make sure we initialize big enough if s.o. chooses small values  
							
							
							
						 
						
							2014-06-13 17:54:54 +02:00  
				
					
						
							
							
								 
						
							
								8e848f7afd 
								
							 
						 
						
							
							
								
								Switch to deticated DNSCache interface + reference LRU implementation.  
							
							
							
						 
						
							2014-06-13 17:51:45 +02:00  
				
					
						
							
							
								 
						
							
								76f3894107 
								
							 
						 
						
							
							
								
								status waiting for images sent offline  
							
							
							
						 
						
							2014-06-13 15:05:35 +02:00  
				
					
						
							
							
								 
						
							
								eb7ed78605 
								
							 
						 
						
							
							
								
								moved last seen to contact details  
							
							
							
						 
						
							2014-06-13 11:50:47 +02:00  
				
					
						
							
							
								 
						
							
								899da61555 
								
							 
						 
						
							
							
								
								further bullet proofing  
							
							
							
						 
						
							2014-06-13 11:16:52 +02:00  
				
					
						
							
							
								 
						
							
								a92fb88e51 
								
							 
						 
						
							
							
								
								fixed   #201  
							
							
							
						 
						
							2014-06-13 10:39:44 +02:00  
				
					
						
							
							
								 
						
							
								592aded106 
								
							 
						 
						
							
							
								
								finished offline otr  
							
							
							
						 
						
							2014-06-12 23:04:28 +02:00  
				
					
						
							
							
								 
						
							
								4da60e7e20 
								
							 
						 
						
							
							
								
								Simplify cache and extend cache operations.  
							
							... 
							
							
							
							Remove the external cache dependency and use a simple LRU based on
LinkedHashMap.
Make it possible to get the parse time of DNSMessage, which means we
can evaluate the TTL later on :-) 
							
						 
						
							2014-06-12 22:39:51 +02:00  
				
					
						
							
							
								 
						
							
								b1482212b8 
								
							 
						 
						
							
							
								
								fire onContactStatusChanged only on online/offline changes. not on status changes  
							
							
							
						 
						
							2014-06-12 18:27:50 +02:00