Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8339ebf3dc
								
							
						 | 
						
							
							
								
								version bump to 1.11.0-beta.3
							
							
							
							
							
						 | 
						
							2016-03-05 09:49:43 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								09d87965fb
								
							
						 | 
						
							
							
								
								mark oob messages and always display download button
							
							
							
							
							
						 | 
						
							2016-03-04 20:09:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								aa24a0f779
								
							
						 | 
						
							
							
								
								don't automatically crop avatar
							
							
							
							
							
						 | 
						
							2016-03-04 14:32:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								89eea3636f
								
							
						 | 
						
							
							
								
								add a few more know file extensions
							
							
							
							
							
						 | 
						
							2016-03-04 11:24:53 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								cc67bfd8db
								
							
						 | 
						
							
							
								
								version bump to 1.11.0-beta.2
							
							
							
							
							
						 | 
						
							2016-03-03 14:07:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bc5f64bffe
								
							
						 | 
						
							
							
								
								moved avatarfetcher reset code to bind
							
							
							
							
							
						 | 
						
							2016-03-03 13:33:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4cb2d0ca93
								
							
						 | 
						
							
							
								
								avoid unnecessary disconnect. prevent NetworkOnMainThreadException
							
							
							
							
							
						 | 
						
							2016-03-03 13:31:59 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								15a1873d97
								
							
						 | 
						
							
							
								
								removed unused config variable
							
							
							
							
							
						 | 
						
							2016-03-01 18:58:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fd246f7e5a
								
							
						 | 
						
							
							
								
								properly persist accepted crypto targets
							
							
							
							
							
						 | 
						
							2016-03-01 12:22:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ab4d86dde7
								
							
						 | 
						
							
							
								
								version bump to 1.11.0-beta, changelog and updated readme
							
							
							
							
							
						 | 
						
							2016-03-01 11:44:51 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								134c75ae01
								
							
						 | 
						
							
							
								
								use correct jid when leaving a conference. fixes #1732
							
							
							
							
							
						 | 
						
							2016-02-29 16:32:24 +01:00 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								4ba41540fd
								
							
						 | 
						
							
							
								
								made hashtable in roster store jids instead of strings
							
							
							
							
							
						 | 
						
							2016-02-28 20:45:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5cdfd0ec50
								
							
						 | 
						
							
							
								
								removed unneeded proguard files
							
							
							
							
							
						 | 
						
							2016-02-27 20:04:05 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								c393e60891
								
							
						 | 
						
							
							
								
								version bump to 1.10.1 and changelog
							
							
							
							
							
						 | 
						
							2016-02-26 09:53:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7fd6a37e67
								
							
						 | 
						
							
							
								
								disallow message correction by default. fixes #1720
							
							
							
							
							
						 | 
						
							2016-02-26 09:48:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								dc00a92499
								
							
						 | 
						
							
							
								
								execute pending mam queries every time we come online
							
							
							
							
							
						 | 
						
							2016-02-26 09:46:25 +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 | 
						
					
				
					
						
							
							
								 
								fiaxh
							
						 | 
						
							
							
							
							
							
								
							
							
								a88c2d48c0
								
							
						 | 
						
							
							
								
								No possibility of multiple invocation of log export
							
							
							
							
							
						 | 
						
							2016-02-24 15:10:41 +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 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								34f2a63190
								
							
						 | 
						
							
							
								
								update notification after message correction
							
							
							
							
							
						 | 
						
							2016-02-23 16:15:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0298f0181e
								
							
						 | 
						
							
							
								
								reset pending subscription request when receiving roster update
							
							
							
							
							
						 | 
						
							2016-02-23 16:14:55 +01:00 | 
						
					
				
					
						
							
							
								 
								fiaxh
							
						 | 
						
							
							
							
							
							
								
							
							
								894b5892a9
								
							
						 | 
						
							
							
								
								Retry decryption from message menu
							
							
							
							
							
						 | 
						
							2016-02-23 16:05:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								20eebe638b
								
							
						 | 
						
							
							
								
								Revert "disable predexing on travis"
							
							
							
							
							
							
							
							This reverts commit ad063d00cc. 
							
						 | 
						
							2016-02-23 14:33:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ad063d00cc
								
							
						 | 
						
							
							
								
								disable predexing on travis
							
							
							
							
							
						 | 
						
							2016-02-23 14:25:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								beb216c300
								
							
						 | 
						
							
							
								
								made presences object final in contact
							
							
							
							
							
						 | 
						
							2016-02-23 14:25:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7f45e210af
								
							
						 | 
						
							
							
								
								fixed typo in travis.yml
							
							
							
							
							
						 | 
						
							2016-02-23 13:54:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f1c947f0d6
								
							
						 | 
						
							
							
								
								fixed formating in travis config
							
							
							
							
							
						 | 
						
							2016-02-23 11:20:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9ae997cab8
								
							
						 | 
						
							
							
								
								added remark that users don't need their own app server
							
							
							
							
							
						 | 
						
							2016-02-23 10:15:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4a9753bebc
								
							
						 | 
						
							
							
								
								tell travis to build free version
							
							
							
							
							
						 | 
						
							2016-02-23 09:29:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5eb2d9af83
								
							
						 | 
						
							
							
								
								update build instructions in readme
							
							
							
							
							
						 | 
						
							2016-02-23 09:07:47 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								c20d8ac69e
								
							
						 | 
						
							
							
								
								version bump to 1.10.0
							
							
							
							
							
						 | 
						
							2016-02-21 23:03:30 +01:00 |