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
David Baker
b5cd540e27
0.7.3
2016-10-05 16:51:15 +01:00
David Baker
f6495b1188
Prepare changelog for v0.7.3
2016-10-05 16:51:15 +01:00
David Baker
17a57b13a9
Bump js-sdk to released
2016-10-05 16:49:54 +01:00
David Baker
3756add402
Merge pull request #502 from matrix-org/dbkr/join_3p_location
...
Move 'show join button' functionality out
2016-10-05 14:00:14 +01:00
Richard van der Hoff
cf23db709d
Merge pull request #508 from matrix-org/dbkr/linkify_213
...
Update to linkify 2.1.3
2016-10-04 11:59:00 +01:00
David Baker
7785797be0
Update to linkify 2.1.3
...
To pull in https://github.com/SoapBox/linkifyjs/pull/166
2016-10-04 11:29:13 +01:00
Matthew Hodgson
9d303712f2
more s/Vector/Riot/
2016-10-03 10:18:43 +01:00
Aviral Dasgupta
2d173d83b9
Upgrade to babel6 and enable some presets.
2016-10-02 17:27:45 +05:30
David Baker
91771ec17d
Ce n'est pas Python
2016-10-01 10:34:21 +01:00
David Baker
6abf6c9ec0
Merge pull request #505 from matrix-org/dbkr/dont_replacestate
...
Fix version going blank after logging in
2016-09-30 14:32:01 +01:00
David Baker
be99f17ee0
Oops, right variable
2016-09-30 14:05:01 +01:00
David Baker
8aeb0cfb68
Dedicated function for resetting screen state
2016-09-30 11:56:32 +01:00
David Baker
c41a8da4be
Argh, there's more
2016-09-30 11:40:27 +01:00
David Baker
2f7366cb8a
Comment state fields
2016-09-30 11:37:50 +01:00
