Commit graph

2761 commits

Author SHA1 Message Date
Mark Haines
e0cea74c7e Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them 2016-11-02 16:26:10 +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
David Baker
c0973940de Remove accidentally comitted babel updgrade hack
Was trying to force it to upgrade babel to the stub babel 6
package rather than leaving the babel 5 ones, but it's too hacky.

Also remove the outdated comment.
2016-10-17 16:23:26 +01:00
David Baker
42ca6e1b41 Reminder to restore package links 2016-10-17 16:23:26 +01:00
David Baker
12ef1cfd9d Check return code
because sometimes babel can just be completely broken
2016-10-17 16:23:26 +01:00
David Baker
eb9f884b53 Stage 0 is a little much 2016-10-17 16:23:26 +01:00
David Baker
9434feb009 Add a script to check the version of babel cli
Because the package has changed so npm can't just auto-upgrade,
so this at least tells people how to fix it when the upgrade
breaks it for everybody.
2016-10-17 16:23:26 +01:00
Aviral Dasgupta
022eb575d9 Upgrade to babel6 and enable some presets. 2016-10-17 16:23:25 +01:00
David Baker
f722456980 Merge pull request #522 from matrix-org/rav/mute_shortcut
Keyboard shortcuts to mute microphone/camera
2016-10-17 14:24:15 +01:00
Richard van der Hoff
4f901f1894 Keyboard shortcuts to mute microphone/camera
Same as hangouts: ctrl-d for mute microphone; ctrl-e to mute camera.
2016-10-17 14:13:56 +01:00
Richard van der Hoff
658224a1bd Merge pull request #520 from matrix-org/dbkr/field_names
Give our input fields names
2016-10-17 10:02:24 +01:00
David Baker
e38b1304fe Merge pull request #521 from matrix-org/revert-519-aviraldg-babelrc
Revert "Switch to babel 6"
2016-10-14 18:50:59 +01:00
David Baker
5b4b81f7dc Revert "Switch to babel 6" 2016-10-14 18:49:52 +01:00
David Baker
8a0f6a0c6e Revert 09d2b2a36c
as babel 6 appears to break sending messages with the non RTE
editor
2016-10-14 18:48:41 +01:00
David Baker
09d2b2a36c Try adding transform-runtime in react-sdk
as it seems the runtime is undefined on the /develop, even though
it works just fine for me locally.
2016-10-14 18:32:52 +01:00
David Baker
5a9148f1cd Merge pull request #519 from matrix-org/aviraldg-babelrc
Switch to babel 6
2016-10-14 18:10:46 +01:00
David Baker
4f261a0e96 Replace stage & es2017 with the specific plugins 2016-10-14 18:02:26 +01:00
David Baker
3f067cbdf6 Give our input fields names
Otherwise browsers' 'Remember Password' feature has to guess
badly and ends up putting the login username / password in the
first two password reset fields which is a bit odd.
2016-10-14 15:34:44 +01:00
David Baker
1f21e690e2 retest 2016-10-13 11:07:59 +01:00
David Baker
8b175880bb Remove transform-runtime
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-13 10:55:58 +01:00
David Baker
1336fe7490 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-13 10:36:11 +01:00
David Baker
74b443f0d3 Merge remote-tracking branch 'origin/develop' into aviraldg-babelrc 2016-10-13 09:49:26 +01:00
David Baker
2873541a1f remove the presets from karma.conf.js
as it seems to pick them up from .babelrc
2016-10-13 09:48:07 +01:00
David Baker
89ca18b556 Move scripts into scripts/ 2016-10-13 09:45:07 +01:00
David Baker
3ebb8a7fa5 shebang 2016-10-13 09:40:47 +01:00
David Baker
445230526f Remove accidentally comitted babel updgrade hack
Was trying to force it to upgrade babel to the stub babel 6
package rather than leaving the babel 5 ones, but it's too hacky.

Also remove the outdated comment.
2016-10-13 09:39:12 +01:00
David Baker
920f498925 Merge pull request #517 from matrix-org/rav/interactive_auth_on_device_delete
Interactive auth for device delete
2016-10-12 18:31:38 +01:00
David Baker
ef22ba1f39 Merge pull request #516 from matrix-org/rav/interactive_auth_dialog
InteractiveAuthDialog
2016-10-12 18:27:23 +01:00