diff options
| author | shpuld <shp@cock.li> | 2018-12-18 22:09:27 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2018-12-18 22:09:27 +0200 |
| commit | 640a28789222035f8d500b8dd4bfc4c9f0cdd1af (patch) | |
| tree | de6e7a72f0a90b8196b1bf99ac0fe4cd5bfe39a2 /src/modules | |
| parent | bd2ed617a740ef3b37dedf3bed608e433dc0ec09 (diff) | |
| parent | 2f28bf95fdce6a215961fe264c236c111e4a1e66 (diff) | |
Merge branch 'develop' into feature/replace-panel-switcher
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/instance.js | 4 | ||||
| -rw-r--r-- | src/modules/users.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/instance.js b/src/modules/instance.js index ab88306f..342bc9ac 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, diff --git a/src/modules/users.js b/src/modules/users.js index 25d1c81f..65b172bc 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -142,6 +142,10 @@ const users = { throw Error(errors) } }, + async getCaptcha (store) { + return await store.rootState.api.backendInteractor.getCaptcha() + }, + logout (store) { store.commit('clearCurrentUser') store.commit('setToken', false) |