aboutsummaryrefslogtreecommitdiff
path: root/src/modules/instance.js
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-29 13:27:59 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-29 13:27:59 +0000
commit1555a5fef38dced753c418d736468712ea818975 (patch)
treea7d1fdaa278c34f966dd7b62ba2a9ef125465d0f /src/modules/instance.js
parenta86b80b0544ca93a1b59ff521fd9b1e8bbc3f8c9 (diff)
parentf35dbaf064cfe14ee26053a729ae1c31b76800e2 (diff)
Merge branch 'restore-routes' into 'develop'
Restore old routes, enable user route as fallback. See merge request pleroma/pleroma-fe!440
Diffstat (limited to 'src/modules/instance.js')
-rw-r--r--src/modules/instance.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 546d2cc4..4ad41873 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -12,8 +12,8 @@ const defaultState = {
logo: '/static/logo.png',
logoMask: true,
logoMargin: '.2em',
- redirectRootNoLogin: '/~/main/all',
- redirectRootLogin: '/~/main/friends',
+ redirectRootNoLogin: '/main/all',
+ redirectRootLogin: '/main/friends',
showInstanceSpecificPanel: false,
scopeOptionsEnabled: true,
formattingOptionsEnabled: false,
@@ -33,6 +33,7 @@ const defaultState = {
pleromaBackend: true,
emoji: [],
customEmoji: [],
+ restrictedNicknames: [],
// Feature-set, apparently, not everything here is reported...
mediaProxyAvailable: false,