Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							12a3865c47
							
						
					 | 
					
						
						
							
							correct status after error iq
						
						
						
						
						
					 | 
					
						2014-05-07 12:58:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							955b7dbc7e
							
						
					 | 
					
						
						
							
							wee bit of code cleanup
						
						
						
						
						
					 | 
					
						2014-05-07 12:33:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b20a213b0
							
						
					 | 
					
						
						
							
							basic german translation
						
						
						
						
						
					 | 
					
						2014-05-06 22:14:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b37dfbe93
							
						
					 | 
					
						
						
							
							Merge pull request #80 from beriain/development
						
						
						
						
						
						
						
						Add Basque and Spanish translations 
						
					 | 
					
						2014-05-06 21:40:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							461f2ffb16
							
						
					 | 
					
						
						
							
							basic pgp encrypted file transfer
						
						
						
						
						
					 | 
					
						2014-05-06 21:34:30 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7033cb7e0
							
						
					 | 
					
						
						
							
							content name and creator are properly set
						
						
						
						
						
					 | 
					
						2014-05-03 18:47:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2df57f38a0
							
						
					 | 
					
						
						
							
							properly reply to iq requests. reply to disco
						
						
						
						
						
					 | 
					
						2014-05-03 17:42:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4822d4dce7
							
						
					 | 
					
						
						
							
							allow roster pushes only from bare jid or null
						
						
						
						
						
					 | 
					
						2014-05-03 17:07:37 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b66b4b5d1
							
						
					 | 
					
						
						
							
							bug fix for jingle
						
						
						
						
						
					 | 
					
						2014-04-26 17:26:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f36f218469
							
						
					 | 
					
						
						
							
							unified presence selection for otr and file transfer
						
						
						
						
						
					 | 
					
						2014-04-26 12:40:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a55ddb889e
							
						
					 | 
					
						
						
							
							fixed #75
						
						
						
						
						
					 | 
					
						2014-04-25 23:14:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6942840061
							
						
					 | 
					
						
						
							
							setting backround color if image comes directly from cache
						
						
						
						
						
					 | 
					
						2014-04-25 23:09:15 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							18c183a767
							
						
					 | 
					
						
						
							
							deny files with unknown file types
						
						
						
						
						
					 | 
					
						2014-04-23 21:19:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a8e55acd1
							
						
					 | 
					
						
						
							
							added download button for images not accepted automatically
						
						
						
						
						
					 | 
					
						2014-04-22 18:46:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa5f775fc7
							
						
					 | 
					
						
						
							
							added support for ibb
						
						
						
						
						
					 | 
					
						2014-04-22 13:11:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d151ad9031
							
						
					 | 
					
						
						
							
							code cleanup
						
						
						
						
						
					 | 
					
						2014-04-21 20:39:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							77da0c6b5d
							
						
					 | 
					
						
						
							
							allow images to be opened with gallary app
						
						
						
						
						
					 | 
					
						2014-04-21 19:51:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc6a16c31b
							
						
					 | 
					
						
						
							
							added missing transport id
						
						
						
						
						
					 | 
					
						2014-04-21 12:03:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d730fd1ed
							
						
					 | 
					
						
						
							
							added proxy activate and a lot of code clean up. totatly untested
						
						
						
						
						
					 | 
					
						2014-04-20 22:34:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							04418484a2
							
						
					 | 
					
						
						
							
							made our spanish friends happy. fixed #68
						
						
						
						
						
					 | 
					
						2014-04-20 20:53:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d140ef6390
							
						
					 | 
					
						
						
							
							fixed #50
						
						
						
						
						
					 | 
					
						2014-04-20 20:48:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8003e53013
							
						
					 | 
					
						
						
							
							more jingle bug fixes
						
						
						
						
						
					 | 
					
						2014-04-19 11:58:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7299fe7c8b
							
						
					 | 
					
						
						
							
							fixed replace contact in conversation
						
						
						
						
						
					 | 
					
						2014-04-19 02:58:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c59668273
							
						
					 | 
					
						
						
							
							made debugging verbose again on specific parts
						
						
						
						
						
					 | 
					
						2014-04-19 02:19:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1235e3daca
							
						
					 | 
					
						
						
							
							fixed default autoaccept file size and wrongly marked message
						
						
						
						
						
					 | 
					
						2014-04-19 01:51:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c0873c7ca
							
						
					 | 
					
						
						
							
							cleaned up debug log a little bit
						
						
						
						
						
					 | 
					
						2014-04-19 01:14:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ccbf0008a
							
						
					 | 
					
						
						
							
							fixed concurrent modification of contacts which led to missing presences
						
						
						
						
						
					 | 
					
						2014-04-18 21:26:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e5f916b2a
							
						
					 | 
					
						
						
							
							tried to avoid some more race conditions in jingle
						
						
						
						
						
					 | 
					
						2014-04-18 11:57:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cc72b5a56
							
						
					 | 
					
						
						
							
							updated minidns
						
						
						
						
						
					 | 
					
						2014-04-18 09:32:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							625fbe7d81
							
						
					 | 
					
						
						
							
							Merge branch 'master' into development
						
						
						
						
						
					 | 
					
						2014-04-18 01:07:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							18c0c31b65
							
						
					 | 
					
						
						
							
							work around for bug in xmlpullparser
						
						
						
						
						
					 | 
					
						2014-04-18 00:33:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							07cf07ad58
							
						
					 | 
					
						
						
							
							lot of cleanup in jingle part
						
						
						
						
						
					 | 
					
						2014-04-18 00:17:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8006931f80
							
						
					 | 
					
						
						
							
							put more string into strings.xml
						
						
						
						
						
					 | 
					
						2014-04-18 00:17:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0de0cb90a0
							
						
					 | 
					
						
						
							
							fixed destination bug
						
						
						
						
						
					 | 
					
						2014-04-18 00:17:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e29ce19f20
							
						
					 | 
					
						
						
							
							fixed #63
						
						
						
						
						
					 | 
					
						2014-04-18 00:17:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a04d736f75
							
						
					 | 
					
						
						
							
							fixed possible race conditions with presences
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e711da7248
							
						
					 | 
					
						
						
							
							jingle sessions now get terminated proberly on success
						
						
						
						
						
					 | 
					
						2014-04-16 12:50:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdf9770a61
							
						
					 | 
					
						
						
							
							made ui with sending images a little smoother
						
						
						
						
						
					 | 
					
						2014-04-15 15:19:02 +02:00 | 
					
					
						
						
							
							
							
						
					 |