77e4e1c2ac 
								
							 
						 
						
							
							
								
								reworked message preview / message meta information (ie file offered, received * file)  
							
							... 
							
							
							
							fixed  #837  
						
							2015-01-12 16:09:39 +01:00  
				
					
						
							
							
								 
						
							
								50c8065015 
								
							 
						 
						
							
							
								
								Merge pull request  #866  from SamWhited/xep0245  
							
							... 
							
							
							
							Add XEP-0245 (/me command) support 
							
						 
						
							2015-01-12 01:22:40 +01:00  
				
					
						
							
							
								 
						
							
								3c5224251c 
								
							 
						 
						
							
							
								
								Add XEP-0245 (/me command) support  
							
							
							
						 
						
							2015-01-11 18:32:00 -05:00  
				
					
						
							
							
								 
						
							
								ef6e4c5dd5 
								
							 
						 
						
							
							
								
								do not check image file size over http if accepted file size is 0  
							
							
							
						 
						
							2015-01-11 22:18:18 +01:00  
				
					
						
							
							
								 
						
							
								b07b7519a6 
								
							 
						 
						
							
							
								
								keep proper image file extension  
							
							
							
						 
						
							2015-01-11 15:19:36 +01:00  
				
					
						
							
							
								 
						
							
								12d63f2612 
								
							 
						 
						
							
							
								
								updated travis file to build with android-m2repository  
							
							
							
						 
						
							2015-01-11 01:49:54 +01:00  
				
					
						
							
							
								 
						
							
								0aa50cb5a1 
								
							 
						 
						
							
							
								
								shortened some string  
							
							
							
						 
						
							2015-01-11 01:01:33 +01:00  
				
					
						
							
							
								 
						
							
								e34bc920e4 
								
							 
						 
						
							
							
								
								fixed   #860  
							
							
							
						 
						
							2015-01-10 23:56:56 +01:00  
				
					
						
							
							
								 
						
							
								d7fc5b6978 
								
							 
						 
						
							
							
								
								use latest support library  
							
							
							
						 
						
							2015-01-10 23:43:18 +01:00  
				
					
						
							
							
								 
						
							
								18eb187949 
								
							 
						 
						
							
							
								
								make room persistant when changing subject or other muc options  
							
							
							
						 
						
							2015-01-10 23:10:32 +01:00  
				
					
						
							
							
								 
						
							
								158f5dd17c 
								
							 
						 
						
							
							
								
								don't crash when selecting a conversation by uuid did not work  
							
							
							
						 
						
							2015-01-10 19:43:23 +01:00  
				
					
						
							
							
								 
						
							
								c89fdec0b1 
								
							 
						 
						
							
							
								
								fixed regression in tablet ui  
							
							
							
						 
						
							2015-01-09 22:24:50 +01:00  
				
					
						
							
							
								 
						
							
								06eae476ee 
								
							 
						 
						
							
							
								
								Introduced expert options to control enter-is-send  
							
							... 
							
							
							
							(default == off) 
							
						 
						
							2015-01-09 19:23:26 +01:00  
				
					
						
							
							
								 
						
							
								0a48f777ac 
								
							 
						 
						
							
							
								
								code cleanup for jingle proxy discovery  
							
							
							
						 
						
							2015-01-09 14:42:58 +01:00  
				
					
						
							
							
								 
						
							
								d9f88c4669 
								
							 
						 
						
							
							
								
								ensure that everyone is member before making a room private  
							
							
							
						 
						
							2015-01-09 13:28:01 +01:00  
				
					
						
							
							
								 
						
							
								fa9cba930f 
								
							 
						 
						
							
							
								
								modified readme to link to transifex  
							
							
							
						 
						
							2015-01-09 13:27:21 +01:00  
				
					
						
							
							
								 
						
							
								734a9934a3 
								
							 
						 
						
							
							
								
								make project translatable via transifex  
							
							
							
						 
						
							2015-01-09 02:06:03 +01:00  
				
					
						
							
							
								 
						
							
								ffa97c48f5 
								
							 
						 
						
							
							
								
								added missing drawables  
							
							
							
						 
						
							2015-01-08 23:02:31 +01:00  
				
					
						
							
							
								 
						
							
								a9159568b9 
								
							 
						 
						
							
							
								
								allow for very basic muc configuration  
							
							
							
						 
						
							2015-01-08 21:29:26 +01:00  
				
					
						
							
							
								 
						
							
								0fe193b027 
								
							 
						 
						
							
							
								
								code cleanup  
							
							
							
						 
						
							2015-01-08 14:45:44 +01:00  
				
					
						
							
							
								 
						
							
								f8aa1bfec4 
								
							 
						 
						
							
							
								
								kick after ban  
							
							
							
						 
						
							2015-01-08 01:23:53 +01:00  
				
					
						
							
							
								 
						
							
								f8dc59be81 
								
							 
						 
						
							
							
								
								fixed german translation  
							
							
							
						 
						
							2015-01-08 00:41:37 +01:00  
				
					
						
							
							
								 
						
							
								061de5205e 
								
							 
						 
						
							
							
								
								some clean ups for affiliation change context menu  
							
							
							
						 
						
							2015-01-08 00:23:26 +01:00  
				
					
						
							
							
								 
						
							
								cff9a937f2 
								
							 
						 
						
							
							
								
								Merge pull request  #851  from kriztan/patch-2  
							
							... 
							
							
							
							Updated German translations for more muc options 
							
						 
						
							2015-01-07 23:53:36 +01:00  
				
					
						
							
							
								 
						
							
								20aa7bea47 
								
							 
						 
						
							
							
								
								Merge pull request  #852  from SamWhited/ellipsis  
							
							... 
							
							
							
							s/.../…/ in CS strings 
							
						 
						
							2015-01-07 23:53:26 +01:00  
				
					
						
							
							
								 
						
							
								8505102cee 
								
							 
						 
						
							
							
								
								Merge pull request  #850  from plsng/dutch  
							
							... 
							
							
							
							Update Dutch translations 
							
						 
						
							2015-01-07 23:53:08 +01:00  
				
					
						
							
							
								 
						
							
								e1ea20b392 
								
							 
						 
						
							
							
								
								s/.../…/ in CS strings  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2015-01-07 13:42:49 -05:00  
				
					
						
							
							
								 
						
							
								45c1e88a08 
								
							 
						 
						
							
							
								
								Updated German translations for more muc options  
							
							
							
						 
						
							2015-01-07 19:06:18 +01:00  
				
					
						
							
							
								 
						
							
								c9dc82d134 
								
							 
						 
						
							
							
								
								Update Dutch translations  
							
							
							
						 
						
							2015-01-07 18:49:13 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d70b5f93f3 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2015-01-07 18:32:51 +01:00  
				
					
						
							
							
								 
						
							
								8ab19faddd 
								
							 
						 
						
							
							
								
								Merge pull request  #847  from kriztan/patch-1  
							
							... 
							
							
							
							Updated German translations... 
							
						 
						
							2015-01-07 18:30:16 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0ad8796b44 
								
							 
						 
						
							
							
								
								fixed invites  
							
							
							
						 
						
							2015-01-07 16:45:44 +01:00  
				
					
						
							
							
								 
						
							
								af1410b02a 
								
							 
						 
						
							
							
								
								Merge pull request  #845  from SamWhited/material  
							
							... 
							
							
							
							Add materials theme for v21 devices 
							
						 
						
							2015-01-07 15:57:27 +01:00  
				
					
						
							
							
								 
						
							
								ef525fb10e 
								
							 
						 
						
							
							
								
								basic affiliation changes in muc  
							
							
							
						 
						
							2015-01-07 15:03:29 +01:00  
				
					
						
							
							
								 
						
							
								81e9afdf19 
								
							 
						 
						
							
							
								
								reset next encryption when archiving conversations  
							
							
							
						 
						
							2015-01-07 12:20:39 +01:00  
				
					
						
							
							
								 
						
							
								943a01b9bf 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2015-01-07 10:49:40 +01:00  
				
					
						
							
							
								 
						
							
								a7ee9cc41b 
								
							 
						 
						
							
							
								
								Merge pull request  #846  from kruks23/translation4  
							
							... 
							
							
							
							Update spanish translation 
							
						 
						
							2015-01-07 10:28:37 +01:00  
				
					
						
							
							
								 
						
							
								a1a2a39108 
								
							 
						 
						
							
							
								
								Update affiliation in MUC details and advance mode  
							
							
							
						 
						
							2015-01-07 08:50:19 +01:00  
				
					
						
							
							
								 
						
							
								312f95b73d 
								
							 
						 
						
							
							
								
								Update travis config to use current build tools  
							
							
							
						 
						
							2015-01-06 21:57:28 -05:00  
				
					
						
							
							
								 
						
							
								45bb59dba8 
								
							 
						 
						
							
							
								
								Add materials theme  
							
							
							
						 
						
							2015-01-06 21:37:49 -05:00  
				
					
						
							
							
								 
						
							
								a22c8c04d8 
								
							 
						 
						
							
							
								
								use copyonwritearraylist in for phone helper  
							
							
							
						 
						
							2015-01-07 01:01:15 +01:00  
				
					
						
							
							
								 
						
							
								d502e57661 
								
							 
						 
						
							
							
								
								refactored UiHelper  
							
							
							
						 
						
							2015-01-07 00:59:42 +01:00  
				
					
						
							
							
								 
						
							
								c01e866965 
								
							 
						 
						
							
							
								
								Merge pull request  #843  from svetlemodry/development  
							
							... 
							
							
							
							Czech translation for - show affiliation instead of role in MucDetails 
							
						 
						
							2015-01-06 21:34:48 +01:00  
				
					
						
							
							
								 
						
							
								066f60a23c 
								
							 
						 
						
							
							
								
								Czech translation for - show affiliation instead of role in MucDetails  
							
							
							
						 
						
							2015-01-06 21:15:32 +01:00  
				
					
						
							
							
								 
						
							
								f02f510c18 
								
							 
						 
						
							
							
								
								fixed bug in new ping strategy  
							
							
							
						 
						
							2015-01-06 19:46:52 +01:00  
				
					
						
							
							
								 
						
							
								353f4e38bb 
								
							 
						 
						
							
							
								
								mark sent images as sent_received instead of sent  
							
							... 
							
							
							
							fixed  #842  
						
							2015-01-06 18:44:34 +01:00  
				
					
						
							
							
								 
						
							
								8a3ccfd456 
								
							 
						 
						
							
							
								
								Merge pull request  #841  from BenoitBouvarel/patch-2  
							
							... 
							
							
							
							Update strings.xml 
							
						 
						
							2015-01-06 18:33:56 +01:00  
				
					
						
							
							
								 
						
							
								562699c745 
								
							 
						 
						
							
							
								
								run invalidateOptionsMenu on uiThread  
							
							
							
						 
						
							2015-01-06 18:26:14 +01:00