diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:44:39 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-12 10:44:39 +0000 |
| commit | eeddceee6baa90c166cfafe2e9759f82d88017b2 (patch) | |
| tree | 8fa6fcfb38048f31607e5003a9e2a0121550a121 /src/main.js | |
| parent | 01c5bae5948b69fa646284c711803fcb21772834 (diff) | |
| parent | d5efa10946239dc1c9e0aa646dc1238a2737c456 (diff) | |
Merge branch 'fixRelativeEmojis' into 'develop'
Fixes broken custom emoji in autocomplete when proxying to remote BE
See merge request pleroma/pleroma-fe!300
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js index bacd7f6d..fa955063 100644 --- a/src/main.js +++ b/src/main.js @@ -79,11 +79,12 @@ const i18n = new VueI18n({ window.fetch('/api/statusnet/config.json') .then((res) => res.json()) .then((data) => { - const {name, closed: registrationClosed, textlimit} = data.site + const {name, closed: registrationClosed, textlimit, server} = data.site store.dispatch('setOption', { name: 'name', value: name }) store.dispatch('setOption', { name: 'registrationOpen', value: (registrationClosed === '0') }) store.dispatch('setOption', { name: 'textlimit', value: parseInt(textlimit) }) + store.dispatch('setOption', { name: 'server', value: server }) }) window.fetch('/static/config.json') |