Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d3323e384 
							
						 
					 
					
						
						
							
							context menu for files and offered files.  fixed   #848   fixed   #849  
						
						 
						
						
						
					 
					
						2015-01-12 16:42:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							061de5205e 
							
						 
					 
					
						
						
							
							some clean ups for affiliation change context menu  
						
						 
						
						
						
					 
					
						2015-01-08 00:23:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef525fb10e 
							
						 
					 
					
						
						
							
							basic affiliation changes in muc  
						
						 
						
						
						
					 
					
						2015-01-07 15:03:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb335e6b0 
							
						 
					 
					
						
						
							
							Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role  
						
						 
						
						
						
					 
					
						2015-01-05 15:06:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be7de054be 
							
						 
					 
					
						
						
							
							record voice and attachment refactor  
						
						 
						
						
						
					 
					
						2015-01-03 16:06:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							960b7343d3 
							
						 
					 
					
						
						
							
							disable / enable all accounts  
						
						 
						
						
						
					 
					
						2015-01-03 13:36:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							969044b113 
							
						 
					 
					
						
						
							
							migrated change password into separate activity  
						
						 
						
						
						
					 
					
						2015-01-03 00:11:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1988e244ef 
							
						 
					 
					
						
						
							
							some further otr improvements  
						
						 
						
						
						
					 
					
						2015-01-02 15:14:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							01107e31ae 
							
						 
					 
					
						
						
							
							Add more server compatibility info.  
						
						 
						
						... 
						
						
						
						Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
						
					 
					
						2014-12-23 12:44:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af7a64491f 
							
						 
					 
					
						
						
							
							Add support for XEP-0191 (Blocking command)  
						
						 
						
						... 
						
						
						
						Fixes  #791 
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 
						
					 
					
						2014-12-22 08:19:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							31b539daf7 
							
						 
					 
					
						
						
							
							MUC: option to set/delete bookmark in conference details.  
						
						 
						
						
						
					 
					
						2014-11-23 21:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab832bcff7 
							
						 
					 
					
						
						
							
							properly remove conversations context menu  
						
						 
						
						
						
					 
					
						2014-11-18 13:51:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							240d2d68c8 
							
						 
					 
					
						
						
							
							context menu for conversations.  fixed   #630  
						
						 
						
						
						
					 
					
						2014-11-18 00:07:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f41c3eee04 
							
						 
					 
					
						
						
							
							context menu for muc participants + refactor trueCounterpart to use Jid class  
						
						 
						
						
						
					 
					
						2014-11-17 20:02:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							283d5058e5 
							
						 
					 
					
						
						
							
							synchronized around cache clear in avatar service  
						
						 
						
						
						
					 
					
						2014-11-17 20:01:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2067b9bd8d 
							
						 
					 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity  
						
						 
						
						
						
					 
					
						2014-11-16 02:10:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4f3702a8 
							
						 
					 
					
						
						
							
							made file transfers cancelable  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a90ca429b 
							
						 
					 
					
						
						
							
							basic arbitrary file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b3582c970e 
							
						 
					 
					
						
						
							
							made qr code available from muc and contact details as well  
						
						 
						
						
						
					 
					
						2014-11-04 12:15:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d458919c8f 
							
						 
					 
					
						
						
							
							unfinishd qr code implemenation. thanks to @emdete  
						
						 
						
						
						
					 
					
						2014-11-03 22:47:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							46f147a82c 
							
						 
					 
					
						
						
							
							Merge branch 'gradle' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 
					
						2014-10-30 15:33:13 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							281ce3105f 
							
						 
					 
					
						
						
							
							Make conversations the root project  
						
						 
						
						
						
					 
					
						2014-10-22 15:47:11 -04:00