iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc656c5571
							
						
					 | 
					
						
						
							
							removed presence from last seen
						
						
						
						
						
					 | 
					
						2014-06-06 19:37:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							e820c98cb7
							
						
					 | 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-06-06 11:39:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fe926b645
							
						
					 | 
					
						
						
							
							basic last seen feature. no peristancy just yet. no polish
						
						
						
						
						
					 | 
					
						2014-06-06 11:39:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							356a5724f6
							
						
					 | 
					
						
						
							
							Merge pull request #178 from kruks23/development
						
						
						
						
						
						
						
						Update Spanish Translations 
						
					 | 
					
						2014-06-05 11:52:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							a583471af8
							
						
					 | 
					
						
						
							
							read marker is now a little less in your face
						
						
						
						
						
					 | 
					
						2014-06-05 01:57:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4e06db14f
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-06-05 00:07:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							83e919f8af
							
						
					 | 
					
						
						
							
							experimental gui to display read status
						
						
						
						
						
					 | 
					
						2014-06-04 21:40:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e4e7426ee
							
						
					 | 
					
						
						
							
							received and displayed messages (xep 333) are now marked properly
						
						
						
						
						
					 | 
					
						2014-06-04 18:44:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							cedc1f40b3
							
						
					 | 
					
						
						
							
							answer to xep 184 message receipts. fixes #95
						
						
						
						
						
					 | 
					
						2014-06-03 15:48:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alethea Rose Butler
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5881fc0412
							
						
					 | 
					
						
						
							
							Fixed typo in source "sefl" -> "self"
						
						
						
						
						
					 | 
					
						2014-06-01 17:45:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							32a21e1ab9
							
						
					 | 
					
						
						
							
							unified crypto messages and made lock icon work for conferences
						
						
						
						
						
					 | 
					
						2014-06-01 19:08:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ea73feec4
							
						
					 | 
					
						
						
							
							added warning when public keys are missing
						
						
						
						
						
					 | 
					
						2014-06-01 18:52:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a4b1f8a2f
							
						
					 | 
					
						
						
							
							show dialog when no contact in a muc has pgp support
						
						
						
						
						
					 | 
					
						2014-06-01 11:24:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d0e1374b2
							
						
					 | 
					
						
						
							
							OpenPGP key display in muc details is now prettier and linked to openkeychain
						
						
						
						
						
					 | 
					
						2014-06-01 10:22:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alethea Butler
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e9627dc50
							
						
					 | 
					
						
						
							
							Capitalized openPGP -> OpenPGP
						
						
						
						
						
					 | 
					
						2014-05-31 00:11:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f2a0c0107
							
						
					 | 
					
						
						
							
							Merge pull request #160 from alethea/development
						
						
						
						
						
						
						
						Spelling and changed "unsuccessful delivery" to "delivery failed" 
						
					 | 
					
						2014-05-30 12:36:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alethea Butler
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb127add56
							
						
					 | 
					
						
						
							
							Changed "unsuccessful delivery" to "delivery failed"
						
						
						
						
						
					 | 
					
						2014-05-30 02:04:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alethea Butler
							
						 
					 | 
					
						
						
						
						
							
						
						
							732848fc0e
							
						
					 | 
					
						
						
							
							Added question mark to remove_contact_text
						
						
						
						
						
					 | 
					
						2014-05-30 02:03:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							75b14a1d5c
							
						
					 | 
					
						
						
							
							More harcoded translations + updated Spanish
						
						
						
						
						
					 | 
					
						2014-05-29 18:17:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e3967b785
							
						
					 | 
					
						
						
							
							Merge pull request #147 from kruks23/development
						
						
						
						
						
						
						
						Fix Contact Status width in contact details 
						
					 | 
					
						2014-05-26 18:46:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a858992586
							
						
					 | 
					
						
						
							
							Merge pull request #152 from beriain/development
						
						
						
						
						
						
						
						Update basque translation 
						
					 | 
					
						2014-05-26 18:46:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0d21211e1
							
						
					 | 
					
						
						
							
							fixed #151
						
						
						
						
						
					 | 
					
						2014-05-26 18:44:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aitor Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							10aa935331
							
						
					 | 
					
						
						
							
							Update strings.xml
						
						
						
						
						
						
						
						Some strings were untranslated in the previous commit 
						
					 | 
					
						2014-05-26 17:30:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aitor Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4e45458fb
							
						
					 | 
					
						
						
							
							Update strings.xml
						
						
						
						
						
					 | 
					
						2014-05-26 17:27:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b6a07e380
							
						
					 | 
					
						
						
							
							Fix Contact Status width in contact details
						
						
						
						
						
					 | 
					
						2014-05-24 15:37:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f825f8027
							
						
					 | 
					
						
						
							
							error msg on offline subscription changes
						
						
						
						
						
					 | 
					
						2014-05-24 11:17:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							d74faa3f7c
							
						
					 | 
					
						
						
							
							More harcoded translations + Spanish
						
						
						
						
						
					 | 
					
						2014-05-24 00:17:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6fd0343ae
							
						
					 | 
					
						
						
							
							Title activities translations + contacts translations + update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-05-23 16:20:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2ae6e80fa
							
						
					 | 
					
						
						
							
							Merge pull request #143 from nachovfranco/mycommits
						
						
						
						
						
						
						
						Galician translation 
						
					 | 
					
						2014-05-23 09:57:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							950165033b
							
						
					 | 
					
						
						
							
							Contact details translations + update spanish translations
						
						
						
						
						
					 | 
					
						2014-05-22 22:58:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nachovfranco
							
						 
					 | 
					
						
						
						
						
							
						
						
							e26c60b9ca
							
						
					 | 
					
						
						
							
							Galician translation
						
						
						
						
						
					 | 
					
						2014-05-22 13:10:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9d384875b
							
						
					 | 
					
						
						
							
							added missing strings
						
						
						
						
						
					 | 
					
						2014-05-21 20:37:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							543d776986
							
						
					 | 
					
						
						
							
							Merge pull request #131 from beriain/development
						
						
						
						
						
						
						
						Update and fix basque translation 
						
					 | 
					
						2014-05-20 20:37:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							aba1ca7918
							
						
					 | 
					
						
						
							
							Update Spanish Translations + harcoded just_now
						
						
						
						
						
					 | 
					
						2014-05-20 18:49:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b50c9912b
							
						
					 | 
					
						
						
							
							Update and fix basque translation
						
						
						
						
						
					 | 
					
						2014-05-20 16:35:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff6e51356f
							
						
					 | 
					
						
						
							
							Merge pull request #128 from kruks23/development
						
						
						
						
						
						
						
						Update Spanish Translations 
						
					 | 
					
						2014-05-20 11:52:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a582d44dba
							
						
					 | 
					
						
						
							
							added search icon
						
						
						
						
						
					 | 
					
						2014-05-20 10:15:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							993477cd83
							
						
					 | 
					
						
						
							
							reworked roster/contact handling. might break some stuff. not sycing to disk yet
						
						
						
						
						
					 | 
					
						2014-05-19 15:15:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							7994b6866b
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-05-18 19:33:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							590e2403ab
							
						
					 | 
					
						
						
							
							bind and session request more compatible
						
						
						
						
						
					 | 
					
						2014-05-18 17:32:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fc7201abb
							
						
					 | 
					
						
						
							
							cleaned up edit account dialog a little
						
						
						
						
						
					 | 
					
						2014-05-18 11:49:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							736e09fbb5
							
						
					 | 
					
						
						
							
							added record audio button
						
						
						
						
						
					 | 
					
						2014-05-17 19:21:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a32d95cdd3
							
						
					 | 
					
						
						
							
							fixed #66
						
						
						
						
						
					 | 
					
						2014-05-17 12:10:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cab9b10e35
							
						
					 | 
					
						
						
							
							spelling
						
						
						
						
						
					 | 
					
						2014-05-17 12:02:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							e50f009004
							
						
					 | 
					
						
						
							
							Update Spanish Translations + harcoded pref_advanced_settings
						
						
						
						
						
					 | 
					
						2014-05-16 22:35:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							225447f2f5
							
						
					 | 
					
						
						
							
							updated german translation
						
						
						
						
						
					 | 
					
						2014-05-16 16:16:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f8bab2a1
							
						
					 | 
					
						
						
							
							formating
						
						
						
						
						
					 | 
					
						2014-05-16 13:18:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benoit Bouvarel
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d0f08e319
							
						
					 | 
					
						
						
							
							French translation + hard-coded string > @string
						
						
						
						
						
					 | 
					
						2014-05-16 01:13:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3426df21c1
							
						
					 | 
					
						
						
							
							Merge pull request #109 from kruks23/development
						
						
						
						
						
						
						
						Update Spanish Translations 
						
					 | 
					
						2014-05-15 12:07:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad19100b9d
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-05-14 19:18:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4eebd091c
							
						
					 | 
					
						
						
							
							fixed #105
						
						
						
						
						
					 | 
					
						2014-05-14 18:32:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							65e7294802
							
						
					 | 
					
						
						
							
							Merge branch 'development' into feature/take_picture
						
						
						
						
						
					 | 
					
						2014-05-14 00:09:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebae779d73
							
						
					 | 
					
						
						
							
							one more entry to strings file
						
						
						
						
						
					 | 
					
						2014-05-13 18:06:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							888de850cf
							
						
					 | 
					
						
						
							
							Merge branch 'development' into feature/take_picture
						
						
						
						
						
					 | 
					
						2014-05-13 17:23:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							efac008ffb
							
						
					 | 
					
						
						
							
							Fix
						
						
						
						
						
					 | 
					
						2014-05-13 16:52:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d27d0c44a
							
						
					 | 
					
						
						
							
							Merge https://github.com/siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-05-13 16:46:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							1150f47add
							
						
					 | 
					
						
						
							
							Update basque translation and include preferences
						
						
						
						
						
					 | 
					
						2014-05-13 16:42:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dfd885d34
							
						
					 | 
					
						
						
							
							submenu for attach file
						
						
						
						
						
					 | 
					
						2014-05-13 15:25:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cd369fb7b
							
						
					 | 
					
						
						
							
							german translation
						
						
						
						
						
					 | 
					
						2014-05-13 13:51:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f38c7b22fd
							
						
					 | 
					
						
						
							
							further translations
						
						
						
						
						
					 | 
					
						2014-05-13 11:23:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cce12af766
							
						
					 | 
					
						
						
							
							fixed french language
						
						
						
						
						
					 | 
					
						2014-05-13 10:18:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							32d2efd459
							
						
					 | 
					
						
						
							
							Merge pull request #88 from BenoitBouvarel/development
						
						
						
						
						
						
						
						Translation into French 
						
					 | 
					
						2014-05-12 23:29:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dee1ba3bdd
							
						
					 | 
					
						
						
							
							Merge pull request #101 from kruks23/development
						
						
						
						
						
						
						
						Preferences Spanish Translations 
						
					 | 
					
						2014-05-12 23:28:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae768598fe
							
						
					 | 
					
						
						
							
							Preferences Spanish Translations
						
						
						
						
						
					 | 
					
						2014-05-12 23:22:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alvar
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb706e9e82
							
						
					 | 
					
						
						
							
							Fix a typo in catalan translation
						
						
						
						
						
					 | 
					
						2014-05-12 23:15:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alvar
							
						 
					 | 
					
						
						
						
						
							
						
						
							d07139d3c4
							
						
					 | 
					
						
						
							
							Translation into catalan language
						
						
						
						
						
					 | 
					
						2014-05-12 23:14:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecea4a5cd2
							
						
					 | 
					
						
						
							
							fixed parsing error on missing %s
						
						
						
						
						
					 | 
					
						2014-05-12 23:12:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							3858715ccf
							
						
					 | 
					
						
						
							
							Update basque translation
						
						
						
						
						
					 | 
					
						2014-05-12 17:19:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							75f7695087
							
						
					 | 
					
						
						
							
							Merge https://github.com/siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-05-12 17:09:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3455d10a4a
							
						
					 | 
					
						
						
							
							Better error handling if attach file doesnt work (on permission denied)
						
						
						
						
						
						
						
						and unified encrypted and unencrypted file attachment 
						
					 | 
					
						2014-05-12 14:59:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d0bf7971e
							
						
					 | 
					
						
						
							
							transfered preferences descritpions into strings.xml
						
						
						
						
						
					 | 
					
						2014-05-11 13:55:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							fcc021aa94
							
						
					 | 
					
						
						
							
							Delete styles.xml
						
						
						
						
						
					 | 
					
						2014-05-10 11:26:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f32089ec0
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development
						
						
						
						
						
						
						
						Conflicts:
	res/values-es/arrays.xml
	res/values-es/strings.xml 
						
					 | 
					
						2014-05-10 11:23:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d913c2e0e
							
						
					 | 
					
						
						
							
							Translation into spanish.
						
						
						
						
						
					 | 
					
						2014-05-10 11:23:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							38d3da6c2b
							
						
					 | 
					
						
						
							
							#79 First translation into spanish.
						
						
						
						
						
					 | 
					
						2014-05-10 10:50:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef0bc6714a
							
						
					 | 
					
						
						
							
							added dialog for otr file transfer
						
						
						
						
						
					 | 
					
						2014-05-09 21:20:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a14a28973a
							
						
					 | 
					
						
						
							
							nicer descriptions in notificaton for images and encrypted messages
						
						
						
						
						
					 | 
					
						2014-05-09 20:46:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dominik Schürmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a2da100d5
							
						
					 | 
					
						
						
							
							Improve OTR fingerprint dialog and fix german sentence
						
						
						
						
						
					 | 
					
						2014-05-08 19:03:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							42c07bf4ae
							
						
					 | 
					
						
						
							
							Update basque translation
						
						
						
						
						
					 | 
					
						2014-05-08 15:59:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ed29c1c77
							
						
					 | 
					
						
						
							
							more informative dialog if contact doesn't announce public key
						
						
						
						
						
					 | 
					
						2014-05-08 14:23:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc73a25ae4
							
						
					 | 
					
						
						
							
							code cleanup
						
						
						
						
						
					 | 
					
						2014-05-08 11:53:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benoit Bouvarel
							
						 
					 | 
					
						
						
						
						
							
						
						
							02673b2866
							
						
					 | 
					
						
						
							
							Traduction Francaise
						
						
						
						
						
					 | 
					
						2014-05-07 15:38:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a407c766c
							
						
					 | 
					
						
						
							
							fixed #70 #65
						
						
						
						
						
					 | 
					
						2014-05-07 13:19:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b20a213b0
							
						
					 | 
					
						
						
							
							basic german translation
						
						
						
						
						
					 | 
					
						2014-05-06 22:14:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							0578fb3850
							
						
					 | 
					
						
						
							
							#79 First translation into spanish.
						
						
						
						
						
					 | 
					
						2014-05-06 20:34:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8023b4dfc
							
						
					 | 
					
						
						
							
							Merge https://github.com/siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-05-06 16:56:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							86887274c7
							
						
					 | 
					
						
						
							
							Update basque and spanish translations
						
						
						
						
						
					 | 
					
						2014-05-06 16:50:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							be2f7e047a
							
						
					 | 
					
						
						
							
							more cleanup in res files
						
						
						
						
						
					 | 
					
						2014-05-03 17:06:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4893d8030b
							
						
					 | 
					
						
						
							
							removed unnecessary files
						
						
						
						
						
					 | 
					
						2014-05-03 17:04:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cfb4a0cd6
							
						
					 | 
					
						
						
							
							added restart button to openkeychain dialog
						
						
						
						
						
					 | 
					
						2014-05-03 15:24:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mikel
							
						 
					 | 
					
						
						
						
						
							
						
						
							794f9d6cc8
							
						
					 | 
					
						
						
							
							Add Basque and Spanish translations
						
						
						
						
						
					 | 
					
						2014-05-02 21:21:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							82bccedf70
							
						
					 | 
					
						
						
							
							nicer dialog screen if openkeychain is not installed
						
						
						
						
						
					 | 
					
						2014-05-02 12:02:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							37c8e157d0
							
						
					 | 
					
						
						
							
							reworked openpgp integration part #1
						
						
						
						
						
					 | 
					
						2014-05-01 22:33:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f36f218469
							
						
					 | 
					
						
						
							
							unified presence selection for otr and file transfer
						
						
						
						
						
					 | 
					
						2014-04-26 12:40:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							645139eb68
							
						
					 | 
					
						
						
							
							couple of more optimazations on image loading
						
						
						
						
						
					 | 
					
						2014-04-25 23:06:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf2d0d5596
							
						
					 | 
					
						
						
							
							smoother scrolling (first step)
						
						
						
						
						
					 | 
					
						2014-04-25 16:24:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							77da0c6b5d
							
						
					 | 
					
						
						
							
							allow images to be opened with gallary app
						
						
						
						
						
					 | 
					
						2014-04-21 19:51:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8006931f80
							
						
					 | 
					
						
						
							
							put more string into strings.xml
						
						
						
						
						
					 | 
					
						2014-04-18 00:17:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a36abf30f
							
						
					 | 
					
						
						
							
							added clear history dialog (no funcionality)
						
						
						
						
						
					 | 
					
						2014-04-18 00:17:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdf9770a61
							
						
					 | 
					
						
						
							
							made ui with sending images a little smoother
						
						
						
						
						
					 | 
					
						2014-04-15 15:19:02 +02:00 | 
					
					
						
						
							
							
							
						
					 |