Manually merge relevant remaining parts of https://github.com/vector-im/vector-web/pull/790 that aren't covered by @richvdh's PR.

This commit is contained in:
David Baker 2016-02-24 11:59:29 +00:00
parent 8e25a4ca36
commit ef00bc6d56
2 changed files with 16 additions and 0 deletions

View file

@ -7,3 +7,6 @@ include:
* https://github.com/neko259 * https://github.com/neko259
Improved scrollbar CSS Improved scrollbar CSS
* Florent VIOLLEAU (https://github.com/floviolleau) <floviolleau at gmail dot com>
Improve README.md for a better understanding of installation instructions

View file

@ -19,6 +19,19 @@ With `npm start`, any changes you make to the source files will cause a rebuild
your changes will show up when you refresh. This development server also disables your changes will show up when you refresh. This development server also disables
caching, so do NOT use it in production. caching, so do NOT use it in production.
Configuring
===========
Configure the app by modifying the `config.json` file:
1. `default_hs_url` is the default home server url.
1. `default_is_url` is the default identity server url (this is the server used
for verifying third party identifiers like email addresses). If this is blank,
registering with an email address or adding an email address to your account
will not work.
You will need to re-run `npm run build` after editing `config.json`.
Deployment Deployment
========== ==========