Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a88824bb1d 
							
						 
					 
					
						
						
							
							Merge pull request  #882  from SamWhited/apiandjavafixes  
						
						... 
						
						
						
						Type safety and deprecated API forward-compatibility fixes for Notifications 
						
					 
					
						2015-01-14 10:47:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e67a570b6 
							
						 
					 
					
						
						
							
							Merge pull request  #881  from SamWhited/about-padding-fix  
						
						... 
						
						
						
						Fix bottom padding on about page 
						
					 
					
						2015-01-14 10:47:32 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							caf861d96f 
							
						 
					 
					
						
						
							
							Ensure type safety in Pebble notifications  
						
						... 
						
						
						
						Also use forward-compatible screen-on detection 
						
					 
					
						2015-01-13 23:18:35 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							acb3aed99c 
							
						 
					 
					
						
						
							
							Fix bottom padding on about page  
						
						
						
					 
					
						2015-01-13 21:29:47 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6976c4ffe1 
							
						 
					 
					
						
						
							
							added faq about beta testing  
						
						
						
					 
					
						2015-01-13 12:16:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d2a9624b5 
							
						 
					 
					
						
						
							
							make use of different dimensions for different screen sizes  
						
						
						
					 
					
						2015-01-13 11:52:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1262a7cba7 
							
						 
					 
					
						
						
							
							Merge pull request  #872  from Elinvention/development  
						
						... 
						
						
						
						Updated Italian translations 
						
					 
					
						2015-01-13 10:48:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fac4754d8 
							
						 
					 
					
						
						
							
							Merge pull request  #873  from SamWhited/about-margin-fix  
						
						... 
						
						
						
						Use margin instead of padding on about screen 
						
					 
					
						2015-01-13 10:12:33 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c2fa39cd 
							
						 
					 
					
						
						
							
							Use margin instead of padding in about screen  
						
						
						
					 
					
						2015-01-12 23:08:26 -05:00 
						 
				 
			
				
					
						
							
							
								Elia 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6ee1fe22 
							
						 
					 
					
						
						
							
							Updated Italian translations  
						
						
						
					 
					
						2015-01-13 01:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0596e5537c 
							
						 
					 
					
						
						
							
							Merge pull request  #870  from svetlemodry/development  
						
						... 
						
						
						
						Czech translation 
						
					 
					
						2015-01-12 21:20:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							c920a09a0c 
							
						 
					 
					
						
						
							
							Czech translation  
						
						... 
						
						
						
						updated 
						
					 
					
						2015-01-12 20:07:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22119bd904 
							
						 
					 
					
						
						
							
							Merge pull request  #868  from SamWhited/ignore-extra-translations  
						
						... 
						
						
						
						Don't fail on extra translations 
						
					 
					
						2015-01-12 19:08:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5101ff5c 
							
						 
					 
					
						
						
							
							catch bug in guessContentType  
						
						
						
					 
					
						2015-01-12 18:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e95d562ac7 
							
						 
					 
					
						
						
							
							Don't fail on extra translations  
						
						
						
					 
					
						2015-01-12 11:57:40 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d3323e384 
							
						 
					 
					
						
						
							
							context menu for files and offered files.  fixed   #848   fixed   #849  
						
						
						
					 
					
						2015-01-12 16:42:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77e4e1c2ac 
							
						 
					 
					
						
						
							
							reworked message preview / message meta information (ie file offered, received * file)  
						
						... 
						
						
						
						fixed  #837  
					
						2015-01-12 16:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50c8065015 
							
						 
					 
					
						
						
							
							Merge pull request  #866  from SamWhited/xep0245  
						
						... 
						
						
						
						Add XEP-0245 (/me command) support 
						
					 
					
						2015-01-12 01:22:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5224251c 
							
						 
					 
					
						
						
							
							Add XEP-0245 (/me command) support  
						
						
						
					 
					
						2015-01-11 18:32:00 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef6e4c5dd5 
							
						 
					 
					
						
						
							
							do not check image file size over http if accepted file size is 0  
						
						
						
					 
					
						2015-01-11 22:18:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b07b7519a6 
							
						 
					 
					
						
						
							
							keep proper image file extension  
						
						
						
					 
					
						2015-01-11 15:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12d63f2612 
							
						 
					 
					
						
						
							
							updated travis file to build with android-m2repository  
						
						
						
					 
					
						2015-01-11 01:49:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa50cb5a1 
							
						 
					 
					
						
						
							
							shortened some string  
						
						
						
					 
					
						2015-01-11 01:01:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e34bc920e4 
							
						 
					 
					
						
						
							
							fixed   #860  
						
						
						
					 
					
						2015-01-10 23:56:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7fc5b6978 
							
						 
					 
					
						
						
							
							use latest support library  
						
						
						
					 
					
						2015-01-10 23:43:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18eb187949 
							
						 
					 
					
						
						
							
							make room persistant when changing subject or other muc options  
						
						
						
					 
					
						2015-01-10 23:10:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							158f5dd17c 
							
						 
					 
					
						
						
							
							don't crash when selecting a conversation by uuid did not work  
						
						
						
					 
					
						2015-01-10 19:43:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c89fdec0b1 
							
						 
					 
					
						
						
							
							fixed regression in tablet ui  
						
						
						
					 
					
						2015-01-09 22:24:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06eae476ee 
							
						 
					 
					
						
						
							
							Introduced expert options to control enter-is-send  
						
						... 
						
						
						
						(default == off) 
						
					 
					
						2015-01-09 19:23:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0a48f777ac 
							
						 
					 
					
						
						
							
							code cleanup for jingle proxy discovery  
						
						
						
					 
					
						2015-01-09 14:42:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9f88c4669 
							
						 
					 
					
						
						
							
							ensure that everyone is member before making a room private  
						
						
						
					 
					
						2015-01-09 13:28:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fa9cba930f 
							
						 
					 
					
						
						
							
							modified readme to link to transifex  
						
						
						
					 
					
						2015-01-09 13:27:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							734a9934a3 
							
						 
					 
					
						
						
							
							make project translatable via transifex  
						
						
						
					 
					
						2015-01-09 02:06:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa97c48f5 
							
						 
					 
					
						
						
							
							added missing drawables  
						
						
						
					 
					
						2015-01-08 23:02:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9159568b9 
							
						 
					 
					
						
						
							
							allow for very basic muc configuration  
						
						
						
					 
					
						2015-01-08 21:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fe193b027 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-01-08 14:45:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aa1bfec4 
							
						 
					 
					
						
						
							
							kick after ban  
						
						
						
					 
					
						2015-01-08 01:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8dc59be81 
							
						 
					 
					
						
						
							
							fixed german translation  
						
						
						
					 
					
						2015-01-08 00:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							061de5205e 
							
						 
					 
					
						
						
							
							some clean ups for affiliation change context menu  
						
						
						
					 
					
						2015-01-08 00:23:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cff9a937f2 
							
						 
					 
					
						
						
							
							Merge pull request  #851  from kriztan/patch-2  
						
						... 
						
						
						
						Updated German translations for more muc options 
						
					 
					
						2015-01-07 23:53:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20aa7bea47 
							
						 
					 
					
						
						
							
							Merge pull request  #852  from SamWhited/ellipsis  
						
						... 
						
						
						
						s/.../…/ in CS strings 
						
					 
					
						2015-01-07 23:53:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8505102cee 
							
						 
					 
					
						
						
							
							Merge pull request  #850  from plsng/dutch  
						
						... 
						
						
						
						Update Dutch translations 
						
					 
					
						2015-01-07 23:53:08 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1ea20b392 
							
						 
					 
					
						
						
							
							s/.../…/ in CS strings  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2015-01-07 13:42:49 -05:00 
						 
				 
			
				
					
						
							
							
								Christian S. 
							
						 
					 
					
						
						
						
						
							
						
						
							45c1e88a08 
							
						 
					 
					
						
						
							
							Updated German translations for more muc options  
						
						
						
					 
					
						2015-01-07 19:06:18 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							c9dc82d134 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						
						
					 
					
						2015-01-07 18:49:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d655f445a 
							
						 
					 
					
						
						
							
							more muc options  
						
						... 
						
						
						
						* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this 
						
					 
					
						2015-01-07 18:34:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d70b5f93f3 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-07 18:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab19faddd 
							
						 
					 
					
						
						
							
							Merge pull request  #847  from kriztan/patch-1  
						
						... 
						
						
						
						Updated German translations... 
						
					 
					
						2015-01-07 18:30:16 +01:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							9d43ddbf59 
							
						 
					 
					
						
						
							
							Updated German translations...  
						
						... 
						
						
						
						...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation?
I've changed the translations.
Updated German translations...
Updated German translations... 
						
					 
					
						2015-01-07 18:08:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad8796b44 
							
						 
					 
					
						
						
							
							fixed invites  
						
						
						
					 
					
						2015-01-07 16:45:44 +01:00