Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								71ad18beb9
								
							
						 | 
						
							
							
								
								support omemo:// style urls
							
							
							
							
							
						 | 
						
							2017-02-07 19:32:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c37117b940
								
							
						 | 
						
							
							
								
								update copyright information
							
							
							
							
							
						 | 
						
							2017-02-07 19:31:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6be3ae8ef0
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2017-02-07 17:57:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e35ada4997
								
							
						 | 
						
							
							
								
								only store messages up to a length of 1M chars
							
							
							
							
							
						 | 
						
							2017-02-07 17:45:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6313c3c92e
								
							
						 | 
						
							
							
								
								Merge pull request #2270 from moparisthebest/master
							
							
							
							
							
							
							
							Stop Conversations force closing over sqlite errors due to long messages 
							
						 | 
						
							2017-02-07 17:35:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								853862ec9c
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2017-02-07 17:31:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e459616123
								
							
						 | 
						
							
							
								
								fixed wording for not getting messages from server
							
							
							
							
							
						 | 
						
							2017-02-07 14:03:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8ab166e817
								
							
						 | 
						
							
							
								
								fixed scrolling and async loading of message of new conversation start
							
							
							
							
							
						 | 
						
							2017-02-07 14:03:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								d7198bd68c
								
							
						 | 
						
							
							
								
								fixed rare npe when doing file migration
							
							
							
							
							
						 | 
						
							2017-02-07 10:20:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6fc67d9a60
								
							
						 | 
						
							
							
								
								catch all throwables when working with content provider to retrieve mime
							
							
							
							
							
						 | 
						
							2017-02-07 10:19:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5fd91fcd8e
								
							
						 | 
						
							
							
								
								Merge pull request #2272 from mimi89999/patch-3
							
							
							
							
							
							
							
							Correct a typo in the README 
							
						 | 
						
							2017-01-31 21:45:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Michel Le Bihan
							
						 | 
						
							
							
							
							
							
								
							
							
								cd3ce76115
								
							
						 | 
						
							
							
								
								Correct a typo in the README
							
							
							
							
							
						 | 
						
							2017-01-31 18:09:42 +01:00 | 
						
					
				
					
						
							
							
								 
								moparisthebest
							
						 | 
						
							
							
							
							
							
								
							
							
								2a34ece571
								
							
						 | 
						
							
							
								
								Stop Conversations force closing over sqlite errors due to long messages
							
							
							
							
							
						 | 
						
							2017-01-30 00:03:51 -05:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8a1ebf2bbe
								
							
						 | 
						
							
							
								
								Merge pull request #2260 from alexara/patch-1
							
							
							
							
							
							
							
							Fixed typos in the readme 
							
						 | 
						
							2017-01-26 19:45:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0d199c8ceb
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
							
						 | 
						
							2017-01-26 19:45:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7651700c2a
								
							
						 | 
						
							
							
								
								Merge branch 'master' into patch-1
							
							
							
							
							
						 | 
						
							2017-01-26 19:42:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								eea1bc8090
								
							
						 | 
						
							
							
								
								Merge pull request #2259 from mabkenar/patch-2
							
							
							
							
							
							
							
							small typo fix 
							
						 | 
						
							2017-01-26 19:40:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								53241f2ef1
								
							
						 | 
						
							
							
								
								add explicit encryption hints to outgoing messages
							
							
							
							
							
						 | 
						
							2017-01-26 19:19:08 +01:00 | 
						
					
				
					
						
							
							
								 
								alexara
							
						 | 
						
							
							
							
							
							
								
							
							
								e4524e2c7b
								
							
						 | 
						
							
							
								
								Fixed typos in the readme
							
							
							
							
							
						 | 
						
							2017-01-26 19:18:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c9e6d05fa0
								
							
						 | 
						
							
							
								
								use base64 encoding for file names uploaded with http
							
							
							
							
							
						 | 
						
							2017-01-26 18:39:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Masoud Abkenar
							
						 | 
						
							
							
							
							
							
								
							
							
								be84443921
								
							
						 | 
						
							
							
								
								small typo fix
							
							
							
							
							
						 | 
						
							2017-01-26 16:46:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bbceee7f61
								
							
						 | 
						
							
							
								
								pulled translation from transifex
							
							
							
							
							
						 | 
						
							2017-01-26 12:35:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								40ee1a0bfc
								
							
						 | 
						
							
							
								
								reset messagesLoaded when changing retention settings
							
							
							
							
							
						 | 
						
							2017-01-25 18:35:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a86b2fefd9
								
							
						 | 
						
							
							
								
								add database and file migrations for 1.16.0
							
							
							
							
							
						 | 
						
							2017-01-25 13:22:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f2d9539d90
								
							
						 | 
						
							
							
								
								share uri for bookmark direclty from Start Conversation
							
							
							
							
							
						 | 
						
							2017-01-25 00:15:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								66457c9f2e
								
							
						 | 
						
							
							
								
								transcode videos before sharing. change storage location
							
							
							
							
							
						 | 
						
							2017-01-24 20:17:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9b6ae6d75f
								
							
						 | 
						
							
							
								
								configurable local message retention period. (untested)
							
							
							
							
							
						 | 
						
							2017-01-23 17:14:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4c6ef3b24e
								
							
						 | 
						
							
							
								
								cleaning up crypto targets when conference member is getting removed
							
							
							
							
							
						 | 
						
							2017-01-22 18:58:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b48bf39e08
								
							
						 | 
						
							
							
								
								change behaviour of back button to close finish activity. fixes #704
							
							
							
							
							
						 | 
						
							2017-01-22 18:26:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7035f38e0b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2017-01-22 13:08:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								d53c813408
								
							
						 | 
						
							
							
								
								make sure to set open conversations after connection with background service
							
							
							
							
							
						 | 
						
							2017-01-22 13:08:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								b72d7ec8d0
								
							
						 | 
						
							
							
								
								make sure to properly stop tagwriter
							
							
							
							
							
						 | 
						
							2017-01-22 12:54:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5dde977233
								
							
						 | 
						
							
							
								
								upgrade dependency to ShortcutBadger
							
							
							
							
							
						 | 
						
							2017-01-22 12:37:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								2f4eee1fa7
								
							
						 | 
						
							
							
								
								Merge pull request #2230 from AnBuKu/patch-1
							
							
							
							
							
							
							
							Added XEP-0384 
							
						 | 
						
							2017-01-22 10:41:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								96a6460744
								
							
						 | 
						
							
							
								
								don't quote text when '>' is followed by numeber
							
							
							
							
							
						 | 
						
							2017-01-21 11:07:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								780d1daf7e
								
							
						 | 
						
							
							
								
								fixed some issues around ibb
							
							
							
							
							
						 | 
						
							2017-01-20 22:37:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0f870223c4
								
							
						 | 
						
							
							
								
								version bump to 1.15.5 + changelog
							
							
							
							
							
						 | 
						
							2017-01-20 15:03:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								5faa05ca19
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2017-01-20 15:02:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								97ba0a0d49
								
							
						 | 
						
							
							
								
								write text in bold when highlighted in received muc message
							
							
							
							
							
						 | 
						
							2017-01-20 14:54:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								cb9c4d4327
								
							
						 | 
						
							
							
								
								disable automatic foreground enabler. fixes #2239
							
							
							
							
							
						 | 
						
							2017-01-20 14:21:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c324f0c8df
								
							
						 | 
						
							
							
								
								modified highlight nick behaviour to better work with quotes
							
							
							
							
							
						 | 
						
							2017-01-20 13:45:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								59f82cbd34
								
							
						 | 
						
							
							
								
								fixed regression introduced in previous commit.
							
							
							
							
							
						 | 
						
							2017-01-20 13:44:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								143ad48be1
								
							
						 | 
						
							
							
								
								don't prematurly mark conversation as read during activity start. fixes #2245
							
							
							
							
							
						 | 
						
							2017-01-20 10:43:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1dcf804618
								
							
						 | 
						
							
							
								
								fixed pgp encrypted text quick sharing. fixes #2237
							
							
							
							
							
						 | 
						
							2017-01-17 15:56:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ac2eee8e81
								
							
						 | 
						
							
							
								
								Merge pull request #2233 from SamWhited/scram-sha-2
							
							
							
							
							
							
							
							Add SCRAM-SHA-2 support 
							
						 | 
						
							2017-01-16 13:14:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								764026b87e
								
							
						 | 
						
							
							
								
								fixed behaviour with non-default encryption masks
							
							
							
							
							
						 | 
						
							2017-01-16 13:09:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7219e077f4
								
							
						 | 
						
							
							
								
								version bump to 1.15.4 + changelog
							
							
							
							
							
						 | 
						
							2017-01-16 12:07:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								bfc2cffc2f
								
							
						 | 
						
							
							
								
								Add SCRAM-SHA-2 support
							
							
							
							
							
						 | 
						
							2017-01-15 23:43:44 -06:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f7c5a5c42e
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2017-01-15 19:22:18 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9bdd2bf1ae
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2017-01-15 18:55:15 +01:00 |