Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							594e65bb2b
							
						
					 | 
					
						
						
							
							hacky workaround to determine if uri points to private file on < lolipop
						
						
						
						
						
					 | 
					
						2016-04-13 11:14:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e654bea0e
							
						
					 | 
					
						
						
							
							added share uri button to conference details
						
						
						
						
						
					 | 
					
						2016-04-12 18:30:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							91b17c6925
							
						
					 | 
					
						
						
							
							fixed 'connecting…' button
						
						
						
						
						
					 | 
					
						2016-04-10 00:19:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b99d70bfe7
							
						
					 | 
					
						
						
							
							don't show contact details when in conversations with self
						
						
						
						
						
					 | 
					
						2016-04-09 10:59:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0460702710
							
						
					 | 
					
						
						
							
							check file owner when attaching files or using them as avatar
						
						
						
						
						
					 | 
					
						2016-04-07 20:29:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							290f0a123e
							
						
					 | 
					
						
						
							
							prevent null pointer when checking http upload max size
						
						
						
						
						
					 | 
					
						2016-04-07 19:20:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							701742f550
							
						
					 | 
					
						
						
							
							don't ask for resource when server uses http upload v0.1
						
						
						
						
						
					 | 
					
						2016-04-02 18:07:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2549ce89b0
							
						
					 | 
					
						
						
							
							check max http file size when attaching files
						
						
						
						
						
					 | 
					
						2016-04-01 00:03:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							74c496fe3e
							
						
					 | 
					
						
						
							
							add methods to check max file size for http upload
						
						
						
						
						
					 | 
					
						2016-03-31 21:56:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e074104004
							
						
					 | 
					
						
						
							
							save otr fingerprint in message
						
						
						
						
						
					 | 
					
						2016-03-31 21:15:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9b66e3ea5
							
						
					 | 
					
						
						
							
							allow to delete attachments. fixes #1539
						
						
						
						
						
					 | 
					
						2016-03-23 19:23:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac09011690
							
						
					 | 
					
						
						
							
							be less strict when sharing EXTRA_TEXT intents
						
						
						
						
						
					 | 
					
						2016-03-20 17:25:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b51ce43d36
							
						
					 | 
					
						
						
							
							don't show v\omemo keys as such if not enabled
						
						
						
						
						
					 | 
					
						2016-03-20 17:24:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b17ca3543f
							
						
					 | 
					
						
						
							
							made it possible to share text files
						
						
						
						
						
					 | 
					
						2016-03-16 18:09:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							48be5af55f
							
						
					 | 
					
						
						
							
							reworked sharewith activity to stay open during sharing
						
						
						
						
						
						
						
						closing the activity prematuraly caused uri permissions to be revoked 
						
					 | 
					
						2016-03-16 10:46:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1153e6120d
							
						
					 | 
					
						
						
							
							added logging in case fragment wasn't attached
						
						
						
						
						
					 | 
					
						2016-03-13 17:41:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							290f53f4a6
							
						
					 | 
					
						
						
							
							fixed recursive call instead of call to super in PublishProfileActivity
						
						
						
						
						
					 | 
					
						2016-03-13 17:39:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6a9829dd2
							
						
					 | 
					
						
						
							
							don't show opt-out of battery optimization dialog when push is enabled
						
						
						
						
						
					 | 
					
						2016-03-06 15:53:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							86fff5839a
							
						
					 | 
					
						
						
							
							warn in conversations when account is disabled
						
						
						
						
						
					 | 
					
						2016-03-06 12:16:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3542202b5
							
						
					 | 
					
						
						
							
							Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun018-Mess
						
						
						
						
						
					 | 
					
						2016-03-04 21:31:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9b4a2a021
							
						
					 | 
					
						
						
							
							show host in file size checker
						
						
						
						
						
					 | 
					
						2016-03-04 21:30:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa24a0f779
							
						
					 | 
					
						
						
							
							don't automatically crop avatar
						
						
						
						
						
					 | 
					
						2016-03-04 14:32:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							07263370d9
							
						
					 | 
					
						
						
							
							allow to copy original url even while downloading. fixes #1743
						
						
						
						
						
					 | 
					
						2016-03-04 11:24:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9e4b332bf
							
						
					 | 
					
						
						
							
							don't break with srcoll events on empty message lists
						
						
						
						
						
					 | 
					
						2016-03-03 11:14:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							aaf64732b0
							
						
					 | 
					
						
						
							
							expert option to treat vibrate as silent mode for XA. fixes #1530
						
						
						
						
						
					 | 
					
						2016-03-01 19:00:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd246f7e5a
							
						
					 | 
					
						
						
							
							properly persist accepted crypto targets
						
						
						
						
						
					 | 
					
						2016-03-01 12:22:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							198dc2c6b4
							
						
					 | 
					
						
						
							
							let users confirm each member in a conference even if that contact is already trusted
						
						
						
						
						
					 | 
					
						2016-03-01 11:26:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tarun
							
						 
					 | 
					
						
						
						
						
							
						
						
							df7b399e04
							
						
					 | 
					
						
						
							
							Fix Issue #1634 : Shows XMPP URI as links.
						
						
						
						
						
						
						
						Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI. 
						
					 | 
					
						2016-02-29 23:35:50 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e0466d1e6
							
						
					 | 
					
						
						
							
							refactored omemo to take multiple recipients
						
						
						
						
						
					 | 
					
						2016-02-29 13:18:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							199ae3a4d8
							
						
					 | 
					
						
						
							
							rename purge keys positive button to 'purge keys'
						
						
						
						
						
					 | 
					
						2016-02-28 23:10:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							24a9ac2908
							
						
					 | 
					
						
						
							
							always search offline contacts as well. fixes #1653
						
						
						
						
						
					 | 
					
						2016-02-27 15:41:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c224d0f18
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations
						
						
						
						
						
					 | 
					
						2016-02-27 11:26:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cf21e2d37
							
						
					 | 
					
						
						
							
							Merge pull request #1721 from fiaxh/export_logs_storage_permission
						
						
						
						
						
						
						
						Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M 
						
					 | 
					
						2016-02-27 11:25:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							60ab03afb1
							
						
					 | 
					
						
						
							
							changed single_account config into more simple lock_settings
						
						
						
						
						
					 | 
					
						2016-02-27 10:25:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d3ee60ca4
							
						
					 | 
					
						
						
							
							hide add account icons when single_account is set to true
						
						
						
						
						
					 | 
					
						2016-02-24 17:12:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbede8bbeb
							
						
					 | 
					
						
						
							
							optionally lock conference domains as well and hide known domains in ui
						
						
						
						
						
					 | 
					
						2016-02-24 16:53:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fiaxh
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1a2f248af
							
						
					 | 
					
						
						
							
							Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M
						
						
						
						
						
					 | 
					
						2016-02-24 16:35:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1a456f3e3
							
						
					 | 
					
						
						
							
							made hard coded choice for encryptions more flexible and disable parsing
						
						
						
						
						
					 | 
					
						2016-02-24 14:47:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddafa65849
							
						
					 | 
					
						
						
							
							Merge pull request #1715 from fiaxh/gpg_decryption_failed
						
						
						
						
						
						
						
						PGP Retry decryption from message menu 
						
					 | 
					
						2016-02-24 09:23:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							17b1fcc3ea
							
						
					 | 
					
						
						
							
							set noMessagesLeftOnServer before conference configuration fetch
						
						
						
						
						
					 | 
					
						2016-02-23 16:15:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fiaxh
							
						 
					 | 
					
						
						
						
						
							
						
						
							894b5892a9
							
						
					 | 
					
						
						
							
							Retry decryption from message menu
						
						
						
						
						
					 | 
					
						2016-02-23 16:05:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							689ded1607
							
						
					 | 
					
						
						
							
							properly trigger show load more messages in mucs
						
						
						
						
						
					 | 
					
						2016-02-22 20:28:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0d0ed34ae
							
						
					 | 
					
						
						
							
							turned muc errors into enum. added error codes for service shutdown
						
						
						
						
						
					 | 
					
						2016-02-22 20:19:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d2cfac222e
							
						
					 | 
					
						
						
							
							show load more messages when auto loading is disabled and messages are still left on server
						
						
						
						
						
					 | 
					
						2016-02-21 17:32:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2cb009f4c
							
						
					 | 
					
						
						
							
							skip avatar ui when pep is not available. fixes #1706
						
						
						
						
						
					 | 
					
						2016-02-19 20:54:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							df992d2566
							
						
					 | 
					
						
						
							
							don't reset whisper on reInit. fixes #1637
						
						
						
						
						
					 | 
					
						2016-02-19 20:54:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							59978e157c
							
						
					 | 
					
						
						
							
							only offer message correction for the very last message
						
						
						
						
						
					 | 
					
						2016-02-17 16:51:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							349dd8291d
							
						
					 | 
					
						
						
							
							made clear that archiving preferences are server side
						
						
						
						
						
					 | 
					
						2016-02-16 12:52:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9b957e8a2
							
						
					 | 
					
						
						
							
							added setting to opt-out of message correction. renamed preferences and options to settings
						
						
						
						
						
					 | 
					
						2016-02-16 09:57:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0b3a3ff0c
							
						
					 | 
					
						
						
							
							basic support for XEP-0308: Last Message Correction. fixes #864
						
						
						
						
						
					 | 
					
						2016-02-15 23:15:04 +01:00 | 
					
					
						
						
							
							
							
						
					 |