-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement default welcome page and allow custom URL /w config #4015
Implement default welcome page and allow custom URL /w config #4015
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm apart from comments
config.sample.json
Outdated
@@ -11,5 +11,6 @@ | |||
"matrix.org" | |||
] | |||
}, | |||
"welcomeUserId": "@RiotBot:matrix.org" | |||
"welcomeUserId": "@RiotBot:matrix.org", | |||
"welcomePageUrl": "https://about.riot.im" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doesn't this want to be home.html?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see, home.html is the default if one isn't defined. I think this is going to provide quite strange behaviour for people who just copy the sample config assuming the values in it are sane (ie. a lot of people probably)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fair enough, I'll just remove it
teamServerUrl: React.PropTypes.string.isRequired, | ||
teamToken: React.PropTypes.string.isRequired, | ||
collapsedRhs: React.PropTypes.bool, | ||
// Team token. Optional. If unset, the homePageUrl will be used |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
url will be used as the team token?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I see what's going on. Comment could probably make this clearer. :)
<body> | ||
<div>Welcome to Riot</div> | ||
</body> | ||
</html> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the long-term intention here? Presumably not a minimal, css-less page?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tom and Ben are working on it (https://lant.uk/misc/welcome/) and we'll have something before new-guest-access
goes live
counterpart to matrix-org/matrix-react-sdk#922