This repository was archived by the owner on Sep 11, 2024. It is now read-only.
RTS Welcome Pages#666
Merged
Merged
Conversation
… geektime techfest
Conflicts: src/components/views/avatars/BaseAvatar.js
1 task
Contributor
Author
|
FTR @dbkr I'd like to change this from using local storage as we suggested, to using local storage with a fall-back of query parameter. Local storage will only be set on registration or (in a PR coming soon) logging in. |
dbkr
suggested changes
Feb 7, 2017
Member
dbkr
left a comment
dbkr
left a comment
There was a problem hiding this comment.
Tests are broken as I think you're missing a this.props
| self.notifyNewScreen('directory'); | ||
| if (self.props.config.home_page) { | ||
| self.notifyNewScreen('home'); | ||
| } |
| self.setState({ready: true, page_type: PageTypes.RoomDirectory}); | ||
| if (this._teamToken) { | ||
| self.setState({ready: true, page_type: PageTypes.HomePage}); | ||
| } |
dbkr
approved these changes
Feb 7, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Takes what @ara4n started and makes it use a
mx_team_tokenin localStorage instead of config.json.Goes with element-hq/element-web#3103