Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ab025d008 
							
						 
					 
					
						
						
							
							Merge pull request  #398  from betheg/fix_res  
						
						... 
						
						
						
						fix: warning: string 'publish_avatar' has no default translation. 
						
					 
					
						2014-08-31 15:56:13 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8f8d4e320d 
							
						 
					 
					
						
						
							
							experimental message merging  
						
						
						
					 
					
						2014-08-31 14:29:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							733041aee4 
							
						 
					 
					
						
						
							
							fix: warning: string 'publish_avatar' has no default translation.  
						
						... 
						
						
						
						also altered the types of resources from array to string-array in some res-files. 
						
					 
					
						2014-08-30 17:47:17 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9be78cbbbe 
							
						 
					 
					
						
						
							
							more swedish translations  
						
						
						
					 
					
						2014-08-29 12:06:32 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							33172246c9 
							
						 
					 
					
						
						
							
							fixed   #389  
						
						
						
					 
					
						2014-08-29 10:24:25 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Kuhn 
							
						 
					 
					
						
						
						
						
							
						
						
							fc7f57cdd6 
							
						 
					 
					
						
						
							
							Fix some typos in the German translation.  
						
						
						
					 
					
						2014-08-28 22:54:40 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							85b31b8d8b 
							
						 
					 
					
						
						
							
							fixed spelling thanks @betheg  
						
						
						
					 
					
						2014-08-28 11:01:24 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							12cbd07693 
							
						 
					 
					
						
						
							
							formating in strings file  
						
						
						
					 
					
						2014-08-28 10:53:44 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d8eeab0879 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/beriain/Conversations  into development  
						
						... 
						
						
						
						Conflicts:
	res/values-eu/strings.xml 
						
					 
					
						2014-08-28 10:48:25 +02:00 
						 
				 
			
				
					
						
							
							
								Aitor Beriain 
							
						 
					 
					
						
						
						
						
							
						
						
							9c8b6b16d5 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						
						
					 
					
						2014-08-27 14:48:31 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							431d4ed44b 
							
						 
					 
					
						
						
							
							translated missing string in settings  
						
						
						
					 
					
						2014-08-27 09:43:53 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16eb8c3952 
							
						 
					 
					
						
						
							
							added swedish translations by Anders Sandblad @andersruneson  
						
						
						
					 
					
						2014-08-27 09:36:47 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d617f099a1 
							
						 
					 
					
						
						
							
							added missing string to german translation  
						
						
						
					 
					
						2014-08-26 15:35:48 +02:00 
						 
				 
			
				
					
						
							
							
								Ilia 
							
						 
					 
					
						
						
						
						
							
						
						
							b933a34a59 
							
						 
					 
					
						
						
							
							Updated to 0.6.1  
						
						... 
						
						
						
						1. Different bug fixed.
2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages. 
						
					 
					
						2014-08-26 17:26:03 +04:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							902f6c57b1 
							
						 
					 
					
						
						
							
							removed deprecated strings from translations  
						
						
						
					 
					
						2014-08-26 11:20:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3ed29e5a8b 
							
						 
					 
					
						
						
							
							Merge pull request  #376  from wapolinar/development  
						
						... 
						
						
						
						Update strings.xml 
						
					 
					
						2014-08-25 20:25:29 +02:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							5e7450adfa 
							
						 
					 
					
						
						
							
							Update Spanish Translations  
						
						
						
					 
					
						2014-08-25 19:49:35 +02:00 
						 
				 
			
				
					
						
							
							
								wapolinar 
							
						 
					 
					
						
						
						
						
							
						
						
							03a387242c 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						... 
						
						
						
						Typo in a key for the German translation. 
						
					 
					
						2014-08-25 16:51:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dce001369d 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						
						
					 
					
						2014-08-24 17:18:10 +02:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							eae0a0aa2c 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						
						
					 
					
						2014-08-24 17:14:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0b759340d 
							
						 
					 
					
						
						
							
							jump right into edit account if now accounts are configured  
						
						
						
					 
					
						2014-08-23 21:31:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d504daec16 
							
						 
					 
					
						
						
							
							changed workflow on inital avatar publication  
						
						
						
					 
					
						2014-08-23 20:00:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ee9872277d 
							
						 
					 
					
						
						
							
							removed server compat value in favor of a (small xep list)  
						
						
						
					 
					
						2014-08-23 15:56:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26d6835927 
							
						 
					 
					
						
						
							
							Merge pull request  #373  from kruks23/translation1  
						
						... 
						
						
						
						Update Spanish Translations 
						
					 
					
						2014-08-23 09:52:04 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c40c8ee910 
							
						 
					 
					
						
						
							
							tiny redesign for private muc messages  
						
						
						
					 
					
						2014-08-22 13:22:07 +02:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							9776618164 
							
						 
					 
					
						
						
							
							Update Spanish Translations  
						
						
						
					 
					
						2014-08-21 17:50:07 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a269164458 
							
						 
					 
					
						
						
							
							added missing string resource again  
						
						
						
					 
					
						2014-08-20 11:40:01 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							06da080371 
							
						 
					 
					
						
						
							
							revised manage account activity. removed contexual action mode  
						
						
						
					 
					
						2014-08-20 11:32:49 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3b79cc2f23 
							
						 
					 
					
						
						
							
							better error display and additional infos (stats) for the edit account activity  
						
						
						
					 
					
						2014-08-19 15:06:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d74692e0a5 
							
						 
					 
					
						
						
							
							Merge pull request  #365  from beriain/development  
						
						... 
						
						
						
						Update strings.xml 
						
					 
					
						2014-08-19 15:06:52 +02:00 
						 
				 
			
				
					
						
							
							
								Aitor Beriain 
							
						 
					 
					
						
						
						
						
							
						
						
							9963dc63af 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						
						
					 
					
						2014-08-18 15:00:43 +02:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							8c04649d6d 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						
						
					 
					
						2014-08-17 15:00:47 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							32c3dd4f4a 
							
						 
					 
					
						
						
							
							moved add/edit account from dialog into seperate activity  
						
						
						
					 
					
						2014-08-15 17:31:24 +02:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							4f29869607 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						... 
						
						
						
						corrected missspelling 
						
					 
					
						2014-08-15 09:14:40 +02:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							caaea6e830 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						... 
						
						
						
						Added German Translations and corrected misspellings. 
						
					 
					
						2014-08-15 09:05:30 +02:00 
						 
				 
			
				
					
						
							
							
								GreenLunar 
							
						 
					 
					
						
						
						
						
							
						
						
							7eabefe48b 
							
						 
					 
					
						
						
							
							Add Hebrew translation.  
						
						
						
					 
					
						2014-08-14 21:04:20 +03:00 
						 
				 
			
				
					
						
							
							
								GreenLunar 
							
						 
					 
					
						
						
						
						
							
						
						
							e2a17b4380 
							
						 
					 
					
						
						
							
							Add Hebrew translation.  
						
						
						
					 
					
						2014-08-14 21:00:49 +03:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							5e8b05c31b 
							
						 
					 
					
						
						
							
							Update Spanish Translations + publish_avatar button and menu conflict  
						
						
						
					 
					
						2014-08-12 18:31:14 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b35aa3ed07 
							
						 
					 
					
						
						
							
							added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages.  fixed   #259  
						
						
						
					 
					
						2014-08-10 15:27:44 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9dec8e761e 
							
						 
					 
					
						
						
							
							changed all displays of avatars to be center crop instead of fitXY  
						
						
						
					 
					
						2014-08-09 14:25:55 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							937fc51b50 
							
						 
					 
					
						
						
							
							added warning lable if server doesn't support pubsub. refactored feature identification into seperate class  
						
						
						
					 
					
						2014-08-09 10:20:16 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							96a41b5b51 
							
						 
					 
					
						
						
							
							ability to bring default picture back with long press in publish avatar  
						
						
						
					 
					
						2014-08-09 09:38:52 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							313f9db1ec 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						
						
					 
					
						2014-08-06 18:36:55 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b4d9e8b60 
							
						 
					 
					
						
						
							
							fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum  
						
						
						
					 
					
						2014-08-06 18:36:33 +02:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							e8600483b2 
							
						 
					 
					
						
						
							
							Update Spanish Translations + gallery  
						
						
						
					 
					
						2014-08-05 22:39:52 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9aba9a4059 
							
						 
					 
					
						
						
							
							error messages for publish avatar  
						
						
						
					 
					
						2014-08-05 12:21:08 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b4d5f338 
							
						 
					 
					
						
						
							
							publish avatars  
						
						
						
					 
					
						2014-08-05 01:36:17 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							daab16bdef 
							
						 
					 
					
						
						
							
							activity for future avatar publications. not working yet  
						
						
						
					 
					
						2014-08-03 20:28:13 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88d1bd356c 
							
						 
					 
					
						
						
							
							get rid of 'use phones self contact picture option'  
						
						
						
					 
					
						2014-07-31 15:18:55 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							990f0f6d73 
							
						 
					 
					
						
						
							
							refactored account array adapter into seperate class. added account image  
						
						
						
					 
					
						2014-07-31 15:09:34 +02:00