diff options
| author | Henry Jameson <me@hjkos.com> | 2018-11-26 04:38:44 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-11-26 04:38:44 +0300 |
| commit | e06717fd0dfa4b37ebf481d5f4cd7ce8ef0034d0 (patch) | |
| tree | 7f3f7d27ac932e72ec9b5fbdb41b7c8efb210396 /src/modules/instance.js | |
| parent | 0ca42bd3d63e209f9c1354a30a3123c1f7317579 (diff) | |
| parent | f1a23f2b6edb0858890c82cf42c8b6d835102d56 (diff) | |
Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop:
DM timeline: stream new statuses
update-japanese-translation
Add actual user search.
incorporate most translation changes from MR 368
update french translation
Always show dm panel.
Add direct message tab.
api service url
On logout switch to public timeline.
Put oauth text into description.
Display OAuth login on login form button.
Add login form back in.
Linting.
Re-activate registration, use oauth password flow to fetch token.
Fix typo.
Remove gonsole.logg :DD
Fix linting.
Move login to oauth.
Diffstat (limited to 'src/modules/instance.js')
| -rw-r--r-- | src/modules/instance.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/instance.js b/src/modules/instance.js index e5733831..9a39cccf 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -23,6 +23,7 @@ const defaultState = { disableChat: false, scopeCopy: true, subjectLineBehavior: 'email', + loginMethod: 'password', // Nasty stuff pleromaBackend: true, |