nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
64,590 Commits 258 Branches 582 Tags
develop
Commit Graph

64590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
89ca18b556 Move scripts into scripts/ 2016-10-13 09:45:07 +01:00
David Baker
34c60c69d8 shebang 2016-10-13 09:41:09 +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
5ff915476a Reminder to restore links + stage2, not stage 0 2016-10-12 18:08:52 +01:00
David Baker
51f6b94c26 Reminder to restore package links 2016-10-12 18:08:13 +01:00
David Baker
e5d2ebc57c Add babelcheck.js 
As per 4bea0c0818
 2016-10-12 17:46:11 +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
64815b1b0b Remove babel-polyfill 
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
 2016-10-12 17:23:01 +01:00
David Baker
59120d3019 Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc 2016-10-12 17:17:10 +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
9245ab01f1 js-sdk & react-sdk develop 2016-10-12 11:52:18 +01:00
David Baker
59fe9279d1 0.8.3 v0.8.3 2016-10-12 11:49:58 +01:00
David Baker
046c9ef920 Prepare changelog for v0.8.3 2016-10-12 11:49:57 +01:00
David Baker
bca22f26c5 js-sdk & react-sdk release versions 2016-10-12 11:49:21 +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
2b68b88b14 Merge pull request #2453 from vector-im/rav/center_images_in_dialog_buttons 
Centre images in dialog buttons
 2016-10-11 19:09:46 +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
Richard van der Hoff
97cedfc712 Centre images in dialog buttons 
Some dialogs put a spinner in the button... need to line them up.
 2016-10-11 17:50:49 +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
Matthew Hodgson
86cb3e9376 Merge pull request #2448 from aviraldg/fix-quote 
Only show quote option if RTE is enabled
 2016-10-11 14:39:42 +01:00
Aviral Dasgupta
42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
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
Richard van der Hoff
2a5ca9d3df Merge pull request #2443 from vector-im/dbkr/matrix_network_join_button 
Fix join button for 'matrix' networks
 2016-10-10 11:40:32 +01:00
David Baker
323bd79d0e Fix join button for 'matrix' networks 
Fixes https://github.com/vector-im/vector-web/issues/2435
 2016-10-10 11:21:20 +01:00
Matthew Hodgson
60adbffacf try to fix the create room label 2016-10-10 02:38:38 +01:00
Richard van der Hoff
f827a2963e Merge pull request #2422 from vector-im/dbkr/fix_no_freenode_rooms 
Don't stop paginating if no rooms match
 2016-10-06 10:39:45 +01:00