Skip to content
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

Quick and dirty support for custom welcome pages. #2575

Merged
merged 9 commits into from Feb 7, 2017

Conversation

@ara4n
Copy link
Member

ara4n commented Nov 13, 2016

No description provided.

ara4n added 4 commits Nov 13, 2016
ara4n added 4 commits Nov 13, 2016
console.log(error);
this.setState({ page: "Couldn't load home page" });
}
).then(

This comment has been minimized.

Copy link
@dbkr

dbkr Nov 14, 2016

Member

s/then/done/

componentWillMount: function() {
fetch(this.props.config.home_page).then(
(response)=>{
return response.text();

This comment has been minimized.

Copy link
@dbkr

dbkr Nov 14, 2016

Member

NB. that this could be an error response from the server, although arguably it makes about as much sense to display the error page from the server as our own error message.

This comment has been minimized.

Copy link
@lukebarnard1

lukebarnard1 Feb 1, 2017

Contributor

This could default to some default message, "Sorry, your welcome page could not be loaded"?

Riot is built on <a href="https://matrix.org">Matrix</a> - a new open protocol for interoperable and secure decentralised communication.
<br/>
To learn more, head over to <a href="https://matrix.org">Matrix.org</a> - and to better understand Riot, check out the official <a href="https://riot.im">Riot Website</a>.
</p>

This comment has been minimized.

Copy link
@dbkr

dbkr Nov 14, 2016

Member

It would be nice if this could be versioned somewhere else rather than living with the rest of the vector source (especially in the root dir). Ditto for the images.

This comment has been minimized.

Copy link
@lukebarnard1

lukebarnard1 Feb 1, 2017

Contributor

It shall be kept on the RTS, so that solves that!

@dbkr dbkr assigned ara4n and unassigned dbkr Nov 14, 2016
@lukebarnard1 lukebarnard1 assigned lukebarnard1 and unassigned ara4n Feb 1, 2017
@dbkr dbkr merged commit 3155d79 into develop Feb 7, 2017
4 checks passed
4 checks passed
VectorWebBranches Build #484 origin/matthew/homepages succeeded in 8 min 12 sec
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.