diff --git a/README.md b/README.md index b6451f82..10fef736 100644 --- a/README.md +++ b/README.md @@ -68,12 +68,18 @@ to build. is at least v5.x). 1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`. 1. Switch to the riot-web directory: `cd riot-web`. +1. Install the prerequisites: `npm install`. 1. If you're using the `develop` branch then it is recommended to set up a proper development environment ("Setting up a dev environment" below) however one can install the develop versions of the dependencies instead: ```bash scripts/fetch-develop.deps.sh ``` + Note that running `npm install` will undo the symlinks put in place by + `scripts/fetch-develop.deps.sh` so you should run `npm install` first, or + run `npm link matrix-js-sdk` and `npm link matrix-react-sdk` after running + `npm install`. + Whenever you git pull on riot-web you will also probably need to force an update to these dependencies - the simplest way is to re-run the script, but you can also manually update and rebuild them: @@ -93,7 +99,6 @@ to build. Or just use https://riot.im/develop - the continuous integration release of the develop branch. (Note that we don't reference the develop versions in git directly due to https://github.com/npm/npm/issues/3055.) -1. Install the prerequisites: `npm install`. 1. Configure the app by copying `config.sample.json` to `config.json` and modifying it (see below for details). 1. `npm run dist` to build a tarball to deploy. Untaring this file will give diff --git a/electron_app/build/icon.icns b/electron_app/build/icon.icns index d74e97e7..eba95ecf 100644 Binary files a/electron_app/build/icon.icns and b/electron_app/build/icon.icns differ diff --git a/electron_app/build/icon.ico b/electron_app/build/icon.ico index 8f8ff94e..1305b7dd 100644 Binary files a/electron_app/build/icon.ico and b/electron_app/build/icon.ico differ diff --git a/electron_app/build/icons/128x128.png b/electron_app/build/icons/128x128.png index 54149b1a..9c52d669 100644 Binary files a/electron_app/build/icons/128x128.png and b/electron_app/build/icons/128x128.png differ diff --git a/electron_app/build/icons/16x16.png b/electron_app/build/icons/16x16.png index def4ec5e..7435c1b5 100644 Binary files a/electron_app/build/icons/16x16.png and b/electron_app/build/icons/16x16.png differ diff --git a/electron_app/build/icons/24x24.png b/electron_app/build/icons/24x24.png index 6fe144ea..f484995e 100644 Binary files a/electron_app/build/icons/24x24.png and b/electron_app/build/icons/24x24.png differ diff --git a/electron_app/build/icons/256x256.png b/electron_app/build/icons/256x256.png index 563e6d5e..f52d02c8 100644 Binary files a/electron_app/build/icons/256x256.png and b/electron_app/build/icons/256x256.png differ diff --git a/electron_app/build/icons/48x48.png b/electron_app/build/icons/48x48.png index 9cd225d4..fcbcbc49 100644 Binary files a/electron_app/build/icons/48x48.png and b/electron_app/build/icons/48x48.png differ diff --git a/electron_app/build/icons/512x512.png b/electron_app/build/icons/512x512.png index 328a723c..801e1504 100644 Binary files a/electron_app/build/icons/512x512.png and b/electron_app/build/icons/512x512.png differ diff --git a/electron_app/build/icons/64x64.png b/electron_app/build/icons/64x64.png index 20a7a6cf..4a86e56e 100644 Binary files a/electron_app/build/icons/64x64.png and b/electron_app/build/icons/64x64.png differ diff --git a/electron_app/build/icons/96x96.png b/electron_app/build/icons/96x96.png index eb48c2c9..8a998989 100644 Binary files a/electron_app/build/icons/96x96.png and b/electron_app/build/icons/96x96.png differ diff --git a/electron_app/img/riot.ico b/electron_app/img/riot.ico index 8f8ff94e..1305b7dd 100644 Binary files a/electron_app/img/riot.ico and b/electron_app/img/riot.ico differ diff --git a/electron_app/img/riot.png b/electron_app/img/riot.png index 85e9f8ca..aacfc1a8 100644 Binary files a/electron_app/img/riot.png and b/electron_app/img/riot.png differ diff --git a/res/home-status.html b/res/home-status.html deleted file mode 100644 index 7d50470a..00000000 --- a/res/home-status.html +++ /dev/null @@ -1,192 +0,0 @@ - - -
For contributors, developers and Ethereum-enthusiasts who care about the movement for decentralization.
-Please abide by the channels discussion categories and remain on topic to the specific category details listed.
-Before posting please refer to our Code of Conduct
-- Interested in market and cryptocurrency type discussions? -
- Join Telegram -