Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5e40672c1
							
						
					 | 
					
						
						
							
							added gcm values file to gitignore
						
						
						
						
						
					 | 
					
						2016-02-16 09:58:26 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ca4a33bfb
							
						
					 | 
					
						
						
							
							added some OTR logging
						
						
						
						
						
					 | 
					
						2016-02-16 09:15:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0b3a3ff0c
							
						
					 | 
					
						
						
							
							basic support for XEP-0308: Last Message Correction. fixes #864
						
						
						
						
						
					 | 
					
						2016-02-15 23:15:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							335058b78b
							
						
					 | 
					
						
						
							
							removed unnecessary conditions when sending read marker
						
						
						
						
						
					 | 
					
						2016-02-15 23:09:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4b1df1bf3
							
						
					 | 
					
						
						
							
							add missing type='submit' attribute to enable push form
						
						
						
						
						
					 | 
					
						2016-02-15 22:12:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3f0503a91
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-02-15 12:35:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ccb2005b3
							
						
					 | 
					
						
						
							
							only show load more messages button when mam is available
						
						
						
						
						
						
						
						also update ui after that button has been pressed. fixes #1695 
						
					 | 
					
						2016-02-14 23:53:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							356199978e
							
						
					 | 
					
						
						
							
							fixed server info push not showing up when unavailable
						
						
						
						
						
					 | 
					
						2016-02-14 18:19:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							92a6e956fd
							
						
					 | 
					
						
						
							
							be more carefull when checking push availability
						
						
						
						
						
					 | 
					
						2016-02-14 15:36:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							300326fba3
							
						
					 | 
					
						
						
							
							deleted invalid gcm strings
						
						
						
						
						
					 | 
					
						2016-02-14 14:14:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							251f2479c2
							
						
					 | 
					
						
						
							
							optional mode to close tcp connection when going into background
						
						
						
						
						
						
						
						acts only when push is available. disable all non-push accounts to test properly 
						
					 | 
					
						2016-02-14 13:20:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f9f871928
							
						
					 | 
					
						
						
							
							send push enable to server. simplified logging
						
						
						
						
						
					 | 
					
						2016-02-13 14:20:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7a14092a8
							
						
					 | 
					
						
						
							
							fixed compile bug in free version
						
						
						
						
						
					 | 
					
						2016-02-13 00:03:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6217e33a87
							
						
					 | 
					
						
						
							
							removed gcm plugin from gradle. fixes #1693
						
						
						
						
						
					 | 
					
						2016-02-12 23:38:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c430848ade
							
						
					 | 
					
						
						
							
							push gcm token on bind instead of every connect
						
						
						
						
						
					 | 
					
						2016-02-12 23:37:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bac249c8dd
							
						
					 | 
					
						
						
							
							add play services to travis config
						
						
						
						
						
					 | 
					
						2016-02-12 12:06:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							32da65f910
							
						
					 | 
					
						
						
							
							client side support for XEP-0357: Push Notifications
						
						
						
						
						
					 | 
					
						2016-02-12 11:39:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							93dad9b737
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-02-11 22:45:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d58d822215
							
						
					 | 
					
						
						
							
							version bump to 1.9.4 + changelog
						
						
						
						
						
					 | 
					
						2016-02-11 17:13:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f37098a54f
							
						
					 | 
					
						
						
							
							catch all axolotl parse exception at once. fixes #1692
						
						
						
						
						
					 | 
					
						2016-02-11 12:26:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1bb38e25f2
							
						
					 | 
					
						
						
							
							send muc messages after join
						
						
						
						
						
					 | 
					
						2016-02-10 09:53:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f16690ae1f
							
						
					 | 
					
						
						
							
							allow user to set MAM preferences
						
						
						
						
						
					 | 
					
						2016-02-09 13:01:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							91ec4839ac
							
						
					 | 
					
						
						
							
							prepend instead off append mam messages to conversations when going in reverse
						
						
						
						
						
					 | 
					
						2016-02-04 16:40:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							28733e052f
							
						
					 | 
					
						
						
							
							fixed performance regression in on scroll listener
						
						
						
						
						
					 | 
					
						2016-02-04 16:29:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fdb0d92fe
							
						
					 | 
					
						
						
							
							prevent previoulsly cleared messages from reloading. fixes #1110
						
						
						
						
						
					 | 
					
						2016-02-04 14:39:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f88b8c703e
							
						
					 | 
					
						
						
							
							add more fault tolerant checks for messages left on server
						
						
						
						
						
					 | 
					
						2016-02-04 11:55:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							17791a703e
							
						
					 | 
					
						
						
							
							removed unecessary logging when muc tiles update
						
						
						
						
						
					 | 
					
						2016-02-04 10:27:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dd9545ea3
							
						
					 | 
					
						
						
							
							use TLSv1.2 as SSL context on supported plattforms
						
						
						
						
						
					 | 
					
						2016-02-03 18:17:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d572c61d0
							
						
					 | 
					
						
						
							
							cache server caps
						
						
						
						
						
					 | 
					
						2016-02-03 17:19:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0911669b07
							
						
					 | 
					
						
						
							
							count all messages in a query
						
						
						
						
						
					 | 
					
						2016-02-03 16:04:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1274b0ef39
							
						
					 | 
					
						
						
							
							Revert "get rid of broken totalMessageCount for mam queries"
						
						
						
						
						
						
						
						This reverts commit 58c6f9bfb2. 
						
					 | 
					
						2016-02-03 10:40:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0798216d5
							
						
					 | 
					
						
						
							
							refactored disco cache. avoid making duplicate call. check hash
						
						
						
						
						
					 | 
					
						2016-02-03 10:40:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a1a59f0c8
							
						
					 | 
					
						
						
							
							Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
						
						
						
						
						
					 | 
					
						2016-02-02 18:19:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							01bad12708
							
						
					 | 
					
						
						
							
							fixed 'unencrypted' not showing up for conferences when encryption is forced
						
						
						
						
						
					 | 
					
						2016-02-02 18:15:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							58c6f9bfb2
							
						
					 | 
					
						
						
							
							get rid of broken totalMessageCount for mam queries
						
						
						
						
						
					 | 
					
						2016-02-02 15:39:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							fab0a45955
							
						
					 | 
					
						
						
							
							re-read common name from certificates on startup
						
						
						
						
						
					 | 
					
						2016-02-02 13:43:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba9ba8ffe2
							
						
					 | 
					
						
						
							
							avoid npe when accessing the pgp connection service
						
						
						
						
						
					 | 
					
						2016-02-02 11:21:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f30df7a535
							
						
					 | 
					
						
						
							
							catch a few NPE when parsing invalid pep nodes
						
						
						
						
						
					 | 
					
						2016-02-02 11:21:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae83efe4a6
							
						
					 | 
					
						
						
							
							version bump to 1.9.3
						
						
						
						
						
					 | 
					
						2016-02-01 14:25:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3978c04782
							
						
					 | 
					
						
						
							
							respect autojoin setting on newly created bookmarks as well
						
						
						
						
						
					 | 
					
						2016-02-01 14:22:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e7647e385
							
						
					 | 
					
						
						
							
							opt out handling of the autojoin flag. fixes #1666
						
						
						
						
						
					 | 
					
						2016-02-01 13:54:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1fc90f981
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations
						
						
						
						
						
					 | 
					
						2016-02-01 12:33:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							336daea875
							
						
					 | 
					
						
						
							
							made create context menu call in StartConversationsActivity more failsafe
						
						
						
						
						
					 | 
					
						2016-02-01 12:31:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e11415ec
							
						
					 | 
					
						
						
							
							refactored user handling in conferences. show try again button when conference has errors
						
						
						
						
						
					 | 
					
						2016-02-01 12:11:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2eef37174e
							
						
					 | 
					
						
						
							
							fixed false set of subject in conference with empty body tag
						
						
						
						
						
					 | 
					
						2016-01-31 14:42:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							19c2ca520c
							
						
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
					 | 
					
						2016-01-31 11:25:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							82870b27ed
							
						
					 | 
					
						
						
							
							prefer dns servers from networsk with the default route
						
						
						
						
						
					 | 
					
						2016-01-29 12:12:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c416948f8b
							
						
					 | 
					
						
						
							
							be more careful with resetting the stream id
						
						
						
						
						
					 | 
					
						2016-01-29 12:09:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							28ebf927fb
							
						
					 | 
					
						
						
							
							try to make in-valid-session detection work for pgp
						
						
						
						
						
					 | 
					
						2016-01-29 12:09:31 +01:00 | 
					
					
						
						
							
							
							
						
					 |