Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f825f8027 
							
						 
					 
					
						
						
							
							error msg on offline subscription changes  
						
						
						
					 
					
						2014-05-24 11:17:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03854f30c9 
							
						 
					 
					
						
						
							
							Merge pull request  #146  from kruks23/development  
						
						... 
						
						
						
						More harcoded translations + Spanish 
						
					 
					
						2014-05-24 10:03:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00377b64c7 
							
						 
					 
					
						
						
							
							Merge pull request  #140  from strb/mucicons  
						
						... 
						
						
						
						Refactored unknown contact picture generation 
						
					 
					
						2014-05-24 10:01:51 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							a0dde05ee5 
							
						 
					 
					
						
						
							
							end otr sessions earlier / more often. can lead to unesessary handshakes but can improve reliabilty  
						
						
						
					 
					
						2014-05-23 10:54:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8133dcd881 
							
						 
					 
					
						
						
							
							fixed possible npe  
						
						
						
					 
					
						2014-05-23 10:15:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5d54d70ee 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2014-05-23 10:07:17 +02:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							950165033b 
							
						 
					 
					
						
						
							
							Contact details translations + update spanish translations  
						
						
						
					 
					
						2014-05-22 22:58:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b99779432c 
							
						 
					 
					
						
						
							
							offline crud of contacts  
						
						
						
					 
					
						2014-05-22 14:33:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad960b393d 
							
						 
					 
					
						
						
							
							implementet missing methods on the new roster mgmt  
						
						
						
					 
					
						2014-05-22 12:57:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0d2ca260e 
							
						 
					 
					
						
						
							
							fixed   #136  
						
						
						
					 
					
						2014-05-22 09:36:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1db807ef58 
							
						 
					 
					
						
						
							
							write contacts on system shutdown  
						
						
						
					 
					
						2014-05-21 22:22:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a6da5afaa 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						
						
					 
					
						2014-05-21 20:28:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6d90a5cd57 
							
						 
					 
					
						
						
							
							further improvment trying to deal with large images  
						
						
						
					 
					
						2014-05-21 20:27:53 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0883de0701 
							
						 
					 
					
						
						
							
							Refactored unknown contact picture generation  
						
						... 
						
						
						
						Introduce drawTile method in order to remove code duplication 
						
					 
					
						2014-05-21 18:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2674d40704 
							
						 
					 
					
						
						
							
							Fix highlight detection in MUC channels  
						
						... 
						
						
						
						We only detect highlights if a word starts with the nick (matched in
case insensitive manner), followed by optional punctuation, followed by
another word boundary. 
						
					 
					
						2014-05-21 18:05:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0de9d57420 
							
						 
					 
					
						
						
							
							cleaned up shared text  
						
						
						
					 
					
						2014-05-21 16:43:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2ce5ff98 
							
						 
					 
					
						
						
							
							auto retry image compression with decreasing sample size  
						
						
						
					 
					
						2014-05-21 00:39:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fa9cbeb746 
							
						 
					 
					
						
						
							
							close input stream  
						
						
						
					 
					
						2014-05-20 22:54:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f0efa089f 
							
						 
					 
					
						
						
							
							trying to deal with larger images  
						
						
						
					 
					
						2014-05-20 22:52:57 +02:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							aba1ca7918 
							
						 
					 
					
						
						
							
							Update Spanish Translations + harcoded just_now  
						
						
						
					 
					
						2014-05-20 18:49:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f79d92ab67 
							
						 
					 
					
						
						
							
							highlight people in conferences by clicken on their picture  
						
						
						
					 
					
						2014-05-20 11:44:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13f9f23946 
							
						 
					 
					
						
						
							
							fixed ping time out after session resume  
						
						
						
					 
					
						2014-05-20 11:05:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f92d8d109 
							
						 
					 
					
						
						
							
							ported pending subscription support to new roster mgmt  
						
						
						
					 
					
						2014-05-20 10:48:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							371c985c25 
							
						 
					 
					
						
						
							
							made roster persistant aka enabled versioning again  
						
						
						
					 
					
						2014-05-19 21:05:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6f9a742c0 
							
						 
					 
					
						
						
							
							some code cleanup to deal with the roster mgmt changes from earlier  
						
						
						
					 
					
						2014-05-19 15:39:50 +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 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							590e2403ab 
							
						 
					 
					
						
						
							
							bind and session request more compatible  
						
						
						
					 
					
						2014-05-18 17:32:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e857cf979d 
							
						 
					 
					
						
						
							
							fixed   #123  fixed122  
						
						
						
					 
					
						2014-05-18 13:23:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7fc7201abb 
							
						 
					 
					
						
						
							
							cleaned up edit account dialog a little  
						
						
						
					 
					
						2014-05-18 11:49:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0cdd74417f 
							
						 
					 
					
						
						
							
							fixed   #53  aka server not found bug  
						
						
						
					 
					
						2014-05-18 11:25:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							66aacf7e3e 
							
						 
					 
					
						
						
							
							sending session after unsucesfull session resume.  fixed   #116  
						
						
						
					 
					
						2014-05-17 21:57:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							736e09fbb5 
							
						 
					 
					
						
						
							
							added record audio button  
						
						
						
					 
					
						2014-05-17 19:21:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							27060e303c 
							
						 
					 
					
						
						
							
							made sending session more compliant  
						
						
						
					 
					
						2014-05-17 19:20:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c17937640 
							
						 
					 
					
						
						
							
							receiving pgp images important bug fix  
						
						
						
					 
					
						2014-05-17 19:19:06 +02:00 
						 
				 
			
				
					
						
							
							
								the-username 
							
						 
					 
					
						
						
						
						
							
						
						
							e34fddd7e1 
							
						 
					 
					
						
						
							
							Update Validator.java  
						
						
						
					 
					
						2014-05-17 12:50:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bab69ffcf9 
							
						 
					 
					
						
						
							
							fixed   #108  
						
						
						
					 
					
						2014-05-17 11:08:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8bf0945f2f 
							
						 
					 
					
						
						
							
							permanent notification disapears now when account is being deleted + code clean up  
						
						
						
					 
					
						2014-05-17 10:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b84b67268b 
							
						 
					 
					
						
						
							
							fixed   #113  
						
						
						
					 
					
						2014-05-17 09:43:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd1afbd39a 
							
						 
					 
					
						
						
							
							reworked message to conferences  
						
						
						
					 
					
						2014-05-16 22:46:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0a5ca9585 
							
						 
					 
					
						
						
							
							fixed npe for otr sessions with non contacts  
						
						
						
					 
					
						2014-05-16 22:44:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa68045c58 
							
						 
					 
					
						
						
							
							offline sending of pgp fixed  
						
						
						
					 
					
						2014-05-16 13:42:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1cf1e62e30 
							
						 
					 
					
						
						
							
							fixed null in shared link  
						
						
						
					 
					
						2014-05-16 12:07:58 +02:00 
						 
				 
			
				
					
						
							
							
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							3d0f08e319 
							
						 
					 
					
						
						
							
							French translation + hard-coded string > @string  
						
						
						
					 
					
						2014-05-16 01:13:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13d73a196c 
							
						 
					 
					
						
						
							
							fixed npe  
						
						
						
					 
					
						2014-05-15 10:27:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7e24c30d 
							
						 
					 
					
						
						
							
							hiding the prepare image toast after error or success  
						
						
						
					 
					
						2014-05-14 18:43:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							08a26d2772 
							
						 
					 
					
						
						
							
							fixed possible npe  
						
						
						
					 
					
						2014-05-14 18:39:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4eebd091c 
							
						 
					 
					
						
						
							
							fixed   #105  
						
						
						
					 
					
						2014-05-14 18:32:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81d2760505 
							
						 
					 
					
						
						
							
							made message parser non static  
						
						
						
					 
					
						2014-05-14 12:56:34 +02:00