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
Mark Haines
c838164f40
Make the promises be q promises
2016-11-08 16:26:25 +00:00
Mark Haines
93ddb5539e
Make imports more consistent, fix m.video
2016-11-08 12:57:24 +00:00
Mark Haines
911f9e4e63
Review comments
2016-11-08 11:42:20 +00:00
Mark Haines
dc679a8eca
Fix gif hoverover
2016-11-04 18:41:05 +00:00
Mark Haines
4214c67f8f
Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself.
2016-11-04 18:20:20 +00:00
Mark Haines
1529396ef5
Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded
2016-11-04 18:09:12 +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
6ea0085290
Decrypt m.file attachments
2016-11-04 14:00:26 +00:00
Mark Haines
94bfe31857
Decrypt m.audio attachments
2016-11-04 13:45:00 +00:00
Mark Haines
91123431dd
Fix unencrypted video thumbnail
2016-11-04 13:13:25 +00:00
Mark Haines
71c002d588
Remove spurious TODO
2016-11-04 13:08:17 +00:00
Mark Haines
48cfd4f399
Decypt m.video events
2016-11-04 13:05:34 +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
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
1368d90e66
v0.7.5
2016-11-04 10:09:11 +00:00
David Baker
d7bc408070
Prepare changelog for v0.7.5
2016-11-04 10:09:10 +00:00
David Baker
fa967da2a9
matrix-js-sdk 0.6.4
2016-11-04 10:07:50 +00:00
David Baker
842b5aed56
The variable is called roomId here
2016-11-03 17:13:02 +00:00
Mark Haines
d61714ab8d
Merge branch 'markjh/encrypted-attachments' of github.com:matrix-org/matrix-react-sdk into markjh/encrypted-attachments
2016-11-03 16:39:32 +00:00
Mark Haines
e949d91162
Handle decryption errors
2016-11-03 16:39:20 +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
a8a6a9d73d
v0.7.5-rc.1
2016-11-02 11:08:02 +00:00
David Baker
6cd55e0811
Prepare changelog for v0.7.5-rc.1
2016-11-02 11:08:02 +00:00
David Baker
2cb9e606be
Use released js-sdk
2016-11-02 11:03:52 +00:00
Richard van der Hoff
a6417c287f
Merge pull request #530 from matrix-org/dbkr/no_pack_world
...
Explicitly list files in package.json
2016-11-01 15:27:21 +00:00
David Baker
ce19739899
Remove .npmignore as it's superseeded by 'files'
...
And also seems to be out of date anyway
2016-11-01 15:16:49 +00:00
David Baker
3e8fcac303
Explicitly list file sin package.json
...
To avoid publishing whatever happens to be in the working copy.
Equivalent of https://github.com/vector-im/vector-web/pull/2516
for react-sdk.
2016-11-01 15:15:31 +00:00
David Baker
9e69b48762
Merge pull request #529 from matrix-org/rav/fix_codestyle_quoting
...
Fix some markdown in the code style doc
2016-11-01 13:13:22 +00:00
Richard van der Hoff
86a24fb5de
Fix some markdown ih the code style doc
2016-11-01 11:33:06 +00:00
Matthew Hodgson
8349ea4b0e
fix code style for ES6 classes
2016-11-01 10:58:56 +00:00
David Baker
a53c1958eb
Merge pull request #527 from matrix-org/dbkr/highlight_async
...
Run highlight.js asynchronously
2016-10-27 09:57:23 +01:00
David Baker
974e4c05c8
Merge pull request #528 from matrix-org/rav/fix_tinting
...
Fix room tinting
2016-10-27 09:57:00 +01:00
Richard van der Hoff
6246fdee7c
Fix room tinting
...
Looks like the cachebuster stuff in
https://github.com/vector-im/vector-web/pull/2515 broke room tinting. Add a
fix, along with some ranting.
2016-10-26 23:11:34 +01:00
David Baker
8cf273a460
Run highlight.js asynchronously
...
Move the very minimal logic of highlightDOM into TextualBody
because then we can avoid scheduling a lot of timeouts which
would ultimately do nothing (ie. any messages that don't have code
blocks).
2016-10-26 18:41:28 +01:00
David Baker
8395717f9b
Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join
...
Fix CPU spin on joining rooms
2016-10-26 15:46:42 +01:00
David Baker
32ebd8083b
Stray comma
2016-10-26 15:32:09 +01:00
Richard van der Hoff
b37ba90a38
Merge pull request #526 from matrix-org/dbkr/prevent_read_receipt_exception_logout
...
Don't send read receipt if user has logged out
2016-10-26 14:46:43 +01:00
David Baker
e5a770a373
Don't send read receipt if user has logged out
2016-10-26 13:19:36 +01:00
David Baker
a2eb0a9cf0
Fix CPU spin on joining rooms
...
Ratelimit roomheader's updates and move some other things into
rate limited functions.
2016-10-26 13:09:53 +01:00
David Baker
f56aff7cb9
Merge pull request #523 from matrix-org/dbkr/babelrc2
...
Switch to babel 6, again
2016-10-17 17:02:23 +01:00
David Baker
2faf5702c9
Add plugin that makes babel 6 not break everything
...
Also transform-runtime here because we seem to need it here too
2016-10-17 16:24:19 +01:00
David Baker
f9ef6ba871
Replace stage & es2017 with the specific plugins
2016-10-17 16:24:19 +01:00
David Baker
7436883704
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-17 16:24:12 +01:00
David Baker
923d2264dd
Ignore components with no default export
...
InteractiveAuthEntryComponents is not a single component and
doesn't really fit into the structure: ignore it, otherwise
we crash when loading the skin.
2016-10-17 16:24:09 +01:00
David Baker
8c5fde28d1
remove the presets from karma.conf.js
...
as it seems to pick them up from .babelrc
2016-10-17 16:23:27 +01:00
David Baker
0931f746d8
Move scripts into scripts/
2016-10-17 16:23:27 +01:00
David Baker
bda350dc73
shebang
2016-10-17 16:23:26 +01:00
