9 commits

Author	SHA1	Message	Date
Mark Haines	72d24f58d0	Make the promises be q promises	2016-11-11 13:57:45 +00:00
Mark Haines	bf5ecbd016	Review comments ... Conflicts: src/ContentMessages.js	2016-11-11 13:57:42 +00:00
Mark Haines	ee1768f644	Use data:// URI rather than blob: URI to avoid XSS	2016-11-11 13:55:57 +00:00
Mark Haines	a4a0d02848	Move decryptFile into a utility function so that it can be shared between different components ... Conflicts: src/components/views/messages/MImageBody.js	2016-11-11 13:55:48 +00:00
David Baker	1e163eabf0	Revert "Encrypt attachments in encrypted rooms,"	2016-11-11 11:59:08 +00:00
Mark Haines	c838164f40	Make the promises be q promises	2016-11-08 16:26:25 +00:00
Mark Haines	911f9e4e63	Review comments	2016-11-08 11:42:20 +00:00
Mark Haines	8f778f54fd	Use data:// URI rather than blob: URI to avoid XSS	2016-11-04 15:39:39 +00:00
Mark Haines	b6653dd0ed	Move decryptFile into a utility function so that it can be shared between different components	2016-11-04 12:46:45 +00:00