7 commits

Author	SHA1	Message	Date
lilia	4b0c70fb44	Resolve multiple conflicts independently ... When resolving multiple conflicts in a conversation, failure to resolve one should not block any others. // FREEBIE	2015-09-15 11:12:47 -07:00
lilia	f764445c86	Remove erroneous license file and headers ... We only use GPLV3 around here. // FREEBIE	2015-09-07 14:58:42 -07:00
lilia	ccfae3c78a	Fix bug in identity key conflict edge case ... When resolving conflicts, we should not only discard the old key, but set the new trusted key to the one the user has verified. Previously, we would end up trusting the first-seen new key, which may not be the one the user verified. // FREEBIE	2015-07-31 17:01:03 -07:00
lilia	0815a96c1d	Display the new key for verification after a conflict	2015-07-20 14:27:11 -07:00
lilia	71715c95bc	Async remove identity	2015-05-05 17:44:57 -07:00
lilia	de65f9e6bd	Add missing resolve	2015-04-15 12:24:29 -07:00
lilia	897d391817	Improve identity key conflict ux ... Clicking on a key conflict message opens the message detail view, which displays the contact(s) in this conversation. If the message contains a key conflict with any of these contacts, a button is displayed which attempts to resolve that conflict and any other conflicts in the conversation that are related to that contact.	2015-03-18 16:29:02 -07:00