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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							513f3c47b2
							
						
					 | 
					
						
						
							
							added very basic, very untested gui on the receiving side
						
						
						
						
						
					 | 
					
						2014-04-14 21:21:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							18c3333271
							
						
					 | 
					
						
						
							
							tried to fix some race conditions. not adding duplicate candidates. needs more checks though
						
						
						
						
						
					 | 
					
						2014-04-14 20:35:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2014af0f7e
							
						
					 | 
					
						
						
							
							Merge pull request #59 from jelmer/typo-preemptively
						
						
						
						
						
						
						
						Fix typo: Preemptivly -> Preemptively. 
						
					 | 
					
						2014-04-14 10:23:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9704bcf1c3
							
						
					 | 
					
						
						
							
							Merge pull request #58 from jelmer/fix-typo-assoziated
						
						
						
						
						
						
						
						Fix two typos: assoziated -> associated. 
						
					 | 
					
						2014-04-14 10:22:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jelmer Vernooij
							
						 
					 | 
					
						
						
						
						
							
						
						
							3727b90ce1
							
						
					 | 
					
						
						
							
							Fix typo: Preemptivly -> Preemptively.
						
						
						
						
						
					 | 
					
						2014-04-14 02:38:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jelmer Vernooij
							
						 
					 | 
					
						
						
						
						
							
						
						
							802c21a793
							
						
					 | 
					
						
						
							
							Fix two typos: assoziated -> associated.
						
						
						
						
						
					 | 
					
						2014-04-14 02:22:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e25b2aa5b
							
						
					 | 
					
						
						
							
							added contributors and note to xep65
						
						
						
						
						
					 | 
					
						2014-04-13 22:36:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andreas Straub
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4f9a38c76
							
						
					 | 
					
						
						
							
							Some icon tweaks
						
						
						
						
						
						
						
						Use Roboto Light, thinner lines between tiles, slightly smaller letters 
						
					 | 
					
						2014-04-13 21:13:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andreas Straub
							
						 
					 | 
					
						
						
						
						
							
						
						
							132689376c
							
						
					 | 
					
						
						
							
							Added ellipsis tile for large conversations
						
						
						
						
						
						
						
						For more than 4 members in a conversation, the fourth tile now contains
an ellipsis to indicate this 
						
					 | 
					
						2014-04-13 21:13:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andreas Straub
							
						 
					 | 
					
						
						
						
						
							
						
						
							901ce085a7
							
						
					 | 
					
						
						
							
							Major Contact Picture code cleanup
						
						
						
						
						
						
						
						Notifications now have pseudotransparent icons, icons are generated in
the correct size. 
						
					 | 
					
						2014-04-13 21:13:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rene Treffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							152be6eb1a
							
						
					 | 
					
						
						
							
							Add gitignore
						
						
						
						
						
					 | 
					
						2014-04-13 21:12:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							084ab51b1d
							
						
					 | 
					
						
						
							
							transmitting files between two conversations works. no error handling and no ui on the receiving end
						
						
						
						
						
					 | 
					
						2014-04-13 21:10:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dfe4ae082
							
						
					 | 
					
						
						
							
							some code cleanup. added setting to auto accept files. socks5 connections are now threaded
						
						
						
						
						
					 | 
					
						2014-04-13 18:09:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							27d5966ac3
							
						
					 | 
					
						
						
							
							more efficant way of calculating the sha1 sum. closing connections
						
						
						
						
						
					 | 
					
						2014-04-13 11:32:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b554f2001
							
						
					 | 
					
						
						
							
							fixed minor typos
						
						
						
						
						
					 | 
					
						2014-04-12 10:45:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f57b669f83
							
						
					 | 
					
						
						
							
							Merge branch 'development' of https://github.com/strb/Conversations into strb-development
						
						
						
						
						
					 | 
					
						2014-04-12 10:22:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d936a830e4
							
						
					 | 
					
						
						
							
							add sha1 sum to file
						
						
						
						
						
					 | 
					
						2014-04-12 10:02:48 +02:00 | 
					
					
						
						
							
							
							
						
					 |