Merge branch 'restore-routes' into 'develop'

Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
This commit is contained in:
lambda 2018-12-29 13:27:59 +00:00
commit 1555a5fef3
18 changed files with 58 additions and 62 deletions

View file

@ -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,