Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							55016f10e6
							
						
					 | 
					
						
						
							
							fix color of show password button
						
						
						
						
						
					 | 
					
						2018-01-09 10:13:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ab8ed625d
							
						
					 | 
					
						
						
							
							fix wrong avatar shown when true jid doesn't match in muc
						
						
						
						
						
					 | 
					
						2018-01-09 10:13:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d7d7623a0
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2018-01-01 12:02:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2c2e77a168
							
						
					 | 
					
						
						
							
							ShareWithActivity: refactor for java 8
						
						
						
						
						
					 | 
					
						2018-01-01 11:56:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							97bc93aeb0
							
						
					 | 
					
						
						
							
							do not use theme in uri activity
						
						
						
						
						
					 | 
					
						2017-12-19 12:50:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5828127ee
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-18 13:48:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							127557df56
							
						
					 | 
					
						
						
							
							show pep as available if omemo_all_access has been installed on server
						
						
						
						
						
					 | 
					
						2017-12-18 13:47:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5ee541906
							
						
					 | 
					
						
						
							
							clear muc avatar after going online
						
						
						
						
						
					 | 
					
						2017-12-18 13:19:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0ec6ad8b6
							
						
					 | 
					
						
						
							
							fixed omemo device list not getting annouced on empty list
						
						
						
						
						
					 | 
					
						2017-12-18 13:18:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1753dcac76
							
						
					 | 
					
						
						
							
							save muc subject to disk and use crypto targets for offline name generation
						
						
						
						
						
					 | 
					
						2017-12-17 16:23:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b0551a522
							
						
					 | 
					
						
						
							
							store new intent in welcome account activity
						
						
						
						
						
					 | 
					
						2017-12-16 21:05:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0cc6ff05f8
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-16 20:45:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							21615477ed
							
						
					 | 
					
						
						
							
							transport invitee from welcome activity to start conversations activity
						
						
						
						
						
					 | 
					
						2017-12-16 20:38:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c58fcb1dc6
							
						
					 | 
					
						
						
							
							create avatar in background thread
						
						
						
						
						
					 | 
					
						2017-12-16 14:22:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b95f1102c
							
						
					 | 
					
						
						
							
							PublishProfilePictureActivity: refresh on status change
						
						
						
						
						
					 | 
					
						2017-12-16 11:00:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccf75ef45a
							
						
					 | 
					
						
						
							
							removed 'contact-only' hint from publish avtar screen
						
						
						
						
						
					 | 
					
						2017-12-15 21:47:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb6d5463fe
							
						
					 | 
					
						
						
							
							use JPEG as file format for avatar and compress to <9400 chars
						
						
						
						
						
					 | 
					
						2017-12-15 20:49:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0be41e0aab
							
						
					 | 
					
						
						
							
							refactor StartConversationsActivity
						
						
						
						
						
					 | 
					
						2017-12-15 19:13:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc6a001ac2
							
						
					 | 
					
						
						
							
							remove NFC handling + let edit account handle own jids
						
						
						
						
						
					 | 
					
						2017-12-15 18:25:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6a9abd0e49
							
						
					 | 
					
						
						
							
							Merge pull request #2720 from af8a524db1/uri_message
						
						
						
						
						
						
						
						Handle 'message action' XMPP URIs 
						
					 | 
					
						2017-12-15 16:17:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdd6bdab98
							
						
					 | 
					
						
						
							
							increased max lines to 8
						
						
						
						
						
					 | 
					
						2017-12-15 16:14:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d339b6521
							
						
					 | 
					
						
						
							
							remove NFC + light refactoring of XmppActivity
						
						
						
						
						
					 | 
					
						2017-12-15 16:14:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							df37e34e02
							
						
					 | 
					
						
						
							
							use show password widget in Change Password Activity
						
						
						
						
						
					 | 
					
						2017-12-15 12:31:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a817a96c58
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-15 12:01:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0c8e6170b
							
						
					 | 
					
						
						
							
							limit height of input field to 6 lines
						
						
						
						
						
					 | 
					
						2017-12-15 02:54:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d4586eaea
							
						
					 | 
					
						
						
							
							Conference Details: hide settings in offline mucs
						
						
						
						
						
					 | 
					
						2017-12-15 02:53:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							60ae269870
							
						
					 | 
					
						
						
							
							removed password repeat field in favor of show password field
						
						
						
						
						
					 | 
					
						2017-12-15 02:51:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							38797177c7
							
						
					 | 
					
						
						
							
							ChatMarkers: parse own account from true counterpart
						
						
						
						
						
					 | 
					
						2017-12-14 19:34:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6864878ba
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-14 12:25:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							120ddcf8c9
							
						
					 | 
					
						
						
							
							fixed treatAsDownload() for empty messages
						
						
						
						
						
					 | 
					
						2017-12-14 12:25:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dc68522a2
							
						
					 | 
					
						
						
							
							Handle NFC action in UriHandlerActivity
						
						
						
						
						
					 | 
					
						2017-12-13 21:20:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5f8a4dacb
							
						
					 | 
					
						
						
							
							StartConversationActivity: Scan QR codes via UriHandlerActivity
						
						
						
						
						
					 | 
					
						2017-12-13 21:20:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							75e16d0f54
							
						
					 | 
					
						
						
							
							UriHandlerActivity: Handle 'message action' XMPP URI
						
						
						
						
						
					 | 
					
						2017-12-13 21:20:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							0fac4be94d
							
						
					 | 
					
						
						
							
							XmppUri: Parse 'message action' query
						
						
						
						
						
					 | 
					
						2017-12-13 21:16:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							782b8fb744
							
						
					 | 
					
						
						
							
							fixup for pep omemo notification dedup
						
						
						
						
						
					 | 
					
						2017-12-13 20:28:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							edf3c41e58
							
						
					 | 
					
						
						
							
							Add ShareViaAccountActivity
						
						
						
						
						
					 | 
					
						2017-12-12 17:15:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7927d181b
							
						
					 | 
					
						
						
							
							AccountAdapter: Allow hiding of state button
						
						
						
						
						
					 | 
					
						2017-12-12 17:15:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Schink
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8b7cc2635
							
						
					 | 
					
						
						
							
							Implement simple URI handler activity
						
						
						
						
						
					 | 
					
						2017-12-12 14:05:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a796df2a3
							
						
					 | 
					
						
						
							
							add getAccountJids to DatabaseBackend
						
						
						
						
						
					 | 
					
						2017-12-11 15:56:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							37bd26c75f
							
						
					 | 
					
						
						
							
							save changed server id in replaced messages
						
						
						
						
						
					 | 
					
						2017-12-11 15:55:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							946d97074f
							
						
					 | 
					
						
						
							
							try to detect invalid nick (w/ emoji) in MUCs
						
						
						
						
						
					 | 
					
						2017-12-11 15:55:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							43242a293e
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-09 19:00:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a973833a4f
							
						
					 | 
					
						
						
							
							support error messages in quick edit dialog
						
						
						
						
						
					 | 
					
						2017-12-09 18:46:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d349f634d0
							
						
					 | 
					
						
						
							
							ignore data uri after aesgcm uri
						
						
						
						
						
					 | 
					
						2017-12-09 14:45:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							efd8876001
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-09 10:43:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bdaeb340b
							
						
					 | 
					
						
						
							
							fix format string
						
						
						
						
						
					 | 
					
						2017-12-09 10:42:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							665c5da8ae
							
						
					 | 
					
						
						
							
							fix xmpp uri regression
						
						
						
						
						
					 | 
					
						2017-12-08 18:44:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							172d249369
							
						
					 | 
					
						
						
							
							initialize emoji helper in StartConversationActivity
						
						
						
						
						
					 | 
					
						2017-12-08 18:43:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdee6523e4
							
						
					 | 
					
						
						
							
							fix XmppUri for empty uris
						
						
						
						
						
					 | 
					
						2017-12-08 14:24:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b0cd77c57
							
						
					 | 
					
						
						
							
							XmppConnection: refactor registration code. 'Open Website' on PAYMENT_REQUIRED failure
						
						
						
						
						
					 | 
					
						2017-12-08 14:23:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Georg Lukas
							
						 
					 | 
					
						
						
						
						
							
						
						
							d96180f0ee
							
						
					 | 
					
						
						
							
							XEP-0393: fix off-by-one error in block detector ('`ii`ii')
						
						
						
						
						
					 | 
					
						2017-12-07 14:48:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							328c6dea0f
							
						
					 | 
					
						
						
							
							fixed workaround that allowed us to expire devices
						
						
						
						
						
					 | 
					
						2017-12-07 14:47:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a4b44ee730
							
						
					 | 
					
						
						
							
							Styler: do not style across multiple messages
						
						
						
						
						
					 | 
					
						2017-12-06 16:58:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c489b6a8eb
							
						
					 | 
					
						
						
							
							put device id into setting for doze
						
						
						
						
						
					 | 
					
						2017-12-06 16:57:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							97821f0633
							
						
					 | 
					
						
						
							
							possible fix for retry loop on pgp key annoucement
						
						
						
						
						
					 | 
					
						2017-12-05 19:16:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e6d3db926
							
						
					 | 
					
						
						
							
							Do not show xmpp uris as links that have invalid jids
						
						
						
						
						
					 | 
					
						2017-12-05 19:02:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5885bc7f25
							
						
					 | 
					
						
						
							
							show warning when opening invalid jid
						
						
						
						
						
					 | 
					
						2017-12-05 17:29:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5fe8789e9
							
						
					 | 
					
						
						
							
							Refined avatar generation a bit
						
						
						
						
						
					 | 
					
						2017-12-05 14:15:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							614372dcbb
							
						
					 | 
					
						
						
							
							ConversationsAdapter: Do not show image preview. Show pictogram instead
						
						
						
						
						
					 | 
					
						2017-12-05 14:14:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9869310699
							
						
					 | 
					
						
						
							
							avoid some false positive quotes
						
						
						
						
						
					 | 
					
						2017-12-04 16:50:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							95553750a3
							
						
					 | 
					
						
						
							
							Conference Options: fix context menus for people not in roster
						
						
						
						
						
					 | 
					
						2017-12-03 18:09:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b5db2fb45
							
						
					 | 
					
						
						
							
							read marker from mam. only trust true counterpart when mam:2 is being used
						
						
						
						
						
					 | 
					
						2017-12-02 22:13:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffb3eeb913
							
						
					 | 
					
						
						
							
							MAM: update previously sent messages with server msg id during mam query
						
						
						
						
						
					 | 
					
						2017-12-02 20:52:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc8a5641db
							
						
					 | 
					
						
						
							
							MAM: assume true counterpart is safe to extract when using mam:2
						
						
						
						
						
					 | 
					
						2017-12-02 18:11:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							61f3539839
							
						
					 | 
					
						
						
							
							MAM: do not use private messages when finding last id in muc
						
						
						
						
						
					 | 
					
						2017-12-02 17:48:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							97df4a682b
							
						
					 | 
					
						
						
							
							MessageParser: ignore groupchat messages retrieved from user archive
						
						
						
						
						
					 | 
					
						2017-12-02 17:48:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6449881961
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-12-01 23:16:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							75b4926025
							
						
					 | 
					
						
						
							
							fixed publish-options migration
						
						
						
						
						
					 | 
					
						2017-12-01 18:54:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							23e9c73c94
							
						
					 | 
					
						
						
							
							attempt to enable MAM(ejabberd) on muc configuration
						
						
						
						
						
					 | 
					
						2017-12-01 17:36:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b158e9fd42
							
						
					 | 
					
						
						
							
							do not return muc whispers as last markable message
						
						
						
						
						
					 | 
					
						2017-11-30 17:26:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							86f09dd9b9
							
						
					 | 
					
						
						
							
							PresenceParser: work around for ejabberd not including status code 110 in shut down presence
						
						
						
						
						
					 | 
					
						2017-11-30 13:21:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							21480c9b98
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-11-28 11:15:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							64dd622d32
							
						
					 | 
					
						
						
							
							make 'markable' attribute persistent
						
						
						
						
						
					 | 
					
						2017-11-25 20:55:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f4f30c849
							
						
					 | 
					
						
						
							
							ListItemAdapter: use ViewHolder
						
						
						
						
						
					 | 
					
						2017-11-23 23:26:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d95ff134d9
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-11-23 21:00:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9381c1d3e2
							
						
					 | 
					
						
						
							
							fixed content description for previous ViewHolder refactor
						
						
						
						
						
					 | 
					
						2017-11-23 20:32:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							333e7a6510
							
						
					 | 
					
						
						
							
							deduplicate read markers if one with real jid is found
						
						
						
						
						
					 | 
					
						2017-11-23 18:19:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							513427c8a8
							
						
					 | 
					
						
						
							
							MAM: start muc catchup with last sent message if serverId is available
						
						
						
						
						
					 | 
					
						2017-11-23 18:18:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d04e6331a
							
						
					 | 
					
						
						
							
							ConversationAdapter: use view holder
						
						
						
						
						
					 | 
					
						2017-11-23 09:59:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							900ad2f7ef
							
						
					 | 
					
						
						
							
							ConversationsAdapter: Use EmojiWrapper instead of EmojiTextView
						
						
						
						
						
					 | 
					
						2017-11-23 09:36:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7c5937c20
							
						
					 | 
					
						
						
							
							process emoji charsequence instead of using EmojiTextView
						
						
						
						
						
					 | 
					
						2017-11-22 21:17:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							03c34649b4
							
						
					 | 
					
						
						
							
							shorten >4 names to a, b, c +n more
						
						
						
						
						
					 | 
					
						2017-11-22 17:57:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8696cf2235
							
						
					 | 
					
						
						
							
							PgpService: feed result intent back into decryption
						
						
						
						
						
					 | 
					
						2017-11-22 13:36:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4596cad3cb
							
						
					 | 
					
						
						
							
							MessageParser: don't refresh view after parsing chat state when combined with message
						
						
						
						
						
					 | 
					
						2017-11-21 16:17:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							381fe82b01
							
						
					 | 
					
						
						
							
							save full jid when sending in muc. check chat markers against 'sender'
						
						
						
						
						
					 | 
					
						2017-11-21 15:42:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							79ea0713bb
							
						
					 | 
					
						
						
							
							MessageAdapter: code reformat
						
						
						
						
						
					 | 
					
						2017-11-21 13:26:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							702d6cf2a5
							
						
					 | 
					
						
						
							
							MessageParser: dismiss notification when receiving read marker from another client
						
						
						
						
						
					 | 
					
						2017-11-21 13:26:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							05b6fdb9f1
							
						
					 | 
					
						
						
							
							use empty wake lock tag
						
						
						
						
						
					 | 
					
						2017-11-21 13:25:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							52e09d17e8
							
						
					 | 
					
						
						
							
							MessageAdapter: do not apply empty size spans
						
						
						
						
						
					 | 
					
						2017-11-21 12:41:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9548a4f6af
							
						
					 | 
					
						
						
							
							ConversationAdapter: do not show file icon when file has been deleted
						
						
						
						
						
					 | 
					
						2017-11-21 12:40:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							28e005f926
							
						
					 | 
					
						
						
							
							send and show read markers in private, non-anonymous groups
						
						
						
						
						
					 | 
					
						2017-11-20 11:26:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c65a17ff1
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-11-20 11:16:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1780a4257f
							
						
					 | 
					
						
						
							
							ConversationsAdapter: code cleanup
						
						
						
						
						
					 | 
					
						2017-11-20 11:12:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							47adc9cdcf
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-11-18 11:26:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e452d5d46d
							
						
					 | 
					
						
						
							
							stop scrolling before changing conversations. fixes #2700
						
						
						
						
						
					 | 
					
						2017-11-17 21:00:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e15c48206
							
						
					 | 
					
						
						
							
							refactore phone helper to ignore security exception
						
						
						
						
						
					 | 
					
						2017-11-17 10:28:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								licaon-kter
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1cc8a446f0
							
						
					 | 
					
						
						
							
							Fix typo
						
						
						
						
						
					 | 
					
						2017-11-16 17:02:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							013822fe82
							
						
					 | 
					
						
						
							
							excute db read and writes on different threads
						
						
						
						
						
					 | 
					
						2017-11-16 15:53:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3dbe5db44b
							
						
					 | 
					
						
						
							
							Rename 'conference' to 'group chat'
						
						
						
						
						
					 | 
					
						2017-11-16 13:30:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d42646893
							
						
					 | 
					
						
						
							
							JingleConnection: fixed rare npe when canceling jingle
						
						
						
						
						
					 | 
					
						2017-11-16 12:49:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c52492ada0
							
						
					 | 
					
						
						
							
							apperently some servers will ommit the from even for stanzas not going to them
						
						
						
						
						
					 | 
					
						2017-11-16 12:48:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							75a485cbc1
							
						
					 | 
					
						
						
							
							catch all sorts of date parsing errors
						
						
						
						
						
					 | 
					
						2017-11-16 12:47:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e4440a49a
							
						
					 | 
					
						
						
							
							fixed ImStyleParser to not style '**test**'
						
						
						
						
						
					 | 
					
						2017-11-14 17:57:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3efa1c46ab
							
						
					 | 
					
						
						
							
							remove numeric hint from captcha
						
						
						
						
						
					 | 
					
						2017-11-14 09:14:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							fced4a454e
							
						
					 | 
					
						
						
							
							ConversationsAdapter: Do not show attachment icon + text if attachment is audio or location
						
						
						
						
						
					 | 
					
						2017-11-13 18:37:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e4df80619
							
						
					 | 
					
						
						
							
							Merge branch 'patch-1' of https://github.com/Kandr0s/Conversations into Kandr0s-patch-1
						
						
						
						
						
					 | 
					
						2017-11-13 14:51:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3faf951f47
							
						
					 | 
					
						
						
							
							disable swipe to left to dismiss conversation
						
						
						
						
						
					 | 
					
						2017-11-13 14:51:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kandr0s
							
						 
					 | 
					
						
						
						
						
							
						
						
							308f451959
							
						
					 | 
					
						
						
							
							Show Drawable if Location/File/Voice
						
						
						
						
						
					 | 
					
						2017-11-13 13:39:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c55d78b0a
							
						
					 | 
					
						
						
							
							set attach icons in dark theme to 70% alpha
						
						
						
						
						
					 | 
					
						2017-11-12 19:23:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc9da1fbf4
							
						
					 | 
					
						
						
							
							remove prosody push from blacklist
						
						
						
						
						
					 | 
					
						2017-11-12 19:22:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							49365511e4
							
						
					 | 
					
						
						
							
							trying to catch various dead system exception when scheduling new alarms and such
						
						
						
						
						
					 | 
					
						2017-11-12 19:22:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e93f4519a
							
						
					 | 
					
						
						
							
							catch all RuntimeExceptions when using MetadataRetriever
						
						
						
						
						
					 | 
					
						2017-11-12 19:20:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6d1559755
							
						
					 | 
					
						
						
							
							styler: ignore closing keyword when preceded by whitespace
						
						
						
						
						
					 | 
					
						2017-11-10 20:19:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							513795fdf8
							
						
					 | 
					
						
						
							
							use view context instead activity to show toast in ConversationFragment
						
						
						
						
						
					 | 
					
						2017-11-10 20:18:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6eb08e0ed
							
						
					 | 
					
						
						
							
							catch rare exception when transforming download uri to real path
						
						
						
						
						
					 | 
					
						2017-11-10 20:18:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4638d7eec
							
						
					 | 
					
						
						
							
							catch some more exception when retrieving media runtime
						
						
						
						
						
					 | 
					
						2017-11-10 20:17:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							949d3280d3
							
						
					 | 
					
						
						
							
							open links in new tabs
						
						
						
						
						
					 | 
					
						2017-11-09 20:49:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5c33abe88
							
						
					 | 
					
						
						
							
							MessageAdapter: code cleanup
						
						
						
						
						
					 | 
					
						2017-11-09 20:23:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							459cf09f06
							
						
					 | 
					
						
						
							
							FileProvider: attempt to work with sd cards
						
						
						
						
						
					 | 
					
						2017-11-08 20:34:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e12b2d19a
							
						
					 | 
					
						
						
							
							AndroidManifest: revert ManageAccount activity to single task
						
						
						
						
						
					 | 
					
						2017-11-08 20:33:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							676f181cad
							
						
					 | 
					
						
						
							
							lower priority for error notification
						
						
						
						
						
					 | 
					
						2017-11-08 20:33:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e393de6832
							
						
					 | 
					
						
						
							
							disable auto fill on edit message box
						
						
						
						
						
					 | 
					
						2017-11-08 13:25:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							de46192a8d
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-11-08 13:25:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9587f73ce
							
						
					 | 
					
						
						
							
							styling: introduce support for code blocks
						
						
						
						
						
					 | 
					
						2017-11-07 23:28:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e3b5de6b6
							
						
					 | 
					
						
						
							
							do not quote quotes
						
						
						
						
						
					 | 
					
						2017-11-07 22:22:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5210bbaa0
							
						
					 | 
					
						
						
							
							brought back 'copy to clipboard' and 'quote' context menu options
						
						
						
						
						
					 | 
					
						2017-11-07 15:58:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							129b84bda8
							
						
					 | 
					
						
						
							
							add maintanence intent to renewe instance id
						
						
						
						
						
					 | 
					
						2017-09-22 13:31:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b292a6bbd4
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-09-22 13:28:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3dcc74b23
							
						
					 | 
					
						
						
							
							select presence if necessary when resending file
						
						
						
						
						
					 | 
					
						2017-09-22 11:14:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3be1e964c
							
						
					 | 
					
						
						
							
							execute video compression on seperate thread
						
						
						
						
						
					 | 
					
						2017-09-21 21:54:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5becc2e12
							
						
					 | 
					
						
						
							
							slightly refactor dns resolver
						
						
						
						
						
					 | 
					
						2017-09-21 21:46:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							881d4ad5b7
							
						
					 | 
					
						
						
							
							give exec resolver a lower priority over reflection. fixes #2629
						
						
						
						
						
					 | 
					
						2017-09-21 10:31:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							2eb7197e04
							
						
					 | 
					
						
						
							
							removed unnecessary padding restrictions around emoji messages
						
						
						
						
						
					 | 
					
						2017-09-20 21:04:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							20b14091d6
							
						
					 | 
					
						
						
							
							play audio files inline
						
						
						
						
						
					 | 
					
						2017-09-20 15:35:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							30b6201b95
							
						
					 | 
					
						
						
							
							reworked file params to store audio runtime amoung other things
						
						
						
						
						
					 | 
					
						2017-09-19 22:42:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9733003d0f
							
						
					 | 
					
						
						
							
							removed duplicate code from message bubble layouts
						
						
						
						
						
					 | 
					
						2017-09-19 19:02:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							acc78145db
							
						
					 | 
					
						
						
							
							unified share with menu. fixes #2630
						
						
						
						
						
					 | 
					
						2017-09-19 16:28:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dbd489cbcb
							
						
					 | 
					
						
						
							
							show correct tooltip when long pressing start conversations. fixes #2635
						
						
						
						
						
					 | 
					
						2017-09-19 10:43:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e864935fe
							
						
					 | 
					
						
						
							
							ignore http upload file size constraints for videos that will be compressed
						
						
						
						
						
					 | 
					
						2017-09-18 22:42:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							66dd4dc654
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-09-18 18:26:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0603378c75
							
						
					 | 
					
						
						
							
							show permanent notification while transcoding video
						
						
						
						
						
					 | 
					
						2017-09-18 17:56:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							17e70f55a0
							
						
					 | 
					
						
						
							
							made video thumbnail available during upload
						
						
						
						
						
					 | 
					
						2017-09-18 12:31:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2105dfe46
							
						
					 | 
					
						
						
							
							use lower resolution for videos longer than 8s
						
						
						
						
						
					 | 
					
						2017-09-18 11:54:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4c16b5a85
							
						
					 | 
					
						
						
							
							added dedicated 'record video' attachment button. fixes #2592
						
						
						
						
						
						
						
						thank you @BlauerHunger 
						
					 | 
					
						2017-09-18 11:51:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							22a058ff61
							
						
					 | 
					
						
						
							
							show block menu after long press on allow/add back
						
						
						
						
						
					 | 
					
						2017-09-11 09:53:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							63817ecda1
							
						
					 | 
					
						
						
							
							removed unused 'disable foreground' button
						
						
						
						
						
					 | 
					
						2017-09-11 09:27:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							32b1e5b306
							
						
					 | 
					
						
						
							
							additional null checks around 'read by' intent
						
						
						
						
						
					 | 
					
						2017-09-11 09:23:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0663e04e0a
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-09-10 17:19:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								licaon-kter
							
						 
					 | 
					
						
						
						
						
							
						
						
							200fda141b
							
						
					 | 
					
						
						
							
							Cleanup some unused strings
						
						
						
						
						
					 | 
					
						2017-09-09 18:58:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5cc92acbee
							
						
					 | 
					
						
						
							
							use 'partial' in server info if publish-options is n/a
						
						
						
						
						
						
						
						fixes #2621 
						
					 | 
					
						2017-09-09 13:34:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f824b23ca6
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-09-06 08:38:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							57ca77aa0c
							
						
					 | 
					
						
						
							
							(re)enable message correction by default
						
						
						
						
						
					 | 
					
						2017-09-06 08:38:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8126bc98b4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/invisiblek/Conversations into invisiblek-master
						
						
						
						
						
					 | 
					
						2017-08-31 12:43:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dan Pasanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbce690d4f
							
						
					 | 
					
						
						
							
							NotificationService: add button to mark conversation as read
						
						
						
						
						
					 | 
					
						2017-08-30 11:15:03 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f39ad0f04
							
						
					 | 
					
						
						
							
							make filtered list item activity survive roations
						
						
						
						
						
					 | 
					
						2017-08-28 18:30:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ccb47c5727
							
						
					 | 
					
						
						
							
							get rid of uneccessary 'own omemo fingerprint' string. fixes #2599
						
						
						
						
						
					 | 
					
						2017-08-28 18:15:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d4c8f0191c
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-08-24 10:09:23 +02:00 | 
					
					
						
						
							
							
							
						
					 |