1821 Commits

Author	SHA1	Message	Date
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	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	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	cb203f5fd3	Keep draft even when correcting previously sent msg ... fixes #1822. Thank you @singhalok641	2017-03-04 08:05:42 +01:00
Haresh Khanna	f2d2966b31	Squash : Adds number of unread messages for every conversation. Fixes #2181	2017-03-04 04:26:19 +05:30
Daniel Gultsch	5c789b75cc	fixed messages vanishing after pgp raised error on editing a message	2017-03-03 15:21:42 +01:00
Daniel Gultsch	58595fccfe	show icons in pop menu with reflection. imagespan was not centred vertically	2017-03-03 12:26:33 +01:00
Daniel Gultsch	768d79c621	Merge branch 'issue_#1200' of https://github.com/vikiCoder/Conversations into vikiCoder-issue_#1200	2017-03-03 12:01:00 +01:00
Daniel Gultsch	afa34ce15a	block send action while encrypting pgp message	2017-03-03 11:56:08 +01:00
vikiCoder	51ef096e01	fixes #1200 : Added icons for the attach options according to material design guidlines	2017-03-03 16:01:44 +05:30
Daniel Gultsch	8cce653a1f	changed default setting for enter_is_send on devices with keyboard	2017-03-02 13:03:30 +01:00
Daniel Gultsch	c740386297	rename the Xmlns class to Namespace	2017-03-01 13:01:46 +01:00
Daniel Gultsch	ea1e28267b	bump mam namespace to :2	2017-03-01 12:50:58 +01:00
Daniel Gultsch	ecd53580c0	show 'show inactive keys' button also when there are no active keys	2017-03-01 12:50:46 +01:00
Daniel Gultsch	23a91e5019	use priority low when creating notification without sound/vibration. ... should prevent notifcations showing up in ambient display	2017-02-28 15:32:57 +01:00
Daniel Gultsch	4cddf31ad2	properly handle onNewIntent() in StartConversations activity ... * fixes a glitch a caused xmpp uris not to open when activiy was already started	2017-02-28 11:48:28 +01:00
Daniel Gultsch	1f4c5ff97c	properly trim() incoming imto: uris	2017-02-27 22:48:25 +01:00
Daniel Gultsch	c7ec82679f	Merge branch 'master' of github.com:siacs/Conversations	2017-02-24 20:00:54 +01:00
Daniel Gultsch	8e0e81a603	bump notification priority to high as per android design guidelines	2017-02-24 19:59:13 +01:00
Daniel Gultsch	0c0ff882a9	make x509 verification node world readable	2017-02-24 19:58:46 +01:00
Daniel Gultsch	a28116753a	Merge pull request #2315 from licaon-kter/lecagy-typo ... Fix a typo in legacy	2017-02-19 18:43:21 +01:00
licaon-kter	d3dd80eec9	Fix a typo in legacy	2017-02-19 15:47:57 +02:00
Daniel Gultsch	0d00ff0c15	migrate domain and host exemption into seperate class	2017-02-19 13:05:40 +01:00
Daniel Gultsch	abaabae853	only change actionbar display options when changed	2017-02-18 18:08:37 +01:00
Daniel Gultsch	c69ad8f52c	npe checks	2017-02-17 10:26:42 +01:00
Daniel Gultsch	cf9ab4d302	synchronize modifications of output stream in tag writer	2017-02-17 10:26:12 +01:00
Daniel Gultsch	4f0e1b71c0	explicitly turn off vibration when disabled. fixes #1255	2017-02-16 13:31:26 +01:00
Daniel Gultsch	caa16a8517	experimental mam legacy compat layer	2017-02-15 16:42:35 +01:00
Daniel Gultsch	6e62b62b80	respond to xep-0184 requests in muc pms	2017-02-15 12:09:36 +01:00
Daniel Gultsch	c7e95d105c	fixed behaviour in message parser when doing mam catchup	2017-02-15 00:08:49 +01:00
Daniel Gultsch	bb249e0881	only extract stanza-id from live messages when disco feature is set	2017-02-14 23:16:51 +01:00
Daniel Gultsch	b90a1fe1db	bump mam namespace	2017-02-14 17:19:45 +01:00
Daniel Gultsch	2665c3a1e0	rethink mam catchup strategies	2017-02-14 16:50:33 +01:00
Daniel Gultsch	9116782cdc	fixed adhoc conference creation behaviour. properly show errors. fixes #2290	2017-02-13 17:32:26 +01:00