Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								49b4153fb5
								
							
						 | 
						
							
							
								
								make keyword styling work in quotes
							
							
							
							
							
						 | 
						
							2017-11-07 13:23:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								22c37bd430
								
							
						 | 
						
							
							
								
								changed text styling to keep the keyword
							
							
							
							
							
						 | 
						
							2017-11-06 23:44:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e0643f687b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2017-11-06 22:28:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a2b940832e
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2017-11-06 20:17:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								af3c9be700
								
							
						 | 
						
							
							
								
								fix take photo with pending keys
							
							
							
							
							
						 | 
						
							2017-11-06 17:27:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b32552f7d9
								
							
						 | 
						
							
							
								
								fixed markup in observations.md
							
							
							
							
							
						 | 
						
							2017-11-06 15:40:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								894ffc6488
								
							
						 | 
						
							
							
								
								ExceptionHelper: code clean up
							
							
							
							
							
						 | 
						
							2017-11-06 14:20:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								aa10b9ff05
								
							
						 | 
						
							
							
								
								code refactoring to provide shorter account enabled check
							
							
							
							
							
						 | 
						
							2017-11-06 13:57:25 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fd7ee7c025
								
							
						 | 
						
							
							
								
								AndroidManifest use singleTop instead of singleTask to start new task when sharing
							
							
							
							
							
						 | 
						
							2017-11-06 12:18:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ebd3330037
								
							
						 | 
						
							
							
								
								changed preview alpha to 0.6f
							
							
							
							
							
						 | 
						
							2017-11-06 12:17:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4d896cc3ab
								
							
						 | 
						
							
							
								
								initialize emoji compat in share activity
							
							
							
							
							
						 | 
						
							2017-11-06 12:16:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c262cd5d6e
								
							
						 | 
						
							
							
								
								support for basic IM styling
							
							
							
							
							
						 | 
						
							2017-11-05 21:34:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7984100e54
								
							
						 | 
						
							
							
								
								delete unneeded class
							
							
							
							
							
						 | 
						
							2017-11-05 16:32:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								435d1ef5bd
								
							
						 | 
						
							
							
								
								SASL: don't prefer PLAIN auth over DIGEST-MD5 for nimbuzz.com
							
							
							
							
							
						 | 
						
							2017-11-05 16:21:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8f0cd86090
								
							
						 | 
						
							
							
								
								Resync has_enabled_account setting after delete and on start
							
							
							
							
							
						 | 
						
							2017-10-28 17:49:51 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3205d763cf
								
							
						 | 
						
							
							
								
								MessageAdapter: Display emojis slightly larger in text
							
							
							
							
							
						 | 
						
							2017-10-28 13:15:31 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								aeec76d68b
								
							
						 | 
						
							
							
								
								Resolver: active network gets high priority
							
							
							
							
							
						 | 
						
							2017-10-28 13:12:11 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								4d0986ee91
								
							
						 | 
						
							
							
								
								Resolver: Only prefer VPN connections when network is active
							
							
							
							
							
						 | 
						
							2017-10-27 21:57:31 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								962add97f9
								
							
						 | 
						
							
							
								
								XmppConnection: throw bind failure when server tries to reassign domain
							
							
							
							
							
						 | 
						
							2017-10-27 18:26:06 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								82e5a28f49
								
							
						 | 
						
							
							
								
								Sharing: request permission
							
							
							
							
							
						 | 
						
							2017-10-27 17:25:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								08aad7d0aa
								
							
						 | 
						
							
							
								
								black list certain local parts and show domain instead
							
							
							
							
							
						 | 
						
							2017-10-27 15:46:12 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3c2aa8a4d2
								
							
						 | 
						
							
							
								
								Config.java: removed dead code
							
							
							
							
							
						 | 
						
							2017-10-27 15:30:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6f802b88d2
								
							
						 | 
						
							
							
								
								XmppConnection: do not count stanzas before smacks session has started
							
							
							
							
							
						 | 
						
							2017-10-27 11:35:55 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								dc5d504edd
								
							
						 | 
						
							
							
								
								MessageAdapter: round file sizes
							
							
							
							
							
						 | 
						
							2017-10-27 11:35:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ad6f6183b8
								
							
						 | 
						
							
							
								
								video processing: pick smaller file after transcoding. do not transcode very small files
							
							
							
							
							
						 | 
						
							2017-10-27 11:34:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								396ad3361f
								
							
						 | 
						
							
							
								
								Jingle: create output stream on demand
							
							
							
							
							
						 | 
						
							2017-10-26 18:42:10 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								73db0bd19f
								
							
						 | 
						
							
							
								
								MessageAdapter: Do not display muc whispers as emoji only
							
							
							
							
							
						 | 
						
							2017-10-26 18:41:40 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6bc32d7e57
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2017-10-23 21:14:23 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ac50b367b7
								
							
						 | 
						
							
							
								
								don't share video twice after transcoding exception. fixes #2652
							
							
							
							
							
						 | 
						
							2017-10-14 02:38:05 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								529ac01051
								
							
						 | 
						
							
							
								
								Merge pull request #2645 from licaon-kter/patch-1
							
							
							
							
							
							
							
							Add field for actual result in issue template 
							
						 | 
						
							2017-10-03 09:14:02 +02:00 | 
						
					
				
					
						
							
							
								 
								licaon-kter
							
						 | 
						
							
							
							
							
							
								
							
							
								83084b9bd5
								
							
						 | 
						
							
							
								
								Add field for actual result
							
							
							
							
							
							
							
							And make example version as current 
							
						 | 
						
							2017-10-02 18:07:46 +03:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								48baf56622
								
							
						 | 
						
							
							
								
								save message drafts across restarts. fixes #2642
							
							
							
							
							
						 | 
						
							2017-10-01 22:52:21 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								50d436fd81
								
							
						 | 
						
							
							
								
								EventReceiver: use setting to store enabled accounts
							
							
							
							
							
						 | 
						
							2017-10-01 18:44:28 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a288ad8d6b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2017-10-01 10:42:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								874c1f4c74
								
							
						 | 
						
							
							
								
								MessageAdapter: trim but don't replace all whitespaces before displaying emoji message
							
							
							
							
							
						 | 
						
							2017-10-01 10:42:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a16aca03f8
								
							
						 | 
						
							
							
								
								Merge pull request #2643 from devurandom/patch-1
							
							
							
							
							
							
							
							Fix typo in error_no_keys_to_trust_server_error 
							
						 | 
						
							2017-09-30 20:03:39 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6713431986
								
							
						 | 
						
							
							
								
								Emoticons: support subdivision-flags
							
							
							
							
							
						 | 
						
							2017-09-30 18:58:35 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								39a54838fa
								
							
						 | 
						
							
							
								
								Emoticons: detect keycaps
							
							
							
							
							
						 | 
						
							2017-09-30 17:38:48 +02:00 | 
						
					
				
					
						
							
							
								 
								Dennis Schridde
							
						 | 
						
							
							
							
							
							
								
							
							
								87b1cc6b38
								
							
						 | 
						
							
							
								
								Fix typo in error_no_keys_to_trust_server_error
							
							
							
							
							
							
							
							Contact should be genitive (contact's), not plural (contacts) 
							
						 | 
						
							2017-09-30 16:30:12 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bbfabaf930
								
							
						 | 
						
							
							
								
								FileBackend: close cursor after retrieving file size
							
							
							
							
							
						 | 
						
							2017-09-30 15:50:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								56eb49d8cc
								
							
						 | 
						
							
							
								
								updated travis config
							
							
							
							
							
						 | 
						
							2017-09-30 01:23:20 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								014052b991
								
							
						 | 
						
							
							
								
								added a few codepoints with emoji variants
							
							
							
							
							
						 | 
						
							2017-09-30 01:18:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f53e44a291
								
							
						 | 
						
							
							
								
								refactor emoji detector and fix fitzpatrick followed by zwj
							
							
							
							
							
						 | 
						
							2017-09-29 23:27:08 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f0e48c8af5
								
							
						 | 
						
							
							
								
								use own algorithm to count emoji instead of using emoji-java
							
							
							
							
							
						 | 
						
							2017-09-29 22:56:17 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								42b4528d03
								
							
						 | 
						
							
							
								
								use emoji compat
							
							
							
							
							
						 | 
						
							2017-09-29 19:44:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c69c358bac
								
							
						 | 
						
							
							
								
								upgraded build tools and gradle file
							
							
							
							
							
						 | 
						
							2017-09-29 13:28:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0cdcafe745
								
							
						 | 
						
							
							
								
								version bump to 1.21.0 + changelog
							
							
							
							
							
						 | 
						
							2017-09-28 22:47:54 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								bb10cef505
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2017-09-27 10:52:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9b4149a63d
								
							
						 | 
						
							
							
								
								limit audio player width on small screens
							
							
							
							
							
						 | 
						
							2017-09-27 10:21:34 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								acd4b149f5
								
							
						 | 
						
							
							
								
								slight refactoring in MessageAdapter
							
							
							
							
							
						 | 
						
							2017-09-27 10:21:00 +02:00 |