224 commits

Author	SHA1	Message	Date
Kegsay	fcb1d7a664	Merge pull request #575 from kyrias/commonmark ... Replace marked with commonmark	2017-01-17 11:57:08 +00:00
David Baker	1d5112db5d	Back to develop js-sdk	2017-01-16 13:22:57 +00:00
David Baker	a9256b0ab1	v0.8.5	2017-01-16 13:21:34 +00:00
David Baker	3679e47002	js-sdk 0.7.4	2017-01-16 13:19:24 +00:00
David Baker	3ac9ed7f8f	v0.8.5-rc.1	2017-01-13 11:14:26 +00:00
David Baker	57652c06e3	released js-sdk	2017-01-13 11:13:17 +00:00
Matthew Hodgson	97514cf80e	Merge branch 'master' into develop	2016-12-24 19:03:42 +00:00
Matthew Hodgson	45bfb93f17	v0.8.4	2016-12-24 19:03:08 +00:00
Matthew Hodgson	223caae842	Merge branch 'master' into develop	2016-12-24 18:54:00 +00:00
Matthew Hodgson	1976bb70bd	v0.8.3-electron	2016-12-24 18:53:24 +00:00
David Baker	9cbe401866	Back to js-sdk develop	2016-12-22 14:13:48 +00:00
David Baker	9bf98161a2	v0.8.3	2016-12-22 14:09:42 +00:00
David Baker	57412b3315	released matrix-js-sdk	2016-12-22 14:06:42 +00:00
David Baker	70c7facb6f	matrix-js-sdk dev	2016-12-16 17:30:43 +00:00
David Baker	29a05dda20	v0.8.2	2016-12-16 17:26:13 +00:00
David Baker	03d9d28205	matrix-js-sdk 0.7.2	2016-12-16 17:24:17 +00:00
David Baker	1fbc938f87	js-sdk develop	2016-12-09 19:57:44 +00:00
David Baker	57c56992f1	v0.8.1	2016-12-09 19:53:27 +00:00
David Baker	fc39b35369	One more, one more try	2016-12-09 19:52:40 +00:00
David Baker	8ea299bcea	v0.8.1	2016-12-09 19:51:27 +00:00
David Baker	15f556406f	One more try...	2016-12-09 19:50:02 +00:00
David Baker	fb95b71f7b	v0.8.1	2016-12-09 19:48:27 +00:00
David Baker	3ddeece619	Back to rc temporarily	2016-12-09 19:47:28 +00:00
David Baker	56d51687f9	v0.8.1	2016-12-09 19:34:21 +00:00
David Baker	d0850d67cd	js-sdk 0.7.1	2016-12-09 19:32:27 +00:00
David Baker	a297015d27	v0.8.1-rc.2	2016-12-06 16:04:05 +00:00
David Baker	66f72e674b	v0.8.1-rc.1	2016-12-05 17:51:04 +00:00
David Baker	6693817cdb	released js-sdk	2016-12-05 17:47:54 +00:00
Mark Haines	3aa1e0dd9e	Update browser-encrypt-attachment to v0.3.0 (#570)	2016-12-01 13:12:22 +00:00
Johannes Löthberg	4d2926485b	Replace marked with commonmark ... Marked has some annoying bugs, and the author is inactive, so replace it with commonmark.js, which is the reference JavaScript implementation of CommonMark. CommonMark is also preferable since it has a specification, and a conformance test suite to make sure that parsers are correct. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2016-11-29 23:14:04 +01:00
Richard van der Hoff	6842544cd7	Unpin js-sdk	2016-11-22 22:12:50 +00:00
Mark Haines	b67fcf8109	Bump browser-encrypt-attachment to v0.2.0	2016-11-22 18:18:16 +00:00
Matthew Hodgson	09105608ab	v0.8.0	2016-11-19 02:01:43 +02:00
Richard van der Hoff	d3c9792126	Remove pin on react 15.3 and bump draft-js-export-html instead ... draft-js-export-html have fixed the incompatibility with react 15.4, so we can now update.	2016-11-17 10:15:10 +00:00
Kegan Dougal	3ef0a08493	Pin to 15.3.2 because 15.4.0 is broken and fails with missing CSSProperty file	2016-11-16 17:58:43 +00:00
Mark Haines	13f28e53e1	Generate thumbnails when sending m.image and m.video messages. (#555) ... * Send a thumbnail when sending a m.image * Use the 'thumbnail_file' when displaying encrypted images * Whitespace * Generate thumbnails for m.video * Fix docstring, remove unused vars, use const * Don't change the upload promise behaviour * Polyfill for Canvas.toBlob to support older browsers * Lowercase for integer types in jsdoc	2016-11-15 11:22:39 +00:00
David Baker	062cb7a52e	Add isomorphic fetch ... because the attachment crypto uses it	2016-11-11 17:22:44 +00:00
Mark Haines	0bfcb38879	Add dependency on browser-encrypted-attachment	2016-11-11 14:42:33 +00:00
Mark Haines	23e764604c	Merge remote-tracking branch 'origin/master' into develop	2016-11-11 12:00:53 +00:00
Mark Haines	61921327c2	Merge remote-tracking branch 'origin/master' into develop	2016-11-11 12:00:30 +00:00
David Baker	1e163eabf0	Revert "Encrypt attachments in encrypted rooms,"	2016-11-11 11:59:08 +00:00
David Baker	3e9414b21e	Merge pull request #533 from matrix-org/markjh/encrypted-attachments ... Encrypt attachments in encrypted rooms,	2016-11-09 09:45:01 +00:00
David Baker	c973dbf1c4	0.7.5 has been released	2016-11-04 13:02:12 +00:00
David Baker	1368d90e66	v0.7.5	2016-11-04 10:09:11 +00:00
David Baker	fa967da2a9	matrix-js-sdk 0.6.4	2016-11-04 10:07:50 +00:00
David Baker	46301727c3	Actually add isomorphic-fetch	2016-11-03 15:53:52 +00:00
Mark Haines	e0cea74c7e	Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them	2016-11-02 16:26:10 +00:00
David Baker	f433f9ca32	Move platform-specific functionality into Platform ... Platform classes are provided by the application via PlatformPeg.set().	2016-11-02 15:10:21 +00:00
David Baker	f2e59f1bd3	matrix-js-sdk dep back to develop	2016-11-02 11:10:20 +00:00
David Baker	a8a6a9d73d	v0.7.5-rc.1	2016-11-02 11:08:02 +00:00