Harshit Bansal 
							
						 
					 
					
						
						
						
						
							
						
						
							f2885575ba 
							
						 
					 
					
						
						
							
							replace deprecated action bar with toolbar ( #2872 )  
						
						... 
						
						
						
						* replace deprecated action bar with toolbar
* add toolbar support in each activity
* remove redundant themes made earlier
* add configure action bar method in xmpp activity
* remove android namespace from actionmodeoverlay
* solve bug of scrolling toolbar 
						
					 
					
						2018-03-18 09:30:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83a4cb8a11 
							
						 
					 
					
						
						
							
							setReplaceAll=false on emojiCompat for android o  
						
						
						
					 
					
						2018-03-17 21:43:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							11dfd87672 
							
						 
					 
					
						
						
							
							show message draft in conversation overview  
						
						
						
					 
					
						2018-03-17 19:18:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9765f26de0 
							
						 
					 
					
						
						
							
							fixed device rotation in settings activity  
						
						
						
					 
					
						2018-03-16 12:58:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							182b4c08b5 
							
						 
					 
					
						
						
							
							fixed crash in MessageAdapter caused by empty xmpp: uri  
						
						
						
					 
					
						2018-03-16 12:29:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d17a8cdcb9 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-16 09:46:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							854a31b27b 
							
						 
					 
					
						
						
							
							bump version code to beta.3  
						
						
						
					 
					
						2018-03-15 15:24:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbdbe1b312 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-15 13:44:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64f040b631 
							
						 
					 
					
						
						
							
							offer a more convienient way to disable omemo from trust keys dialog  
						
						
						
					 
					
						2018-03-15 13:37:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1bfc0b8da6 
							
						 
					 
					
						
						
							
							trim to original resource if server added something  
						
						
						
					 
					
						2018-03-15 08:53:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe90e70bb1 
							
						 
					 
					
						
						
							
							remove trailing ) in urls  
						
						
						
					 
					
						2018-03-14 21:59:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c932e9fa6 
							
						 
					 
					
						
						
							
							fixed pm to vistors  
						
						
						
					 
					
						2018-03-14 17:31:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2db940594 
							
						 
					 
					
						
						
							
							do not show snackbar for archived conversations. fixes glitch when leaving muc  
						
						
						
					 
					
						2018-03-14 13:05:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03e88500b9 
							
						 
					 
					
						
						
							
							fixed rotation in choose contact activity  
						
						
						
					 
					
						2018-03-14 11:03:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acf0b995ab 
							
						 
					 
					
						
						
							
							dynamically get known hosts in dialog  
						
						
						
					 
					
						2018-03-14 10:07:52 +01:00 
						 
				 
			
				
					
						
							
							
								iamharsshit 
							
						 
					 
					
						
						
						
						
							
						
						
							2af12afb64 
							
						 
					 
					
						
						
							
							add data binding and check in back stack for dialogs  
						
						
						
					 
					
						2018-03-14 13:07:04 +05:30 
						 
				 
			
				
					
						
							
							
								iamharsshit 
							
						 
					 
					
						
						
						
						
							
						
						
							b33725b435 
							
						 
					 
					
						
						
							
							place enter jid dialog in dialog fragment  
						
						
						
					 
					
						2018-03-14 13:07:04 +05:30 
						 
				 
			
				
					
						
							
							
								iamharsshit 
							
						 
					 
					
						
						
						
						
							
						
						
							b48e37f72f 
							
						 
					 
					
						
						
							
							replace group dialogs by dialog fragment  
						
						
						
					 
					
						2018-03-14 13:07:04 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							45701448b8 
							
						 
					 
					
						
						
							
							made typing notifications default on new installs  
						
						
						
					 
					
						2018-03-14 08:23:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4a05b8ef3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2018-03-14 08:22:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d1bd65a3b 
							
						 
					 
					
						
						
							
							make camera feature optional  
						
						
						
					 
					
						2018-03-14 08:21:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f371da7d85 
							
						 
					 
					
						
						
							
							raise min sdk to kitkat because of missing Objects.notNull()  
						
						
						
					 
					
						2018-03-14 08:05:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c790a972ba 
							
						 
					 
					
						
						
							
							Merge pull request  #2874  from SamWhited/app_category  
						
						... 
						
						
						
						Classify in the "social" app category 
						
					 
					
						2018-03-14 07:51:18 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4232e5b35d 
							
						 
					 
					
						
						
							
							Classify in the "social" app category  
						
						
						
					 
					
						2018-03-13 22:05:11 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a7f3ec742 
							
						 
					 
					
						
						
							
							create interface for onBackendConnected  
						
						
						
					 
					
						2018-03-13 22:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f21fda1421 
							
						 
					 
					
						
						
							
							scanned results are always a trusted source  
						
						
						
					 
					
						2018-03-13 16:55:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c58e7cc30 
							
						 
					 
					
						
						
							
							migrated conference details to binding  
						
						
						
					 
					
						2018-03-13 12:26:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25a49a28ce 
							
						 
					 
					
						
						
							
							disable caches in HttpUrlConnections  
						
						
						
					 
					
						2018-03-13 11:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ca625f1e8e 
							
						 
					 
					
						
						
							
							fix register account checkbox glitch  
						
						
						
					 
					
						2018-03-13 11:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							10240ab2f9 
							
						 
					 
					
						
						
							
							removed reference to OTR from FAQ  
						
						
						
					 
					
						2018-03-12 16:37:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22d98bd162 
							
						 
					 
					
						
						
							
							do not highlight users when not participating.  fixes   #2865  
						
						
						
					 
					
						2018-03-12 16:00:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8dc17a96ba 
							
						 
					 
					
						
						
							
							fixed rare crash on jolla devices  
						
						
						
					 
					
						2018-03-12 15:59:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dac8ed6058 
							
						 
					 
					
						
						
							
							fixed travis build status icon  
						
						
						
					 
					
						2018-03-12 11:04:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdac851d46 
							
						 
					 
					
						
						
							
							increment version code  
						
						
						
					 
					
						2018-03-12 09:29:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f5e368899 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-11 18:42:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72388e37f5 
							
						 
					 
					
						
						
							
							fixed some issues with jid escaping  
						
						
						
					 
					
						2018-03-11 18:32:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a9c63568 
							
						 
					 
					
						
						
							
							hide keyboard when stopping ConversationFragment  
						
						
						
					 
					
						2018-03-11 18:14:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c1135ad592 
							
						 
					 
					
						
						
							
							use escaped form of jid where approriate  
						
						
						
					 
					
						2018-03-11 14:14:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bb45996c5 
							
						 
					 
					
						
						
							
							return contact and account.getServer() as String  
						
						
						
					 
					
						2018-03-11 12:13:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbcc54799d 
							
						 
					 
					
						
						
							
							cache bookmark jid in bookmark  
						
						
						
					 
					
						2018-03-11 12:06:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e767c5e75b 
							
						 
					 
					
						
						
							
							use xmpp-addr 0.8 to fix unicode issue  
						
						
						
					 
					
						2018-03-09 21:39:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe338a540a 
							
						 
					 
					
						
						
							
							make unicode detector work on labels  
						
						
						
					 
					
						2018-03-09 21:39:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2e5c04ef7 
							
						 
					 
					
						
						
							
							detect irregular unicode in domain part  
						
						
						
					 
					
						2018-03-08 22:02:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae3bdd3c6 
							
						 
					 
					
						
						
							
							use scripts instead of blocks on Android >= N  
						
						
						
					 
					
						2018-03-08 20:45:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							216cf1805f 
							
						 
					 
					
						
						
							
							stop scrolling in tablet view after switching conversations  
						
						
						
					 
					
						2018-03-08 17:01:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a883faf05e 
							
						 
					 
					
						
						
							
							change log for conversations 2.0 beta  
						
						
						
					 
					
						2018-03-08 16:55:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4227c63e5d 
							
						 
					 
					
						
						
							
							decrease delay when scrolling to position  
						
						
						
					 
					
						2018-03-08 16:37:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e32b4ab17 
							
						 
					 
					
						
						
							
							fix playstore flavor  
						
						
						
					 
					
						2018-03-08 16:27:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e89378ceae 
							
						 
					 
					
						
						
							
							hide register account checkbox in magic mode  
						
						
						
					 
					
						2018-03-08 15:18:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a2028b203f 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-08 14:08:37 +01:00