Commit Graph

2932 Commits

Author SHA1 Message Date
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
David Baker
51f6b94c26 Reminder to restore package links 2016-10-12 18:08:13 +01:00
David Baker
d29e19b1a0 Check return code
because sometimes babel can just be completely broken
2016-10-12 17:45:13 +01:00
David Baker
5801bf60aa Stage 0 is a little much 2016-10-12 17:26:43 +01:00
David Baker
4bea0c0818 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-12 16:53:07 +01:00
Richard van der Hoff
999a9e34b9 Merge pull request #514 from matrix-org/dbkr/prevent_email_spam
Prevent spamming emails by reusing client secret
2016-10-12 14:40:39 +01:00
Richard van der Hoff
1e683427da TODO comments on the registration flow
Add some notes to Signup and the Registration component that it would be nice
to factor out some common code someday.
2016-10-12 14:27:21 +01:00
David Baker
eadb55c6b0 Merge branch 'babelrc' of https://github.com/aviraldg/matrix-react-sdk into aviraldg-babelrc 2016-10-12 14:03:21 +01:00
David Baker
213e3dab35 Merge pull request #515 from matrix-org/rav/refactor_captcha_form
Refactor CaptchaForm to put less logic in signupstages
2016-10-12 14:00:50 +01:00
David Baker
b186c8db6b js-sdk develop 2016-10-12 11:48:15 +01:00
David Baker
ff806c3bc3 0.7.4 2016-10-12 11:47:22 +01:00
David Baker
bdb47e96aa Prepare changelog for v0.7.4 2016-10-12 11:47:21 +01:00
David Baker
a62f565bb9 js-sdk 0.6.3 2016-10-12 11:45:59 +01:00
Richard van der Hoff
1a81397d31 InteractiveAuthDialog
A dialog which will take the user through an interactive-auth process
2016-10-12 08:23:28 +01:00
Richard van der Hoff
5c18a9ccca Interactive auth for device delete 2016-10-12 08:23:08 +01:00
Richard van der Hoff
eb36509620 Refactor CaptchaForm to put less logic in signupstages
A bunch of work being done in the Recaptcha signupstage makes more sense in
the CaptchaForm; let's move it.
2016-10-11 18:57:51 +01:00
David Baker
c45b076df9 More commentary 2016-10-11 18:13:26 +01:00
David Baker
6ffb7efc9b Prevent spamming emails by reusing client secret
Generate a client secret in the Signup class (if we don't already
have one) and re-usae it for subsequent attempts to register,
that way the IS can honour the sendAttempt flag and not re-send
the email if we're just retrying and requestToken becomes
idempotent.
2016-10-11 18:08:18 +01:00
David Baker
6ffddabaaa Merge pull request #513 from matrix-org/rav/test_fixes
A bundle of fixes to the react tests
2016-10-11 15:06:37 +01:00
Richard van der Hoff
388839a094 PR feedback 2016-10-11 14:59:35 +01:00
Richard van der Hoff
24bc90f9cc Fix flaky TimelinePanel test
The 'should load new events even if you are scrolled up' test was sometimes
failing. It turned out that pagination *sometimes* wasn't starting soon enough
after setting the scrollTop, and awaitPaginationCompletion was incorrectly
believing it to have already been and gone.

Add an awaitScroll to make sure that we wait long enough for the pagination to
begin.
2016-10-11 14:20:40 +01:00
Richard van der Hoff
78c3d5943a Fix a load of warnings in the tests
Stub things out to make the tests not throw warnings, so we can see the actual
problems.
2016-10-11 14:20:40 +01:00
Richard van der Hoff
515f10bd8b Merge pull request #512 from matrix-org/dbkr/fix_registration_retry
Fix registration retry
2016-10-11 12:00:38 +01:00
David Baker
b62fb50619 Add some docs for the lifetime of Signup 2016-10-11 11:58:10 +01:00
David Baker
30319d8e44 Fix registration retry
We need to clear the current stage & start from the beginning
again when we start a new registration attempt.
2016-10-11 11:12:02 +01:00
Richard van der Hoff
55437d7583 Merge pull request #511 from matrix-org/dbkr/fix_multiple_email_fix
Fix registration
2016-10-11 10:51:13 +01:00
David Baker
55d14d2adc Fix registration
null check
2016-10-11 10:48:44 +01:00
Richard van der Hoff
ea69129d8c Merge pull request #510 from matrix-org/dbkr/fix_multiple_emails
Fix bug where riot would keep requesting tokens
2016-10-11 10:22:16 +01:00
David Baker
acf76c2e28 Fix bug where riot would keep requesting tokens
We 'activeStage' is an object: we need to check the type
2016-10-11 10:18:40 +01:00
David Baker
79011886a8 Set js-sdk dep back to develop 2016-10-05 16:53:26 +01:00