Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							41ae4af1b8 
							
						 
					 
					
						
						
							
							made constructor private in Account entity  
						
						
						
					 
					
						2016-01-16 18:57:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad5bcb7d43 
							
						 
					 
					
						
						
							
							removed some unused methods from db backend  
						
						
						
					 
					
						2016-01-16 18:57:19 +01:00 
						 
				 
			
				
					
						
							
							
								Adithya Abraham Philip 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a3ef0f67 
							
						 
					 
					
						
						
							
							fixed PGP having to be selected twice  
						
						
						
					 
					
						2016-01-16 04:26:01 +05:30 
						 
				 
			
				
					
						
							
							
								Adithya Abraham Philip 
							
						 
					 
					
						
						
						
						
							
						
						
							f64018d0a2 
							
						 
					 
					
						
						
							
							upgraded to OpenKeychain api v10  
						
						
						
					 
					
						2016-01-16 04:26:01 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7b397828 
							
						 
					 
					
						
						
							
							version bump to 1.9.1  
						
						
						
					 
					
						2016-01-15 23:48:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							494a04ffb1 
							
						 
					 
					
						
						
							
							hide prepare image toasts when attaching multiple images  
						
						
						
					 
					
						2016-01-15 23:47:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d85854b686 
							
						 
					 
					
						
						
							
							show toast when image cropper get oom  
						
						
						
					 
					
						2016-01-15 23:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							943d0391d4 
							
						 
					 
					
						
						
							
							catch exception when reading message id from database  
						
						
						
					 
					
						2016-01-15 23:46:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5743067ad 
							
						 
					 
					
						
						
							
							nimbuzz.com: don't wait for disco replies to set account to online  
						
						
						
					 
					
						2016-01-15 14:26:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							635210d278 
							
						 
					 
					
						
						
							
							pulled translations for 1.9.0 release from transifex  
						
						
						
					 
					
						2016-01-14 21:52:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0dede0e1de 
							
						 
					 
					
						
						
							
							version bump to 1.9.0  
						
						
						
					 
					
						2016-01-14 20:51:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6955a0d6 
							
						 
					 
					
						
						
							
							fixed typo when reading battery_op setting  
						
						
						
					 
					
						2016-01-14 20:38:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12fd5c46ef 
							
						 
					 
					
						
						
							
							show /me messages in conference notifications without the name of the sender  
						
						
						
					 
					
						2016-01-13 17:36:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3b3aa5b584 
							
						 
					 
					
						
						
							
							version bump to 1.9.0-beta.3  
						
						
						
					 
					
						2016-01-13 12:20:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14428da108 
							
						 
					 
					
						
						
							
							show key fetch error in activity when there are no keys to be used  
						
						
						
					 
					
						2016-01-13 12:19:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							571eb2f7f9 
							
						 
					 
					
						
						
							
							check for file storage permission before selecting avatar  
						
						
						
					 
					
						2016-01-13 12:05:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f63c397fa 
							
						 
					 
					
						
						
							
							Merge pull request  #1649  from dhiru1602/master  
						
						... 
						
						
						
						use batch transactions when writing roster 
						
					 
					
						2016-01-13 10:56:29 +01:00 
						 
				 
			
				
					
						
							
							
								Dheeraj CVR 
							
						 
					 
					
						
						
						
						
							
						
						
							ffb49c7217 
							
						 
					 
					
						
						
							
							use batch transactions when writing roster  
						
						... 
						
						
						
						Fixes https://github.com/siacs/Conversations/issues/1648  
						
					 
					
						2016-01-13 11:56:35 +04:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e9fd0185a 
							
						 
					 
					
						
						
							
							throw security exception instead of going to next srv entry  
						
						
						
					 
					
						2016-01-12 23:42:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da298cfe59 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-01-12 23:41:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							38c936b8ef 
							
						 
					 
					
						
						
							
							Merge pull request  #1647  from SamWhited/TorStringFix  
						
						... 
						
						
						
						s/TOR/Tor/g 
						
					 
					
						2016-01-12 22:58:51 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b729df43 
							
						 
					 
					
						
						
							
							s/TOR/Tor/g  
						
						
						
					 
					
						2016-01-12 15:41:39 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d122d224bb 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-01-12 16:43:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64420f79e5 
							
						 
					 
					
						
						
							
							version bump to 1.9.0-beta.2  
						
						
						
					 
					
						2016-01-12 16:39:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							893751a1d2 
							
						 
					 
					
						
						
							
							move some ssl socket modifiers into a seperate helper class  
						
						
						
					 
					
						2016-01-12 16:33:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f1e30288a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/moparisthebest/Conversations  into moparisthebest-master  
						
						
						
					 
					
						2016-01-12 15:35:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							921d567dcb 
							
						 
					 
					
						
						
							
							use match_parent as height in conversations overview  
						
						
						
					 
					
						2016-01-12 15:35:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da6076028f 
							
						 
					 
					
						
						
							
							Revert "Add additional warnings to OMEMO purge key function"  
						
						... 
						
						
						
						This reverts commit 3bea5b25cd 
						
					 
					
						2016-01-12 09:48:49 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3bea5b25cd 
							
						 
					 
					
						
						
							
							Add additional warnings to OMEMO purge key function  
						
						... 
						
						
						
						People continue to press the "don't press this" button. Maybe adding
some warnings indicating that this button will not fix their problems
will help... 
						
					 
					
						2016-01-12 09:33:54 +01:00 
						 
				 
			
				
					
						
							
							
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							217f6603c0 
							
						 
					 
					
						
						
							
							Implement XEP-0368: SRV records for XMPP over TLS  
						
						
						
					 
					
						2016-01-11 17:25:16 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20ec9ff2c6 
							
						 
					 
					
						
						
							
							reworked that loop that iterates over various servers  
						
						
						
					 
					
						2016-01-11 19:05:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a85bba0010 
							
						 
					 
					
						
						
							
							new art renders  
						
						
						
					 
					
						2016-01-11 18:29:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6af02b2cc5 
							
						 
					 
					
						
						
							
							Merge branch 'logo_fixes' of  https://github.com/fiaxh/Conversations  into logo_fixes  
						
						
						
					 
					
						2016-01-11 16:03:56 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							000bec2c7b 
							
						 
					 
					
						
						
							
							Cleaned up logo  
						
						
						
					 
					
						2016-01-11 15:57:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f1de73784 
							
						 
					 
					
						
						
							
							don't use the word phone in strings  
						
						
						
					 
					
						2016-01-11 15:34:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07a5ccf4d7 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-01-11 14:28:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d38ba906f 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-01-11 11:19:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							616241be11 
							
						 
					 
					
						
						
							
							add changelog for 1.9.0  
						
						
						
					 
					
						2016-01-11 11:17:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c296d6f446 
							
						 
					 
					
						
						
							
							ask to be excluded from battery optimization  
						
						
						
					 
					
						2016-01-11 11:17:45 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							41afd552e9 
							
						 
					 
					
						
						
							
							Clean up Conversations logo SVG  
						
						... 
						
						
						
						The previous version of the logo had some wonky alignments and other
artifacts in some places on the dashed line. This commit provides a new
version of the logo with perfect alignments.
It also includes a single path for the dashed line, which can be used
to ease further modifications to the logo. 
						
					 
					
						2016-01-10 20:17:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95db6db935 
							
						 
					 
					
						
						
							
							bump version code for beta  
						
						
						
					 
					
						2016-01-09 16:45:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab8fe13de 
							
						 
					 
					
						
						
							
							let the user decide on whether or not to compress pictures  
						
						
						
					 
					
						2016-01-09 16:17:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							708d7c5b98 
							
						 
					 
					
						
						
							
							automatically adjust image compression to keep files under 512MiB  
						
						
						
					 
					
						2016-01-09 16:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6acb80a83a 
							
						 
					 
					
						
						
							
							added Config.java variable to change the default notification behaviour to always  
						
						
						
					 
					
						2016-01-08 22:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dce42ac7f 
							
						 
					 
					
						
						
							
							don't show snackbar when notifications are disabled or paused  
						
						
						
					 
					
						2016-01-08 21:35:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3e136b550 
							
						 
					 
					
						
						
							
							show per conference notification settings in details activity  
						
						
						
					 
					
						2016-01-08 21:30:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb3ae37f0 
							
						 
					 
					
						
						
							
							show icon in conversations overview when notifications are disabled  
						
						
						
					 
					
						2016-01-08 14:41:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd5685885 
							
						 
					 
					
						
						
							
							Merge pull request  #1641  from fiaxh/uuid-fix  
						
						... 
						
						
						
						Correct uuid check according to RFC 4122 
						
					 
					
						2016-01-08 00:17:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c59eb75a59 
							
						 
					 
					
						
						
							
							avoid duplicate messages when sending files to mucs.  fixes   #1635  
						
						
						
					 
					
						2016-01-06 12:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							62d0eebe5c 
							
						 
					 
					
						
						
							
							Correct uuid check according to RFC 4122  
						
						
						
					 
					
						2016-01-05 20:07:29 +01:00