65 commits

Author	SHA1	Message	Date
Mark Haines	49b3aec1e2	Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates ... Conflicts: src/ContentMessages.js src/components/views/messages/MImageBody.js	2016-11-11 13:54:07 +00:00
David Baker	1e163eabf0	Revert "Encrypt attachments in encrypted rooms,"	2016-11-11 11:59:08 +00:00
Mark Haines	911f9e4e63	Review comments	2016-11-08 11:42:20 +00:00
Mark Haines	12fc70c671	Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates	2016-11-04 11:52:47 +00:00
David Baker	842b5aed56	The variable is called roomId here	2016-11-03 17:13:02 +00:00
Mark Haines	e0cea74c7e	Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them	2016-11-02 16:26:10 +00:00
Matthew Hodgson	569b6057c3	fix upload for video or image files where sniffing the content.info fails	2016-08-03 13:27:06 +01:00
Will Hunt	4bd2b93f59	Add support for sending uploaded content as m.video	2016-07-19 16:05:15 +01:00
Matthew Hodgson	bfec6d4ed9	merge aviral's audio player	2016-04-13 00:00:24 +01:00
Matthew Hodgson	af5a866596	clear upload bar correctly after upload completes by fixing a race and moving the upload_finished dispatch after clearing up the inprogress uploads data structure. I have zero idea how this ever worked... :/	2016-02-15 21:29:56 +02:00
Matthew Hodgson	0772f50fab	update copyright for 2016	2016-01-07 04:06:52 +00:00
David Baker	4c2fe55fdc	Don't show the error dialog if the request was canceled. Handle 'request entity too large'.	2015-12-03 10:52:06 +00:00
David Baker	e8f5131ed6	Make file uploads cancelable, make them not go weird if you change rooms, error if they fail and move upload status bar out into its own component.	2015-12-02 18:16:16 +00:00
David Baker	2d3b87d56d	Don't set empty mime types on metadata.	2015-10-02 18:37:15 +01:00
David Baker	36ecbfc87f	Upload files and images	2015-07-08 14:34:53 +01:00