Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6167ddb4a8
							
						
					 | 
					
						
						
							
							don't mark message as delivery_failed when cancel didn't work. fixes #2387
						
						
						
						
						
					 | 
					
						2017-03-19 20:16:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							30ed6b3cec
							
						
					 | 
					
						
						
							
							call messageSent() from UI thread after encrypting pgp message
						
						
						
						
						
					 | 
					
						2017-03-19 20:15:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce336690e2
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-03-17 13:19:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							91a69d7d85
							
						
					 | 
					
						
						
							
							use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec. fixes #2375
						
						
						
						
						
					 | 
					
						2017-03-17 12:56:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							935ac25cbd
							
						
					 | 
					
						
						
							
							update unread counter for image messages. fixes #2376
						
						
						
						
						
					 | 
					
						2017-03-17 12:55:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba32217152
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-03-14 11:09:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							95e33b5a97
							
						
					 | 
					
						
						
							
							never mark conversation w/ own server as stranger
						
						
						
						
						
					 | 
					
						2017-03-14 11:09:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							09d68ae603
							
						
					 | 
					
						
						
							
							fixed entity time for timezones with minutes !=0
						
						
						
						
						
					 | 
					
						2017-03-10 17:25:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b11d0f7f2
							
						
					 | 
					
						
						
							
							version bump to 1.17.0 + changelog
						
						
						
						
						
					 | 
					
						2017-03-10 10:14:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c588ae9eb
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-03-10 10:10:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ee13bbecb
							
						
					 | 
					
						
						
							
							send chat states only to private and non-anon mucs
						
						
						
						
						
					 | 
					
						2017-03-09 15:42:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fd3bbfe25
							
						
					 | 
					
						
						
							
							display chat states in conferences
						
						
						
						
						
					 | 
					
						2017-03-09 10:58:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ea4322d3f
							
						
					 | 
					
						
						
							
							send and parse Chat States to and from conferences
						
						
						
						
						
					 | 
					
						2017-03-09 10:58:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a3c996164
							
						
					 | 
					
						
						
							
							update gradle version
						
						
						
						
						
					 | 
					
						2017-03-09 10:58:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdf2bd07df
							
						
					 | 
					
						
						
							
							use async avatar loading in AccountAdapter
						
						
						
						
						
					 | 
					
						2017-03-09 10:58:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3b2f33956
							
						
					 | 
					
						
						
							
							hide keyboard after setting up account
						
						
						
						
						
					 | 
					
						2017-03-09 10:57:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d56fb3cec2
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-03-09 08:33:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							19b7179bcd
							
						
					 | 
					
						
						
							
							version bump to 1.17.0-beta.2
						
						
						
						
						
					 | 
					
						2017-03-08 22:07:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7747fc0ea1
							
						
					 | 
					
						
						
							
							notify for muc messages after mam catchup
						
						
						
						
						
					 | 
					
						2017-03-08 22:02:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b72e18982
							
						
					 | 
					
						
						
							
							add <x/> element to outgoing MUC PM
						
						
						
						
						
					 | 
					
						2017-03-08 22:01:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f3be1597c
							
						
					 | 
					
						
						
							
							add origin-id to outgoing messages
						
						
						
						
						
					 | 
					
						2017-03-08 21:30:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d043076e8
							
						
					 | 
					
						
						
							
							only take 1:1 conversations into account when determining catchup timestamp
						
						
						
						
						
					 | 
					
						2017-03-08 20:54:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ca16a6f63
							
						
					 | 
					
						
						
							
							do not interpret grin >< as quote
						
						
						
						
						
					 | 
					
						2017-03-08 20:21:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							064926a18b
							
						
					 | 
					
						
						
							
							fixed regression that caused stanza-ids not to be saved
						
						
						
						
						
					 | 
					
						2017-03-08 20:20:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3b51f7654
							
						
					 | 
					
						
						
							
							do not show 'block stranger' snackbar in empty conversations
						
						
						
						
						
					 | 
					
						2017-03-08 11:54:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							233ee8a51c
							
						
					 | 
					
						
						
							
							version bump to 1.17.0-beta + changelog
						
						
						
						
						
					 | 
					
						2017-03-07 20:01:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							721250c7d9
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2017-03-07 18:55:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8502d519c1
							
						
					 | 
					
						
						
							
							changed string from unread conversation to messages in notification
						
						
						
						
						
					 | 
					
						2017-03-07 18:12:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b17734287
							
						
					 | 
					
						
						
							
							Merge branch 'dev' of https://github.com/badarsh2/Conversations into badarsh2-dev
						
						
						
						
						
					 | 
					
						2017-03-07 17:21:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							254edc48f5
							
						
					 | 
					
						
						
							
							show conversation time as last clear date when empty
						
						
						
						
						
					 | 
					
						2017-03-07 11:46:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c951ce2cd
							
						
					 | 
					
						
						
							
							set last clear date to time of last message
						
						
						
						
						
					 | 
					
						2017-03-07 11:45:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								B Adarsh
							
						 
					 | 
					
						
						
						
						
							
						
						
							87f0c4a646
							
						
					 | 
					
						
						
							
							Modifies notification for MUC conversations
						
						
						
						
						
						
						
						Minor fixes
Replaces html.fromHTML with SpannableString 
						
					 | 
					
						2017-03-07 16:10:45 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fae9465d1
							
						
					 | 
					
						
						
							
							show snackbar in conversations with stranger to block. fixes #2358
						
						
						
						
						
					 | 
					
						2017-03-07 11:07:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7306e0286f
							
						
					 | 
					
						
						
							
							do not notify for messages from strangers by default
						
						
						
						
						
					 | 
					
						2017-03-07 10:50:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							857c761c68
							
						
					 | 
					
						
						
							
							fixed sender label for empty conversations
						
						
						
						
						
					 | 
					
						2017-03-07 09:22:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							79b2f34685
							
						
					 | 
					
						
						
							
							added colon to seperate sender and message preview. only show first name
						
						
						
						
						
					 | 
					
						2017-03-06 19:42:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f3543a650
							
						
					 | 
					
						
						
							
							Merge branch 'message-marker' of https://github.com/hareshkh/Conversations into hareshkh-message-marker
						
						
						
						
						
					 | 
					
						2017-03-06 19:07:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ba5335ae7
							
						
					 | 
					
						
						
							
							cleaned code of muc name generator
						
						
						
						
						
					 | 
					
						2017-03-06 19:06:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Haresh Khanna
							
						 
					 | 
					
						
						
						
						
							
						
						
							633aad3193
							
						
					 | 
					
						
						
							
							Adds a message sender label in each conversation for text messages
						
						
						
						
						
					 | 
					
						2017-03-06 23:25:13 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c56b74e41
							
						
					 | 
					
						
						
							
							closing the corresponding conversations after blocking a contact. fixes #2347
						
						
						
						
						
					 | 
					
						2017-03-06 16:53:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a00b11594
							
						
					 | 
					
						
						
							
							extract stanza-id from muc reflections
						
						
						
						
						
					 | 
					
						2017-03-06 13:30:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a7dbaab1e
							
						
					 | 
					
						
						
							
							deduplicate every message with a stanza-id from the server
						
						
						
						
						
					 | 
					
						2017-03-06 11:24:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6088913fb6
							
						
					 | 
					
						
						
							
							fixed multi-session-nick renaming behaviour
						
						
						
						
						
					 | 
					
						2017-03-05 17:42:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa24a057fc
							
						
					 | 
					
						
						
							
							allow Conversations to access user trust store
						
						
						
						
						
					 | 
					
						2017-03-05 11:42:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cae993a95f
							
						
					 | 
					
						
						
							
							renamed enter jid menu item id
						
						
						
						
						
					 | 
					
						2017-03-05 11:40:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb7780eae6
							
						
					 | 
					
						
						
							
							Merge branch 'issue_#2336' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#2336
						
						
						
						
						
					 | 
					
						2017-03-05 08:48:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0ada55b28
							
						
					 | 
					
						
						
							
							use min width of 32dp for swipe handle
						
						
						
						
						
					 | 
					
						2017-03-04 21:20:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f414998307
							
						
					 | 
					
						
						
							
							use default priority notifications. disables heads up notifications
						
						
						
						
						
					 | 
					
						2017-03-04 21:19:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vikiCoder
							
						 
					 | 
					
						
						
						
						
							
						
						
							72537b76c5
							
						
					 | 
					
						
						
							
							fixes #2336 : added an option to directly add a jid to block list from blocklist activity
						
						
						
						
						
					 | 
					
						2017-03-05 01:01:41 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b86dd584dc
							
						
					 | 
					
						
						
							
							made swipe handle more unified and smaller across various screen sizes
						
						
						
						
						
					 | 
					
						2017-03-04 15:07:25 +01:00 | 
					
					
						
						
							
							
							
						
					 |