OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,707 Commits
206 Branches
553 Tags
458 MiB
Commit Graph

2707 Commits (2873541a1fab369a3aee2d575ec3e6350ebf6b0c)

Author SHA1 Message Date
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 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
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 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
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
Richard van der Hoff dca19a4940 Merge pull request #506 from matrix-org/dbkr/sign_in_not_log_in 
Use 'Sign In' / 'Sign Out' universally
 2016-09-30 11:30:00 +01:00
Richard van der Hoff 302074c71f Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined 
Prevent error when clicking 'log in'
 2016-09-30 11:04:18 +01:00
Matthew Hodgson ca5204c3f8 fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381 2016-09-30 00:17:52 +01:00
David Baker d5af2d2c52 Use 'Sign In' / 'Sign Out' universally 
Rather than a mix of 'sign in/out' and 'log in/out'
 2016-09-29 17:38:52 +01:00
David Baker 8cbddfcf28 Fix version going blank after logging in 
Don't use replaceState in MatrixClient: there's lots of stuff in
MatrixClient's state now (including the app version) so replacing
the entire state doesn't really make sense (and also blows away
all of the nice defaults we set in getInitialState). Instead,
setState of the things we actually care about wherever we used
replaceState.

Also add a couple of state variables to getInitialState that were
missing.

Fixes https://github.com/vector-im/vector-web/issues/2322
 2016-09-29 17:23:07 +01:00
David Baker 7b28dde263 Prevent error when clicking 'log in' 
If you joined a room before clicking 'log in', it would throw an
exception here and break.
 2016-09-29 16:57:10 +01:00
David Baker 60ce49910a Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper 
Make RTE mode use the new Markdown wrapper class
 2016-09-29 15:33:18 +01:00
David Baker 9a633ee449 Move 'show join button' functionality out 
And have it as a prop to the directory search box instead, so the
room directory can do more complex logic.
 2016-09-29 15:05:15 +01:00
David Baker 66ef1e8156 Merge pull request #501 from matrix-org/dbkr/get_hs_name 
Add 'getHomeServerName' util to client peg
 2016-09-28 10:22:11 +01:00
David Baker 4942f4f35c Typo 2016-09-28 10:17:47 +01:00
Matthew Hodgson b366973151 let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585 2016-09-27 23:39:25 +01:00