Commit Graph

2740 Commits (8c5fde28d13d9bd92972b976e243194b67708ce5)

Author SHA1 Message Date
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
David Baker c7ad9bfdad Add 'getHomeServerName' util to client peg 2016-09-27 19:38:10 +01:00
David Baker b9576754e6 Nomenclature 2016-09-27 14:50:18 +01:00
Richard van der Hoff ea25e48ccb Merge pull request #499 from matrix-org/dbkr/fix_markdown_links
Fix markdown link syntax
2016-09-27 11:57:03 +01:00
Richard van der Hoff e403bcd770 Merge pull request #500 from matrix-org/dbkr/linkify_fail_fast
Fail hard & fast if linkifyjs version is wrong
2016-09-27 11:29:39 +01:00
Richard van der Hoff 30ce35c3b4 Merge pull request #498 from matrix-org/dbkr/fast_lgm
Bring back the little green men without slowness
2016-09-27 11:28:48 +01:00
David Baker 0448dca832 Fail hard & fast if linkifyjs version is wrong
Rather than carrying on an ending up with undefineds deep within the bowels of linkifyjs when we try to linkify a room alias.
2016-09-27 10:38:01 +01:00
David Baker 2be1cc9f85 Give DMRoomMap an explicit makeShared
Otherwise it will hang on to the old state client on logout.
2016-09-27 09:56:31 +01:00
David Baker 9bffd8da75 Fix markdown link syntax 2016-09-26 20:09:36 +01:00
David Baker 690309adfc Bring back the little green men without slowness
Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.
2016-09-26 18:02:14 +01:00
David Baker 2e1644877d Merge pull request #496 from matrix-org/dbkr/directory_search_box
Directory search join button
2016-09-26 15:38:45 +01:00
David Baker ba090a1198 Trailing .+ was redundant 2016-09-26 15:13:57 +01:00
David Baker 9333f91533 Give react callbacks underscores too 2016-09-26 14:29:12 +01:00
David Baker 2dd0165bfc Correct regex for hash at the start 2016-09-26 14:24:35 +01:00
David Baker bbfc05b0c0 Fix name of text emote sending & fix tests 2016-09-26 10:20:56 +01:00
Matthew Hodgson 40ba1ff5aa disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343 2016-09-24 00:43:46 +01:00
David Baker bf037ed6c7 Add comment 2016-09-23 19:09:32 +01:00
David Baker db3f0d298a Make RTE mode use the new Markdown wrapper class
Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode
2016-09-23 18:50:25 +01:00