| 
							
							
								 kruks23 | 069cc51661 | Update Spanish Translations | 2014-06-29 11:57:53 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schürmann | aa9ecf871c | Update android gradle plugin to 0.12.0 | 2014-06-28 20:16:10 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8eedc1a57f | raised ping time out | 2014-06-27 11:42:31 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ed3b535e6c | made warnings in chats i tiny bit smaller | 2014-06-27 11:15:06 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 3a57f6df89 | faulty otr messages now generate an error | 2014-06-26 16:42:24 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 3bb585c020 | fixed rare bug with attach image menu | 2014-06-26 12:09:12 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 513b3959dc | moved some try catchs around | 2014-06-25 19:16:10 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 66bb5c9b51 | more npe fixes | 2014-06-25 17:54:00 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 5db04a37bd | fixed two rare npe | 2014-06-25 17:32:58 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 31657974bf | more kxml fuck ups fixed | 2014-06-25 17:24:03 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d63a9eb306 | fixed odd occurrences of a cursor returned by the system being NULL. wtf ukas | 2014-06-25 17:21:51 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 16c63c91e2 | wraped stanza writer in try catch | 2014-06-25 17:15:40 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | eb21475658 | removed unecessary logging | 2014-06-25 17:07:55 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | b0a3c717d2 | wrap wakelock release with try catch | 2014-06-25 17:06:20 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | dfbc42ecd7 | some fixes for otr with multiple parties | 2014-06-25 16:55:47 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 5d4efe0826 | changed diesys' link | 2014-06-24 16:25:37 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d23a59f159 | Merge branch 'development' of github.com:siacs/Conversations into development | 2014-06-24 16:14:32 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ea261c1032 | more otr fixes | 2014-06-24 16:14:18 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | d28d432ff8 | Merge pull request #226 from kruks23/development Update spanish mins ago | 2014-06-24 15:27:12 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | c2ddfded94 | added Diego Turtulici to list of contributors | 2014-06-24 15:22:36 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6ef9421d35 | fixes for offline otr | 2014-06-24 15:07:59 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 6332591902 | Update spanish mins ago | 2014-06-24 09:21:46 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2a8f9642d5 | added rendering script for artwork | 2014-06-24 01:35:43 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6f51cc8554 | changed opacity | 2014-06-24 01:05:31 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | dd7f8d28c7 | added license file. plus renaming | 2014-06-24 00:57:21 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 11190947b3 | Merge pull request #225 from diesys/development new icons | 2014-06-24 00:55:32 +02:00 |  | 
			
				
					| 
							
							
								 diesys | f2a63713cf | Create conversation_mono.svg | 2014-06-23 23:30:03 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 18d0e57f52 | fixed regression with chat markers not working | 2014-06-23 23:29:26 +02:00 |  | 
			
				
					| 
							
							
								 diesys | e4f5a905e9 | conversation_baloon.svg | 2014-06-23 23:28:43 +02:00 |  | 
			
				
					| 
							
							
								 diesys | 2aa99ddd39 | conversation.svg | 2014-06-23 23:27:02 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 25e44cbf52 | new logo | 2014-06-23 21:57:53 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d7656dd420 | fix for not being able to send otr encrypted images to offline contacts. unconfirmed | 2014-06-23 21:48:48 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | bc621bfcfb | Add missing property | 2014-06-23 21:20:39 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 43e276e325 | possible better distribution of contact picture colors | 2014-06-23 21:13:58 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | f9f5069e52 | Add missing javadoc / missing getter (getTTL) | 2014-06-23 21:02:25 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | c57b0d3ef4 | Fix missing source/javadoc archives | 2014-06-23 20:56:38 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 996bee8836 | enabled otr encryption for ibb filetransfer as well | 2014-06-23 16:01:51 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | c25f1283a1 | removed warnings | 2014-06-22 21:44:17 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 678cc7af10 | changelog and version bump to 0.4-beta | 2014-06-22 19:53:43 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1374fed31b | fixed #220 | 2014-06-22 18:21:04 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | fafc5306d7 | moved message packet creation into sperate class | 2014-06-22 17:24:47 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | dcf62a8ac5 | Prepare 0.1.0 snapshot | 2014-06-22 16:36:19 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | 0e484dd17f | Add missing javadoc and review new code | 2014-06-22 15:29:51 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f559bd14dd | establish otr connection before sending image | 2014-06-22 13:57:57 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schürmann | 289d48b633 | Add transifex config | 2014-06-22 12:01:13 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6409846379 | removed duplicate entries | 2014-06-21 22:16:42 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ab8b031cc0 | Merge branch 'beriain-development' into development | 2014-06-20 19:50:03 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 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 |  | 
			
				
					| 
							
							
								 iNPUTmice | 49b7c7779d | fixes for otr file transfer | 2014-06-20 19:28:47 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1cf055d2fd | not working version of otr file transfer | 2014-06-20 17:30:19 +02:00 |  |