Merge branch 'develop'

11.26.0
Remove unused import
2019-07-19 03:38:05 +09:00 · 2019-07-19 03:37:48 +09:00 · 2019-07-19 03:37:34 +09:00 · 2019-07-19 03:30:37 +09:00 · 2019-07-19 03:27:53 +09:00 · 2019-07-19 03:27:49 +09:00
152 changed files with 14611 additions and 373 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,3 @@
 *.svg -diff -text
 *.psd -diff -text
 *.ai -diff -text
-yarn.lock -diff -text
-package-lock.json -diff -text
--- a/.gitignore
+++ b/.gitignore
@@ -7,9 +7,6 @@
 # Node.js
 /node_modules

-# yarn
-yarn.lock
-
 # config
 /.config/*
 !/.config/example.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,59 @@
 ChangeLog
 =========

-If you encounter any problems with updating, please try the following:
-1. `npm run clean` or `npm run cleanall`
-2. Retry update (Don't forget `npm i`)
+11.26.0 (2019/07/19)
+--------------------
+### ✨Improvements
+* モデレーターログを記録して確認できるように
+* Mastodonのリンクの所有者認証に対応
+* AP: Delete Person アクティビティを配信するように
+* AP: Delete アクティビティの後にフォロー解除するように
+* AP: アカウント削除でもDelete activityを配信するように
+* Pages: ラジオボタンを追加
+* AdminページのUsers Viewでユーザーのレコードをクリックすることですぐユーザーを照会できるように
+* AdminページのUsers Viewでユーザー一覧からユーザー名とホスト情報で検索できるように
+* 特定ホストへのメンションの特別処理をクライアントに追加
+* 設定画面でデスクトップ・モバイルモード変更時はすぐにrefreshするか伺うように
+* ペーストされたファイル名のテンプレート変更時すぐどのようになるか見れるように
+* （ｺ｀・ﾍ・´ｹ）を追加

-Migration
------------------------------
-#### 1
-```
-npm i -g ts-node
-```
+### 🐛Fixes
+* ログインのログが正しく保存されない問題を修正
+* 同じユーザー名のユーザーが作成できてしまうことがある問題を修正
+* 報告されたレポート内容が表示されない問題を修正
+* 「見つける」のタグが大文字小文字区別されている問題を修正
+* 管理画面のインスタンス一覧でソートが正しく機能していない問題を修正
+* プロフィール設定でバナーに動画を設定すると以降編集ができない問題を修正
+* ウェブ検索エンジンの設定でグリッチが発生する問題を修正
+* MFMの引用がインライン表示になっている問題を修正
+* アンケートの期限入力部分のタイトル表示がおかしい問題を修正
+* 画面上の項目がすべていなくなると実際はロードされてないだけのファイルやフォルダーがあるにも関わらず「もっと読み込む」ボタンがなくなり「このフォルダーは空です」っていうplaceholderが表示されてしまう問題を修正
+* proxy-media後のContent-Typeが違う問題を修正
+* ビルド時にエラーが出るのを修正

-#### 2
-```
-npm run migrate
-```
+11.25.1 (2019/07/09)
+--------------------
+### 🐛Fixes
+* ページイベントが正しくストリームに流れてこない問題を修正
+* フォントの調整
+
+11.25.0 (2019/07/08)
+--------------------
+### ✨Improvements
+* パスワード無しログイン機能
+* MisskeyPagesにイベント送信ボタンを追加
+* MisskeyPagesでボタンを目立たせることができるように
+* ページをピン留めできるように
+* デッキのカラム内でページを見れるように
+* 既定のアップロード先フォルダを設定できるように
+* ファイルをペーストしてアップロードするときのファイル名をカスタマイズできるように
+* 公開以外へのリプライ時元の公開範囲で指定したユーザー情報を引き継ぐように
+* デスクトップ版を使うかモバイル版を使うか手動で設定できるように
+* フォルダーを削除できないときダイアログボックスで知らせるように
+
+### 🐛Fixes
+* postgres redis cache の option が適用されない問題を修正
+* 一部MFMテキストが折り返されず突き抜ける問題を修正

 11.24.2 (2019/07/05)
 --------------------
@@ -36,7 +74,10 @@ npm run migrate

 11.24.0 (2019/07/05)
 --------------------
-注意: このアップデート後に、`node built/tools/accept-migration Init 1000000000000`してください。
+### 注意
+- このアップデート後に、`node built/tools/accept-migration Init 1000000000000`してください。
+- プロセスを起動(もしくは再起動)する前に[マイグレーション](#migration)の手順を実行してください
+

 ### ✨Improvements
 * WebAuthnサポート
@@ -626,9 +667,9 @@ mongodb:
  db: misskey
 ```
 3. migration ブランチに切り替え
-4. `npm i`
-5. `npm run build`
-6. `npm run migrate`
+4. `yarn install`
+5. `yarn build`
+6. `yarn migrate`
 7. master ブランチに戻す
 8. enjoy

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,18 +7,18 @@ Feature suggestions and bug reports are filed in https://github.com/syuilo/missk
 * Please search existing issues to avoid duplication. If your issue is already filed, please add your reaction or comment to the existing one.
 * If you have multiple independent issues, please submit them separately.

-
 ## Localization (l10n)
 Misskey uses [Crowdin](https://crowdin.com/project/misskey) for localization management.
 You can improve our translations with your Crowdin account.
-Changes you make in Crowdin will be merged into develop branch.
+Changes you make in Crowdin will be merged into the develop branch by @syuilo.

-If you can't find the language you want to contribute with, please open an issue.
+If you cannot find the language you want to contribute with, please open an issue.

 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)

 ## Internationalization (i18n)
-Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
+Misskey uses the Vue.js plugin [Vue I18n](https://github.com/kazupon/vue-i18n).
+Documentation of Vue I18n is available at http://kazupon.github.io/vue-i18n/introduction.html .

 ## Documentation
 * Documents for contributors are located in [`/docs`](/docs).
@@ -29,9 +29,15 @@ Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 * Test codes are located in [`/test`](/test).

 ## Continuous integration
-Misskey uses CircleCI for automated test.
+Misskey uses CircleCI for executing automated tests.
 Configuration files are located in [`/.circleci`](/.circleci).

+## FAQ
+
+### How to resolve conflictions occurred at yarn.lock?
+
+Just execute `yarn` to fix it.
+
 ## Glossary
 ### AP
 Stands for _**A**ctivity**P**ub_.
@@ -51,11 +57,15 @@ Convert な(na) to にゃ(nya)
 #### Denyaize
 Revert Nyaize

-## Code style
-### セミコロンを省略しない
-ASI Hazardを避けるためでもある
+## TypeScript Coding Style
+### Do not omit semicolons
+This is to avoid Automatic Semicolon Insertion (ASI) hazard.

-### 中括弧を省略しない
+Ref:
+* https://www.ecma-international.org/ecma-262/#sec-automatic-semicolon-insertion
+* https://github.com/tc39/ecma262/pull/1062
+
+### Do not omit curly brackets
 Bad:
 ``` ts
 if (foo)
@@ -73,18 +83,36 @@ if (foo) {
 }
 ```

-ただし**`if`が一行**の時だけは省略しても良い
+As a special case, you can omit the curly brackets if
+
+* the body of the `if`-statement have only one statement and,
+* the `if`-statement does not have `else`-clause.
+
 Good:
 ``` ts
 if (foo) bar;
 ```

-### `export default`を使わない
-インテリセンスと相性が悪かったりするため
+### Do not use `==` when it can simply be replaced with `===`.
+🥰

-参考:
-* https://gfx.hatenablog.com/entry/2017/11/24/135343
+### Use only boolean (or null related) values in the condition of an `if`-statement.
+Bad:
+``` ts
+if (foo.length)
+```
+
+Good:
+``` ts
+if (foo.length > 0)
+```
+
+### Do not use `export default`
+This is because the current language support does not work well with `export default`.
+
+Ref:
 * https://basarat.gitbooks.io/typescript/docs/tips/defaultIsBad.html
+* https://gfx.hatenablog.com/entry/2017/11/24/135343

 Bad:
 ``` ts
@@ -220,8 +248,7 @@ const user = await Users.findOne(userId).then(ensure);

 ### Migration作成方法
 ```
-npm i -g ts-node
-ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
+npx ts-node ./node_modules/typeorm/cli.js migration:generate -n 変更の名前
 ```

 作成されたスクリプトは不必要な変更を含むため除去してください。
--- a/4
+++ b/4
@@ -23,9 +23,9 @@ RUN apk add --no-cache \
    zlib-dev

 COPY package.json ./
-RUN npm i
+RUN yarn install
 COPY . ./
-RUN npm run build
+RUN yarn build

 FROM base AS runner

--- a/README.md
+++ b/README.md
@@ -125,7 +125,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
-<td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
 <td><img src="https://c8.patreon.com/2/200/17866454" alt="sikyosyounin" width="100"></td>
 <td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/5881381/6235ca5d3fb04c8e95ef5b4ff2abcc18/3.png?token-time=2145916800&token-hash=KjfQL8nf3AIf6WqzLshBYAyX44piAqOAZiYXgZS_H6A%3D" alt="YUKIMOCHI" width="100"></td>
@@ -135,7 +134,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
 <td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
 <td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
-<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
 <td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
 <td><a href="https://www.patreon.com/user?u=17866454">sikyosyounin</a></td>
 <td><a href="https://www.patreon.com/yukimochi">YUKIMOCHI</a></td>
@@ -175,7 +173,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
 <td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
 </tr></table>

-**Last updated:** Mon, 01 Jul 2019 21:44:06 UTC
+**Last updated:** Tue, 16 Jul 2019 10:23:06 UTC
 <!-- PATREON_END -->

 :four_leaf_clover: Copyright
--- a/docs/docker.en.md
+++ b/docs/docker.en.md
@@ -68,7 +68,7 @@ Build misskey with the following:
 *5.* Init DB
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```

 *6.* That is it.
--- a/docs/docker.ja.md
+++ b/docs/docker.ja.md
@@ -68,7 +68,7 @@ cp docker_example.env docker.env
 *5.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-docker-compose run --rm web npm run init
+docker-compose run --rm web yarn run init
 ```

 *6.* 以上です！
--- a/docs/setup.en.md
+++ b/docs/setup.en.md
@@ -27,6 +27,7 @@ Please install and setup these softwares:
 * **[Redis](https://redis.io/)**

 ##### Optional
+* [Yarn](https://yarnpkg.com/) *Optional but recommended for security reason. If you won't install it, use `npx yarn` instead of `yarn`.*
 * [Elasticsearch](https://www.elastic.co/) - required to enable the search feature
 * [FFmpeg](https://www.ffmpeg.org/)

@@ -50,7 +51,7 @@ Please install and setup these softwares:

 5. Install misskey dependencies.

-	`npm install`
+	`yarn`

 *4.* Configure Misskey
 ----------------------------------------------------------------
@@ -65,21 +66,20 @@ Please install and setup these softwares:

 Build misskey with the following:

-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`

 If you're on Debian, you will need to install the `build-essential`, `python` package.

 If you're still encountering errors about some modules, use node-gyp:

-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`

 *6.* Init DB
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```

 *7.* That is it.
@@ -130,12 +130,16 @@ You can check if the service is running with `systemctl status misskey`.
 ### How to update your Misskey server to the latest version
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. Check [ChangeLog](../CHANGELOG.md) for migration information
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`
 6. Restart your Misskey process to apply changes
 7. Enjoy

+If you encounter any problems with updating, please try the following:
+1. `yarn clean` or `yarn cleanall`
+2. Retry update (Don't forget `yarn install`
+
 ----------------------------------------------------------------

 If you have any questions or troubles, feel free to contact us!
--- a/docs/setup.fr.md
+++ b/docs/setup.fr.md
@@ -27,7 +27,8 @@ Installez les paquets suivants :
 * **[Redis](https://redis.io/)**

 ##### Optionnels
-* [Elasticsearch](https://www.elastic.co/) - requis pour pouvoir activer la fonctionnalité de recherche
+* [Yarn](https://yarnpkg.com/) - *recommander pour des raisons de sécurité. Si vous ne l'installez pas, utilisez `npx yarn` au lieu de` yarn`.*
+* [Elasticsearch](https://www.elastic.co/) - *requis pour pouvoir activer la fonctionnalité de recherche.*
 * [FFmpeg](https://www.ffmpeg.org/)

 *3.* Installation de Misskey
@@ -50,7 +51,7 @@ Installez les paquets suivants :
 
 5. Installez les dépendances de misskey.

-	`npm install`
+	`yarn install`

 *4.* Création du fichier de configuration
 ----------------------------------------------------------------
@@ -65,23 +66,22 @@ Installez les paquets suivants :

 Construisez Misskey comme ceci :

-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`

 Si vous êtes sous Debian, vous serez amené à installer les paquets `build-essential` et `python`.

 Si vous rencontrez des erreurs concernant certains modules, utilisez node-gyp:

-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`

 *6.* C'est tout.
 ----------------------------------------------------------------
 Excellent ! Maintenant, vous avez un environnement prêt pour lancer Misskey

 ### Lancement conventionnel
-Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-vous bien !
+Lancez tout simplement `NODE_ENV=production yarn start`. Bonne chance et amusez-vous bien !

 ### Démarrage avec systemd

@@ -124,9 +124,9 @@ Vous pouvez vérifier si le service a démarré en utilisant la commande `system
 ### Méthode de mise à jour vers la plus récente version de Misskey
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration.
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`

 ----------------------------------------------------------------

--- a/docs/setup.ja.md
+++ b/docs/setup.ja.md
@@ -27,6 +27,8 @@ adduser --disabled-password --disabled-login misskey
 * **[Redis](https://redis.io/)**

 ##### オプション
+* [Yarn](https://yarnpkg.com/)
+	* セキュリティの観点から推奨されます。 yarn をインストールしない方針の場合は、文章中の `yarn` を適宜 `npx yarn` と読み替えてください。
 * [Elasticsearch](https://www.elastic.co/)
 	* 検索機能を有効にするためにはインストールが必要です。
 * [FFmpeg](https://www.ffmpeg.org/)
@@ -51,7 +53,7 @@ adduser --disabled-password --disabled-login misskey

 5. Misskeyの依存パッケージをインストール

-	`npm install`
+	`yarn install`

 *4.* 設定ファイルを作成する
 ----------------------------------------------------------------
@@ -66,20 +68,19 @@ adduser --disabled-password --disabled-login misskey

 次のコマンドでMisskeyをビルドしてください:

-`NODE_ENV=production npm run build`
+`NODE_ENV=production yarn build`

 Debianをお使いであれば、`build-essential`パッケージをインストールする必要があります。

 何らかのモジュールでエラーが発生する場合はnode-gypを使ってください:
-1. `npm install -g node-gyp`
-2. `node-gyp configure`
-3. `node-gyp build`
-4. `NODE_ENV=production npm run build`
+1. `npx node-gyp configure`
+2. `npx node-gyp build`
+3. `NODE_ENV=production yarn build`

 *6.* データベースを初期化
 ----------------------------------------------------------------
 ``` shell
-npm run init
+yarn run init
 ```

 *7.* 以上です！
@@ -87,7 +88,7 @@ npm run init
 お疲れ様でした。これでMisskeyを動かす準備は整いました。

 ### 通常起動
-`NODE_ENV=production npm start`するだけです。GLHF!
+`NODE_ENV=production yarn start`するだけです。GLHF!

 ### systemdを用いた起動
 1. systemdサービスのファイルを作成
@@ -120,7 +121,7 @@ npm run init

 3. systemdを再読み込みしmisskeyサービスを有効化

-	`systemctl daemon-reload ; systemctl enable misskey`
+	`systemctl daemon-reload; systemctl enable misskey`

 4. misskeyサービスの起動

@@ -131,11 +132,11 @@ npm run init
 ### Misskeyを最新バージョンにアップデートする方法:
 1. `git checkout master`
 2. `git pull`
-3. `npm install`
-4. `NODE_ENV=production npm run build`
-5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する
+3. `yarn install`
+4. `NODE_ENV=production yarn build`
+5. `yarn migrate`

-なにか問題が発生した場合は、`npm run clean`または`npm run cleanall`すると直る場合があります。
+なにか問題が発生した場合は、`yarn clean`または`yarn cleanall`すると直る場合があります。

 ----------------------------------------------------------------

--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -101,7 +101,8 @@ common:
    submit: "Odeslat"
    reply: "Odpovědět"
    renote: "Renotovat"
-    attach-media-from-local: "Uplodovat soubor z vašeho zařízení"
+    posting: "Posílání"
+    attach-media-from-local: "Nahrát soubor z vašeho zařízení"
    insert-a-kao: "v('ω')v"
    create-poll: "Vytvořit anketu"
    text-remain: "zbývá ještě {} znaků"
@@ -261,6 +262,8 @@ common:
    load-raw-images: "Zobrazovat obrázky v původní kvalitě"
    load-remote-media: "Zobrazovat média ze vzdáleného serveru"
    sync: "Synchronizace"
+    save: "Uložit"
+    saved: "Uloženo"
  search: "Hledání"
  delete: "Odstranit"
  loading: "Načítám..."
@@ -451,9 +454,12 @@ common/views/components/messaging.vue:
  no-history: "Žádná historie"
  user: "Uživatel"
  group: "Skupina"
+  start-with-user: "Zahájit konverzaci s uživatelem"
+  start-with-group: "Zahájit skupinovou konverzaci"
 common/views/components/messaging-room.vue:
  new-message: "Máte novou zprávu"
 common/views/components/messaging-room.form.vue:
+  input-message-here: "Sem zadejte zprávu"
  send: "Odeslat"
  attach-from-local: "Přiložit soubory z Vašeho zařízení"
 common/views/components/messaging-room.message.vue:
@@ -537,6 +543,8 @@ common/views/components/emoji-picker.vue:
  objects: "Objekty"
  symbols: "Symboly"
  flags: "Vlajky"
+common/views/components/settings/app-type.vue:
+  info: "Pro aktivování změn musíte znovu načíst stránky."
 common/views/components/signin.vue:
  username: "Přezdívka"
  password: "Heslo"
@@ -639,6 +647,7 @@ common/views/components/profile-editor.vue:
  saved: "Profil byl úspěšně aktualizován"
  uploading: "Nahrávám"
  upload-failed: "Nahrávání selhalo"
+  unable-to-process: "Operace nemohla být dokončena."
  email: "Nastavení e-mailů"
  email-address: "Emailová adresa"
  email-verified: "Váš e-mail byl ověřen"
@@ -655,6 +664,7 @@ common/views/components/profile-editor.vue:
  danger-zone: "Nebezpečná zóna"
  delete-account: "Smazat účet"
  account-deleted: "Váš účet byl smazán. Může chvilku trvat než zmizí všechna data."
+  metadata-content: "Obsah"
 common/views/components/user-list-editor.vue:
  users: "Uživatel"
  rename: "Přejmenovat seznam"
@@ -728,6 +738,7 @@ desktop:
  avatar: "Avatar"
  uploading-avatar: "Nahrál nový avatar"
  avatar-updated: "Vaše avatar byl aktualizován"
+  unable-to-process: "Operace nemohla být dokončena."
  invalid-filetype: "Tento formát souboru není podporován"
 desktop/views/components/activity.chart.vue:
  total: "Černá ... Celkem"
@@ -764,7 +775,7 @@ desktop/views/components/drive.file.vue:
    rename: "Přejmenovat"
    copy-url: "Kopírovat URL"
    download: "Stáhnout"
-    else-files: "Více..."
+    else-files: "Ostatní"
    set-as-avatar: "Nastavit jako avatar"
    set-as-banner: "Nastavit jako baner"
    open-in-app: "Otevřít v aplikaci"
@@ -782,6 +793,7 @@ desktop/views/components/drive.folder.vue:
    rename: "Přejmenovat"
    rename-folder: "Přejmenovat složku"
    input-new-folder-name: "Zadejte nové jméno"
+    else-folders: "Ostatní"
 desktop/views/components/drive.vue:
  empty-drive-description: "Klikněte pravým tlačítkem myši pro otevření menu, nebo sem přetáhněte soubor pro nahrání."
  empty-folder: "Tato složka je prázdná"
@@ -1035,6 +1047,8 @@ admin/views/users.vue:
  reset-password-confirm: "Opravdu chcete resetovat Vaše heslo?"
  password-updated: "Heslo je nyní \"{password}\""
  update-remote-user: "Aktualizovat informace o vzdáleném účtu"
+  username: "Přezdívka"
+  host: "Hostitel"
  users:
    title: "Uživatel"
    state:
@@ -1051,6 +1065,11 @@ admin/views/users.vue:
 admin/views/moderators.vue:
  add-moderator:
    title: "Vytvořit moderátora"
+  logs:
+    title: "Logy"
+    moderator: "Moderátoři"
+    type: "Operace"
+    info: "Informace"
 admin/views/emoji.vue:
  add-emoji:
    title: "Přidat emoji"
@@ -1265,6 +1284,8 @@ deck/deck.user-column.vue:
 dev/views/new-app.vue:
  app-name-desc: "Jméno vaší aplikace"
 pages:
+  pin-this-page: "Připnout"
+  unpin-this-page: "Odepnout"
  like: "Lajk"
  title: "Titulek"
  blocks:
@@ -1286,6 +1307,8 @@ pages:
      _action:
        _dialog:
          content: "Obsah"
+    _radioButton:
+      title: "Titulek"
  script:
    categories:
      random: "Náhodně"
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -251,6 +251,8 @@ common:
    disable-via-mobile: "Marker aldrig posten som \"fra mobil\""
    load-raw-images: "Vis vedhæftede bilag i original kvalitet"
    load-remote-media: "Vis medie-materiale fra en ekstern server"
+    save: "Gem"
+    saved: "Gemt"
  search: "Søg"
  delete: "Slet"
  loading: "Henter"
@@ -568,6 +570,8 @@ common/views/components/emoji-picker.vue:
  objects: "Objekt"
  symbols: "Symboler"
  flags: "Flag"
+common/views/components/settings/app-type.vue:
+  info: "Du er nødt til at genindlæse siden, før ændringerne slår igennem."
 common/views/components/signin.vue:
  username: "Brugernavn"
  password: "Adgangskode"
@@ -682,6 +686,7 @@ common/views/components/profile-editor.vue:
  saved: "Profil er opdateret med succes"
  uploading: "Overfører"
  upload-failed: "Fejl ved overførsel"
+  unable-to-process: "Handlingen kunne ikke gennemføres."
  email: "Email indstillinger"
  email-address: "Email adresse"
  email-verified: "Din email er blevet bekræftet"
@@ -701,6 +706,7 @@ common/views/components/profile-editor.vue:
  danger-zone: "Risici"
  delete-account: "Slet kontoen"
  account-deleted: "Kontoen er slettet. Det kan vare lidt, inden alle data forsvinder."
+  metadata-content: "Indhold"
 common/views/components/user-list-editor.vue:
  users: "Bruger"
  rename: "Omdøb listen"
@@ -807,6 +813,7 @@ desktop:
  uploading-avatar: "Overfør en ny avatar"
  avatar-updated: "Avatar er overført med succes"
  choose-avatar: "Vælg et billede til din avatar"
+  unable-to-process: "Handlingen kunne ikke gennemføres."
  invalid-filetype: "Denne filtype kan ikke benyttes her"
 desktop/views/components/activity.chart.vue:
  total: "Sort ... Total"
@@ -847,7 +854,7 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "Fjern markering som 'følsom'"
    copy-url: "Kopier webadresse"
    download: "Download"
-    else-files: "Andre"
+    else-files: "Avanceret"
    set-as-avatar: "Vælg som avatar"
    set-as-banner: "Vælg som banner"
    open-in-app: "Åbn i app"
@@ -866,6 +873,7 @@ desktop/views/components/drive.folder.vue:
    rename: "Omdøb"
    rename-folder: "Omdøb mappe"
    input-new-folder-name: "Angiv nyt navn"
+    else-folders: "Avanceret"
 desktop/views/components/drive.vue:
  search: "Søg"
  empty-draghover: "Smid det her! Fordi du ved, at jeg er meget sød, ikke?"
@@ -995,6 +1003,7 @@ common/views/components/drive-settings.vue:
  max: "Kapacitet"
  in-use: "I brug"
  stats: "Statistik"
+  default-upload-folder-name: "Mappe(r)"
 common/views/components/mute-and-block.vue:
  mute-and-block: "Annuller / Bloker"
  mute: "Annuller"
@@ -1272,6 +1281,8 @@ admin/views/users.vue:
  remote-user-updated: "Informationen om den eksterne bruger er nu blevet opdateret."
  delete-all-files: "Slet alle filer"
  delete-all-files-confirm: "Er du sikker på, at alle filerne skal slettes?"
+  username: "Brugernavn"
+  host: "Vært"
  users:
    title: "Bruger"
    sort:
@@ -1302,6 +1313,11 @@ admin/views/moderators.vue:
    added: "Redaktør er oprettet"
    remove: "Fjern"
    removed: "Redaktøren er nu fjernet"
+  logs:
+    title: "Logs"
+    moderator: "Redaktører"
+    type: "Drift"
+    info: "Information"
 admin/views/emoji.vue:
  add-emoji:
    title: "Tilføj emoji"
@@ -1664,6 +1680,8 @@ dev/views/new-app.vue:
  app-name: "Navn på app"
  app-name-placeholder: "F.eks. Misskey for iOS"
 pages:
+  pin-this-page: "Tilknyt til din profil"
+  unpin-this-page: "Fjern tilknytning til din profil"
  like: "Synes om"
  title: "Titel"
  blocks:
@@ -1709,6 +1727,10 @@ pages:
        _dialog:
          content: "Indhold"
        resetRandom: "Nulstil tilfældigt tal"
+    _radioButton:
+      name: "Variabel navn"
+      title: "Titel"
+      default: "Standard værdi"
  script:
    categories:
      flow: "Kontrol"
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -248,6 +248,8 @@ common:
    disable-via-mobile: "Beitrag nicht als „vom Handy“ markieren"
    load-raw-images: "Anhänge in voller Größe laden"
    load-remote-media: "Zeige Inhalte von fremden Servern"
+    save: "Speichern"
+    saved: "Gespeichert"
  search: "Suche"
  delete: "Löschen"
  loading: "Laden"
@@ -565,6 +567,7 @@ common/views/components/profile-editor.vue:
  avatar: "Avatar"
  banner: "Banner"
  save: "Speichern"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
  export: "Exportieren"
  import: "Importieren"
  export-targets:
@@ -598,6 +601,7 @@ common/views/widgets/memo.vue:
  save: "Speichern"
 desktop:
  banner: "Banner"
+  unable-to-process: "Der Vorgang konnte nicht abgeschlossen werden"
 desktop/views/components/activity.chart.vue:
  total: "Schwarz ... komplett"
  notes: "Blau ... Hinweise"
@@ -632,7 +636,6 @@ desktop/views/components/drive.file.vue:
    rename: "Umbenennen"
    copy-url: "URL kopieren"
    download: "Download"
-    else-files: "Anderes…"
    set-as-avatar: "Als Avatar festlegen"
    set-as-banner: "Setze als Banner"
    open-in-app: "In der App öffnen"
@@ -783,6 +786,7 @@ admin/views/drive.vue:
    local: "Lokal"
  delete: "Löschen"
 admin/views/users.vue:
+  username: "Benutzername"
  users:
    origin:
      local: "Lokal"
@@ -911,6 +915,8 @@ dev/views/new-app.vue:
  authority-desc: "Nur die hier eingetragenen Berechtigungen, werden per API zur Verfügung stehen."
  authority-warning: "Dies kann auch nach dem erstellen der Anwendung geändert werden, allerdings werden dann alle bisher generierten Token ungültig."
 pages:
+  pin-this-page: "An die Profilseite pinnen"
+  unpin-this-page: "Lösen"
  like: "Gefällt mir"
  blocks:
    post: "\"Neuer Beitrag\"-Formular"
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -35,6 +35,7 @@ common:
  signout: "Logout"
  reload-to-apply-the-setting: "You'll need to reload the page to reflect this setting. Do you want to reload it now?"
  fetching-as-ap-object: "Inquiring to union"
+  unfollow-confirm: "Do you want to unfollow {name}?"
  got-it: "Got it!"
  customization-tips:
    title: "Customization tips"
@@ -122,6 +123,7 @@ common:
    add-visible-user: "Add a user"
    cw-placeholder: "Comments for the post (optional)"
    username-prompt: "Please enter username"
+    enter-file-name: "Edit file name"
  weekday-short:
    sunday: "S"
    monday: "M"
@@ -188,6 +190,11 @@ common:
    remember-note-visibility: "Remember post visibility"
    web-search-engine: "Web search engine"
    web-search-engine-desc: "Example: https://www.google.com/?#q={{query}}"
+    paste: "Paste"
+    pasted-file-name: "Template for pasted file name"
+    pasted-file-name-desc: "Example: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "Edit the pasted file name"
+    paste-dialog-desc: "Display a dialog to edit the file name when you paste a file."
    keep-cw: "Preserve content warning"
    keep-cw-desc: "When replying to a post, the same content warning is set by default to the reply, as has been set by the original post."
    i-like-sushi: "I prefer sushi rather than pudding"
@@ -271,6 +278,8 @@ common:
    load-raw-images: "Show attached images in original quality"
    load-remote-media: "Show media from a remote server"
    sync: "Sync"
+    save: "Save"
+    saved: "Saved"
    home-profile: "Home profile"
    deck-profile: "Deck profile"
  search: "Search"
@@ -592,6 +601,14 @@ common/views/components/emoji-picker.vue:
  objects: "Objects"
  symbols: "Symbols"
  flags: "Flags"
+common/views/components/settings/app-type.vue:
+  title: "Mode"
+  intro: "You can specify whether you want to use the desktop, or the mobile layout."
+  choices:
+    auto: "Choose layout automatically"
+    desktop: "Always use the desktop layout"
+    mobile: "Always use the mobile layout"
+  info: "You need to reload the page for the changes to take effect."
 common/views/components/signin.vue:
  username: "Username"
  password: "Password"
@@ -695,7 +712,7 @@ common/views/components/profile-editor.vue:
  you-can-include-hashtags: "You can also include hashtags in your profile description."
  language: "Language"
  birthday: "Birthday"
-  avatar: "Icon"
+  avatar: "Avatar"
  banner: "Banner"
  is-cat: "This account is a Cat"
  is-bot: "This account is a Bot"
@@ -708,6 +725,9 @@ common/views/components/profile-editor.vue:
  saved: "Profile updated successfully"
  uploading: "Uploading"
  upload-failed: "Failed to upload"
+  unable-to-process: "The operation could not be completed."
+  avatar-not-an-image: "The file specified as an avatar is not an image"
+  banner-not-an-image: "The file specified as a banner is not an image"
  email: "Email settings"
  email-address: "Email Address"
  email-verified: "Your email has been verified."
@@ -727,6 +747,9 @@ common/views/components/profile-editor.vue:
  danger-zone: "Cautious options"
  delete-account: "Remove the account"
  account-deleted: "The account has been deleted. It may take some time until all of the data disappears."
+  profile-metadata: "Profile metadata"
+  metadata-label: "Label"
+  metadata-content: "Content"
 common/views/components/user-list-editor.vue:
  users: "User"
  rename: "Rename list"
@@ -836,6 +859,7 @@ desktop:
  uploading-avatar: "Uploading a new avatar"
  avatar-updated: "Successfully updated the avatar"
  choose-avatar: "Select an image for the avatar"
+  unable-to-process: "The operation could not be completed."
  invalid-filetype: "This filetype is not acceptable here"
 desktop/views/components/activity.chart.vue:
  total: "Black ... Total"
@@ -876,7 +900,7 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "Unmark as 'sensitive'"
    copy-url: "Copy URL"
    download: "Download"
-    else-files: "Others"
+    else-files: "Other"
    set-as-avatar: "Set as an avatar"
    set-as-banner: "Set as a banner"
    open-in-app: "Open in app"
@@ -886,15 +910,20 @@ desktop/views/components/drive.file.vue:
    copied: "Copied"
    copied-url-to-clipboard: "URL has been copied to clipboard"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "Default Upload location"
  unable-to-process: "The operation could not be completed."
  circular-reference-detected: "The destination folder is a subfolder of the folder you wish to move."
  unhandled-error: "Unknown error"
+  unable-to-delete: "Unable to delete"
+  has-child-files-or-folders: "Since this folder is not empty, it can not be deleted."
  contextmenu:
    move-to-this-folder: "Move to this folder"
    show-in-new-window: "Open in new window"
    rename: "Rename"
    rename-folder: "Rename folder"
    input-new-folder-name: "Enter new name"
+    else-folders: "Other"
+    set-as-upload-folder: "Set as default upload folder"
 desktop/views/components/drive.vue:
  search: "Search"
  empty-draghover: "Drop it here! Yep, cuz you know I'm cute, right?"
@@ -987,7 +1016,7 @@ desktop/views/components/settings.2fa.vue:
  url: "https://www.google.com/landing/2step/"
  caution: "If you lose access to your registered device, you won't be able to connect to Misskey anymore!"
  register: "Register a device"
-  already-registered: "Your account is currently registered to an authenticator application"
+  already-registered: "This device is already registered"
  unregister: "Unregister"
  unregistered: "Two-factor authentication has been disabled."
  enter-password: "Enter the password"
@@ -1009,6 +1038,7 @@ desktop/views/components/settings.2fa.vue:
  register-security-key: "Complete Key registration"
  something-went-wrong: "Wow! There was a problem registering the Key:"
  key-unregistered: "The Key has been deleted"
+  use-password-less-login: "Use Password-less login"
 common/views/components/media-image.vue:
  sensitive: "NSFW"
  click-to-show: "Click to show"
@@ -1033,6 +1063,9 @@ common/views/components/drive-settings.vue:
  max: "Max"
  in-use: "In use"
  stats: "Statistics"
+  default-upload-folder: "Default upload folder location"
+  default-upload-folder-name: "Folder(s)"
+  change-default-upload-folder: "Change folder"
 common/views/components/mute-and-block.vue:
  mute-and-block: "Mute / Block"
  mute: "Mute"
@@ -1339,6 +1372,8 @@ admin/views/users.vue:
  remote-user-updated: "The information regarding the remote user has been updated."
  delete-all-files: "Delete all files"
  delete-all-files-confirm: "Are you sure that you want to delete all files?"
+  username: "Username"
+  host: "Host"
  users:
    title: "Users"
    sort:
@@ -1369,6 +1404,12 @@ admin/views/moderators.vue:
    added: "Registered a Moderator."
    remove: "Discharge"
    removed: "The moderator has been discharged"
+  logs:
+    title: "Logs"
+    moderator: "Moderators"
+    type: "Operations"
+    at: "Timestamp"
+    info: "Information"
 admin/views/emoji.vue:
  add-emoji:
    title: "Add emoji"
@@ -1715,6 +1756,7 @@ deck/deck.user-column.vue:
  activity: "Activity"
  timeline: "Timeline"
  pinned-notes: "Pinned posts"
+  pinned-page: "Pinned page"
 docs:
  edit-this-page-on-github: "Found an error, or do you want to contribute to the documentation?"
  edit-this-page-on-github-link: "Edit this page at GitHub!"
@@ -1749,6 +1791,8 @@ pages:
  are-you-sure-delete: "Do you want to delete this page?"
  page-deleted: "The page has been deleted"
  edit-this-page: "Edit this page"
+  pin-this-page: "Pin to your profile"
+  unpin-this-page: "Unpin"
  view-source: "View Source"
  view-page: "View page"
  like: "Like"
@@ -1767,6 +1811,7 @@ pages:
  url: "Page URL"
  summary: "Summary of page"
  align-center: "Center align"
+  hide-title-when-pinned: "Hide page title when pinned to profile"
  font: "Font"
  fontSerif: "Serif"
  fontSansSerif: "Sans Serif"
@@ -1820,12 +1865,25 @@ pages:
      inc: "Increase number"
    _button:
      text: "Title"
+      colored: "Color"
      action: "Operation when the button pressed"
      _action:
        dialog: "Show a dialog"
        _dialog:
          content: "Content"
        resetRandom: "Reset a random number"
+        pushEvent: "Send an event"
+        _pushEvent:
+          event: "Name of the event"
+          message: "Message to display when pressed"
+          variable: "Variable to send"
+          no-variable: "None"
+    radioButton: "Choices"
+    _radioButton:
+      name: "Variable name"
+      title: "Title"
+      values: "Item of choices that delimited by line breaks"
+      default: "Default value"
  script:
    categories:
      flow: "Control"
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -197,6 +197,8 @@ common:
    update-available-desc: "Las actualizaciones se aplicarán cuando la página se vuelva a cargar."
    advanced-settings: "Configuraciones avanzadas"
    navbar-position-left: "Izquierda"
+    save: "Guardar"
+    saved: "Guardado"
  search: "Buscar"
  delete: "eliminar"
  loading: "cargando"
@@ -458,6 +460,8 @@ common/views/components/emoji-picker.vue:
  objects: "Objetos"
  symbols: "Símbolos"
  flags: "Países"
+common/views/components/settings/app-type.vue:
+  info: "Necesitas recargar la página para que los cambios tengan efecto."
 common/views/components/signin.vue:
  username: "Usuario"
  password: "Contraseña"
@@ -565,6 +569,7 @@ common/views/components/profile-editor.vue:
  saved: "Perfil actualizado con exito"
  uploading: "Subiendo"
  upload-failed: "Error al subir"
+  unable-to-process: "La operación no se puede llevar a cabo"
  email: "Preferencias de correo"
  email-address: "Correo electrónico"
  email-verified: "Tu cuenta de correo ha sido verificada."
@@ -667,6 +672,7 @@ desktop:
  uploading-avatar: "Cargando un nuevo avatar"
  avatar-updated: "Avatar actualizado"
  choose-avatar: "Escoge una imagen de avatar"
+  unable-to-process: "La operación no se puede llevar a cabo"
  invalid-filetype: "Este tipo de archivo no es compatible aquí"
 desktop/views/components/activity.chart.vue:
  total: "Negro ... Total"
@@ -725,6 +731,7 @@ desktop/views/components/drive.folder.vue:
    rename: "Renombrar"
    rename-folder: "Renombrar carpeta"
    input-new-folder-name: "Escribe el nombre nuevo"
+    else-folders: "Otros"
 desktop/views/components/drive.vue:
  search: "Buscar"
  empty-draghover: "¡Saluda!"
@@ -959,12 +966,18 @@ admin/views/drive.vue:
  mark-as-sensitive: "Marcar como 'sensible'"
  unmark-as-sensitive: "Desmarcar como 'sensible'"
 admin/views/users.vue:
+  username: "Usuario"
+  host: "Host"
  users:
    state:
      all: "Todo"
      moderator: "Moderadores"
    origin:
      local: "Local"
+admin/views/moderators.vue:
+  logs:
+    title: "Registros"
+    moderator: "Moderadores"
 admin/views/emoji.vue:
  add-emoji:
    add: "Agregar"
@@ -1091,6 +1104,7 @@ deck:
 deck/deck.user-column.vue:
  activity: "Actividad"
 pages:
+  pin-this-page: "Fijar en el perfil"
  like: "Me gusta"
  blocks:
    post: "Formulario"
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -34,6 +34,7 @@ common:
  signup: "S'enregistrer"
  signout: "Se déconnecter"
  reload-to-apply-the-setting: "Le rechargement de la page est nécessaire pour appliquer ces paramètres. Désirez-vous la recharger maintenant ?"
+  unfollow-confirm: "Désirez-vous vous désabonner de {name} ?"
  got-it: "J’ai compris !"
  customization-tips:
    title: "Conseils de personnalisation"
@@ -266,6 +267,8 @@ common:
    load-raw-images: "Afficher les photos jointes dans leur qualité originale"
    load-remote-media: "Afficher les médias depuis le serveur distant"
    sync: "Synchroniser"
+    save: "Enregistrer"
+    saved: "enregistré"
  search: "Recherche"
  delete: "Supprimer"
  loading: "Chargement en cours …"
@@ -532,8 +535,10 @@ common/views/components/user-menu.vue:
  report-abuse-reported: "Transmit à l’administrateur. Merci de votre collaboration."
  silence: "Mettre en sourdine"
  unsilence: "Enlever la sourdine"
+  silence-confirm: "Êtes-vous surs de vouloir mettre cet·te utilisateur·rice en sourdine ?"
  suspend: "Suspendre"
  unsuspend: "Ne plus suspendre"
+  suspend-confirm: "Êtes-vous surs de vouloir suspendre cet·te utilisateur·rice ?"
 common/views/components/poll.vue:
  vote-to: "Voter pour '{}'"
  vote-count: "{} votes"
@@ -577,6 +582,13 @@ common/views/components/emoji-picker.vue:
  objects: "Objets"
  symbols: "Symboles"
  flags: "Drapeaux"
+common/views/components/settings/app-type.vue:
+  title: "Mode"
+  choices:
+    auto: "Choisir la disposition automatiquement"
+    desktop: "Toujours utiliser la disposition de bureau"
+    mobile: "Toujours utiliser la disposition mobile"
+  info: "Le rechargement de la page est requis afin d'appliquer les modifications."
 common/views/components/signin.vue:
  username: "Nom d'utilisateur·rice"
  password: "Mot de passe"
@@ -587,6 +599,8 @@ common/views/components/signin.vue:
  signin-with-github: "Se connecter avec GitHub"
  signin-with-discord: "Se connecter avec Discord"
  login-failed: "Échec d’authentification. Veuillez vérifier que votre nom d’utilisateur et mot de passe sont corrects."
+  tap-key: "Cliquez sur la clé de sécurité pour vous connecter"
+  enter-2fa-code: "Entrez votre code de vérification"
 common/views/components/signup.vue:
  invitation-code: "Code d’invitation"
  invitation-info: "Si vous n’avez pas de code d’invitation, contactez un <a href=\"{}\">administrateur</a>."
@@ -691,6 +705,7 @@ common/views/components/profile-editor.vue:
  saved: "Profil mis à jour avec succès"
  uploading: "En cours d’envoi …"
  upload-failed: "Échec de l'envoi"
+  unable-to-process: "L'opération n'a pas pu être complétée"
  email: "Paramètres de messagerie"
  email-address: "Adresse de courrier électronique"
  email-verified: "L’adresse du courrier électronique a été vérifiée."
@@ -710,6 +725,7 @@ common/views/components/profile-editor.vue:
  danger-zone: "Zone de danger"
  delete-account: "Supprimer le compte"
  account-deleted: "Le compte a été supprimé. Cela peut prendre un certain temps avant que toutes les données disparaissent."
+  metadata-content: "Contenu"
 common/views/components/user-list-editor.vue:
  users: "Utilisateur·rice"
  rename: "Renommer la liste"
@@ -723,6 +739,7 @@ common/views/components/user-group-editor.vue:
  rename: "Renommer le groupe"
  delete: "Supprimer le groupe"
  transfer: "Transférer de groupe"
+  transfer-are-you-sure: "Êtes vous surs de vouloir ajouter @$2 au groupe $1 ?"
  transferred: "Groupe transféré"
  remove-user: "Enlever un utilisateur de ce groupe"
  delete-are-you-sure: "Désirez-vous vraiment supprimer le groupe $1 ?"
@@ -817,6 +834,7 @@ desktop:
  uploading-avatar: "Téléversement du nouvel avatar"
  avatar-updated: "Mise à jour de l’avatar avec succès"
  choose-avatar: "Choisir un avatar"
+  unable-to-process: "L'opération n'a pas pu être complétée"
  invalid-filetype: "Ce format de fichier n’est pas pris en charge"
 desktop/views/components/activity.chart.vue:
  total: "Noirs ... Total"
@@ -857,7 +875,7 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "Ne pas marquer comme sensible"
    copy-url: "Copier l’URL"
    download: "Télécharger"
-    else-files: "Autres..."
+    else-files: "Avancé"
    set-as-avatar: "Utiliser en tant qu'avatar"
    set-as-banner: "Utiliser en tant que bannière"
    open-in-app: "Ouvrir dans l'application"
@@ -876,6 +894,8 @@ desktop/views/components/drive.folder.vue:
    rename: "Renommer"
    rename-folder: "Renommer le dossier"
    input-new-folder-name: "Entrer un nouveau nom"
+    else-folders: "Avancé"
+    set-as-upload-folder: "Spécifier en tant que dossier de téléversement par défaut"
 desktop/views/components/drive.vue:
  search: "Rechercher"
  empty-draghover: "Drop Welcome!"
@@ -981,6 +1001,13 @@ desktop/views/components/settings.2fa.vue:
  success: "Sauvegarde des paramètres avec succès !"
  failed: "L’opération a échoué. Veuillez vous assurer que le jeton a été saisi correctement."
  info: "À partir de maintenant, à chaque fois que vous vous connectez entrez votre mot de passe ainsi que le jeton généré sur votre appareil."
+  security-key-header: "Clé de sécurité"
+  last-used: "Dernière utilisation :"
+  activate-key: "Cliquez pour activer la clé de sécurité"
+  security-key-name: "Nom de la clé"
+  something-went-wrong: "Oula ! Il y a eu un problème lors de l’enregistrement de la clé."
+  key-unregistered: "La clé a été supprimée"
+  use-password-less-login: "Utiliser une connexion sans mot de passe"
 common/views/components/media-image.vue:
  sensitive: "Contenu sensible"
  click-to-show: "Cliquer pour afficher"
@@ -1005,6 +1032,8 @@ common/views/components/drive-settings.vue:
  max: "Maximale"
  in-use: "utilisé"
  stats: "Statistiques"
+  default-upload-folder-name: "Dossier·s"
+  change-default-upload-folder: "Changer de dossier"
 common/views/components/mute-and-block.vue:
  mute-and-block: "Silencés / Bloqués"
  mute: "Mettre en sourdine"
@@ -1294,6 +1323,9 @@ admin/views/users.vue:
  update-remote-user: "Mettre à jour les informations de l’utilisateur·rice distant·e"
  remote-user-updated: "Les informations de l’utilisateur·rice distant·e ont étés mis à jour"
  delete-all-files: "Supprimer tous les fichiers"
+  delete-all-files-confirm: "Êtes vous surs de vouloir supprimer tous les fichiers ?"
+  username: "Nom d'utilisateur·rice"
+  host: "Hôte"
  users:
    title: "Utilisateur·rice·s"
    sort:
@@ -1324,6 +1356,11 @@ admin/views/moderators.vue:
    added: "Ajouté en tant que modérateur"
    remove: "Révoquer"
    removed: "Le modérateur a été révoqué"
+  logs:
+    title: "Journaux"
+    moderator: "Modérateurs"
+    type: "Actions"
+    info: "Informations"
 admin/views/emoji.vue:
  add-emoji:
    title: "Ajouter un émoji"
@@ -1658,6 +1695,7 @@ deck/deck.user-column.vue:
  activity: "Activité"
  timeline: "Fil d’actualité"
  pinned-notes: "Notes épinglées"
+  pinned-page: "Page épinglée"
 docs:
  edit-this-page-on-github: "Vous avez trouvé une erreur ou vous voulez contribuer à la documentation ?"
  edit-this-page-on-github-link: "Éditez cette page sur GitHub !"
@@ -1692,6 +1730,8 @@ pages:
  are-you-sure-delete: "Confirmez-vous la suppression de cette page ?"
  page-deleted: "La page a bien été supprimée."
  edit-this-page: "Éditer cette page"
+  pin-this-page: "Épingler sur votre profil"
+  unpin-this-page: "Désépingler"
  view-source: "Afficher la source"
  view-page: "Afficher la page"
  like: "Bien"
@@ -1705,6 +1745,7 @@ pages:
  url: "URL de page"
  summary: "Résumé de page"
  align-center: "Centrée"
+  hide-title-when-pinned: "Masquer le titre de la page lorsque celle-ci est épinglée au profil"
  font: "Police de caractères"
  fontSerif: "Serif"
  fontSansSerif: "Sans Serif"
@@ -1757,12 +1798,24 @@ pages:
      inc: "Augmenter le chiffre"
    _button:
      text: "Titre"
+      colored: "Couleur"
      action: "L'opération lorsque le bouton sera pressé"
      _action:
        dialog: "Afficher une fenêtre de dialogue"
        _dialog:
          content: "Contenu"
        resetRandom: "Réinitialiser le nombre aléatoire"
+        pushEvent: "Envoyer un évènement"
+        _pushEvent:
+          event: "Nom de l'évènement"
+          message: "Message à afficher lorsque appuyé"
+          variable: "Variable à envoyer"
+          no-variable: "Aucune"
+    radioButton: "Choix"
+    _radioButton:
+      name: "Nom de la variable"
+      title: "Titre"
+      default: "Valeur par défaut"
  script:
    categories:
      flow: "Contrôle"
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -129,6 +129,7 @@ common:
    add-visible-user: "ユーザーを追加"
    cw-placeholder: "内容への注釈 (オプション)"
    username-prompt: "ユーザー名を入力してください"
+    enter-file-name: "ファイル名を編集"

  weekday-short:
    sunday: "日"
@@ -201,6 +202,11 @@ common:
    remember-note-visibility: "投稿の公開範囲を記憶する"
    web-search-engine: "ウェブ検索エンジン"
    web-search-engine-desc: "例: https://www.google.com/?#q={{query}}"
+    paste: "ペースト"
+    pasted-file-name: "ペーストされたファイル名のテンプレート"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "ペースト時にファイル名を編集"
+    paste-dialog-desc: "ペースト時にファイル名を編集するダイアログを表示するようにします。"
    keep-cw: "CW保持"
    keep-cw-desc: "投稿にリプライする際、リプライ元の投稿にCWが設定されていたとき、デフォルトで同じCWを設定するようにします。"
    i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
@@ -284,6 +290,8 @@ common:
    load-raw-images: "添付された画像を高画質で表示する"
    load-remote-media: "リモートサーバーのメディアを表示する"
    sync: "同期"
+    save: "保存"
+    saved: "保存しました"
    home-profile: "ホームのプロファイル"
    deck-profile: "デッキのプロファイル"

@@ -637,6 +645,15 @@ common/views/components/emoji-picker.vue:
  symbols: "記号"
  flags: "旗"

+common/views/components/settings/app-type.vue:
+  title: "モード"
+  intro: "デスクトップ版とモバイル版のどちらを使うかを指定できます。"
+  choices:
+    auto: "自動で選択"
+    desktop: "デスクトップ版に固定"
+    mobile: "モバイル版に固定"
+  info: "変更はページの再度読み込み後に反映されます。"
+
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -765,6 +782,9 @@ common/views/components/profile-editor.vue:
  saved: "プロフィールを保存しました"
  uploading: "アップロード中"
  upload-failed: "アップロードに失敗しました"
+  unable-to-process: "操作を完了できません"
+  avatar-not-an-image: "アイコンとして指定したファイルは画像ではありません"
+  banner-not-an-image: "バナーとして指定したファイルは画像ではありません"
  email: "メール設定"
  email-address: "メールアドレス"
  email-verified: "メールアドレスが確認されました"
@@ -784,6 +804,9 @@ common/views/components/profile-editor.vue:
  danger-zone: "危険な設定"
  delete-account: "アカウントを削除"
  account-deleted: "アカウントが削除されました。データが消えるまで時間がかかる場合があります。"
+  profile-metadata: "プロフィール補足情報"
+  metadata-label: "ラベル"
+  metadata-content: "内容"

 common/views/components/user-list-editor.vue:
  users: "ユーザー"
@@ -910,6 +933,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしています"
  avatar-updated: "アバターを更新しました"
  choose-avatar: "アバターにする画像を選択"
+  unable-to-process: "操作を完了できません"
  invalid-filetype: "この形式のファイルはサポートされていません"

 desktop/views/components/activity.chart.vue:
@@ -958,7 +982,7 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "閲覧注意を解除"
    copy-url: "URLをコピー"
    download: "ダウンロード"
-    else-files: "その他..."
+    else-files: "その他"
    set-as-avatar: "アイコンに設定"
    set-as-banner: "バナーに設定"
    open-in-app: "アプリで開く"
@@ -969,15 +993,20 @@ desktop/views/components/drive.file.vue:
    copied-url-to-clipboard: "URLをクリップボードにコピーしました"

 desktop/views/components/drive.folder.vue:
+  upload-folder: "既定アップロード先"
  unable-to-process: "操作を完了できません"
  circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
  unhandled-error: "不明なエラー"
+  unable-to-delete: "削除できません"
+  has-child-files-or-folders: "このフォルダは空でないため、削除できません。"
  contextmenu:
    move-to-this-folder: "このフォルダへ移動"
    show-in-new-window: "新しいウィンドウで表示"
    rename: "名前を変更"
    rename-folder: "フォルダ名の変更"
    input-new-folder-name: "新しいフォルダ名を入力してください"
+    else-folders: "その他"
+    set-as-upload-folder: "既定アップロード先に設定"

 desktop/views/components/drive.vue:
  search: "検索"
@@ -1112,6 +1141,7 @@ desktop/views/components/settings.2fa.vue:
  register-security-key: "キーの登録を完了"
  something-went-wrong: "わー！ キーを登録する際に問題が発生しました:"
  key-unregistered: "キーが削除されました"
+  use-password-less-login: "パスワードなしのログインを使用"

 common/views/components/media-image.vue:
  sensitive: "閲覧注意"
@@ -1140,6 +1170,9 @@ common/views/components/drive-settings.vue:
  max: "容量"
  in-use: "使用中"
  stats: "統計"
+  default-upload-folder: "既定のアップロード先フォルダ"
+  default-upload-folder-name: "フォルダ"
+  change-default-upload-folder: "フォルダを変更"

 common/views/components/mute-and-block.vue:
  mute-and-block: "ミュートとブロック"
@@ -1472,6 +1505,8 @@ admin/views/users.vue:
  remote-user-updated: "リモートユーザー情報を更新しました"
  delete-all-files: "すべてのファイルを削除"
  delete-all-files-confirm: "すべてのファイルを削除しますか？"
+  username: "ユーザー名"
+  host: "ホスト"
  users:
    title: "ユーザー"
    sort:
@@ -1503,6 +1538,12 @@ admin/views/moderators.vue:
    added: "モデレーターを登録しました"
    remove: "解除"
    removed: "モデレーター登録を解除しました"
+  logs:
+    title: "ログ"
+    moderator: "モデレーター"
+    type: "操作"
+    at: "日時"
+    info: "情報"

 admin/views/emoji.vue:
  add-emoji:
@@ -1906,6 +1947,7 @@ deck/deck.user-column.vue:
  activity: "アクティビティ"
  timeline: "タイムライン"
  pinned-notes: "ピン留めされた投稿"
+  pinned-page: "ピン留めされたページ"

 docs:
  edit-this-page-on-github: "間違いや改善点を見つけましたか？"
@@ -1945,6 +1987,8 @@ pages:
  are-you-sure-delete: "このページを削除しますか？"
  page-deleted: "ページを削除しました"
  edit-this-page: "このページを編集"
+  pin-this-page: "ピン留め"
+  unpin-this-page: "ピン留め解除"
  view-source: "ソースを表示"
  view-page: "ページを見る"
  like: "いいね"
@@ -1963,6 +2007,7 @@ pages:
  url: "ページURL"
  summary: "ページの要約"
  align-center: "中央寄せ"
+  hide-title-when-pinned: "ピン留めされているときにタイトルを非表示"
  font: "フォント"
  fontSerif: "セリフ"
  fontSansSerif: "サンセリフ"
@@ -2024,12 +2069,26 @@ pages:

    _button:
      text: "タイトル"
+      colored: "色付き"
      action: "ボタンを押したときの動作"
      _action:
        dialog: "ダイアログを表示する"
        _dialog:
          content: "内容"
        resetRandom: "乱数をリセット"
+        pushEvent: "イベントを送信させる"
+        _pushEvent:
+          event: "イベント名"
+          message: "押したときに表示するメッセージ"
+          variable: "送信する変数"
+          no-variable: "なし"
+
+    radioButton: "選択肢"
+    _radioButton:
+      name: "変数名"
+      title: "タイトル"
+      values: "改行で区切った選択肢"
+      default: "デフォルト値"

  script:
    categories:
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -123,6 +123,8 @@ common:
    password: "パスワード"
    other: "その他"
    timeline: "タイムライン"
+    save: "保存"
+    saved: "保存したで！"
  search: "検索"
  delete: "削除"
  loading: "読み込み中"
@@ -363,6 +365,8 @@ common/views/components/emoji-picker.vue:
  objects: "物"
  symbols: "記号"
  flags: "旗"
+common/views/components/settings/app-type.vue:
+  info: "ページもっぺん読み込んだら反映したるで。"
 common/views/components/signin.vue:
  username: "ユーザー名"
  password: "パスワード"
@@ -468,6 +472,7 @@ common/views/components/profile-editor.vue:
  saved: "プロフィールを保存したで"
  uploading: "アップロードしとります"
  upload-failed: "これアップロードでけへんわ"
+  unable-to-process: "あかん、無理やわ"
  email: "メール設定"
  email-address: "メールアドレス"
  email-verified: "このメールアドレスOKや！"
@@ -561,6 +566,7 @@ desktop:
  uploading-avatar: "新しいアバターをアップロードしとるで"
  avatar-updated: "アバターを更新したで"
  choose-avatar: "アバターにする画像選んでや"
+  unable-to-process: "あかん、無理やわ"
  invalid-filetype: "この形式のファイル無理やねん"
 desktop/views/components/activity.chart.vue:
  total: "黒いの ... 全部"
@@ -601,7 +607,7 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "やっぱ見せたるわ"
    copy-url: "URLをコピー"
    download: "ダウンロード"
-    else-files: "まだあんで..."
+    else-files: "その他"
    set-as-avatar: "アイコンにする"
    set-as-banner: "バナーにする"
    open-in-app: "アプリで開く"
@@ -620,6 +626,7 @@ desktop/views/components/drive.folder.vue:
    rename: "名前を変えるで"
    rename-folder: "フォルダ名を変えるで"
    input-new-folder-name: "新しいフォルダ名を入力してや"
+    else-folders: "その他"
 desktop/views/components/drive.vue:
  search: "検索"
  empty-draghover: "ドロップするにゃ！お魚以外なら何でもいいにゃ！"
@@ -747,6 +754,7 @@ common/views/components/drive-settings.vue:
  max: "容量"
  in-use: "使うとる"
  stats: "統計"
+  default-upload-folder-name: "フォルダ"
 common/views/components/mute-and-block.vue:
  mute-and-block: "ミュートとブロック"
  mute: "ミュート"
@@ -938,6 +946,8 @@ admin/views/users.vue:
  reset-password: "パスワードをリセット"
  password-updated: "パスワードは現在「{password} 」やで"
  suspend: "凍結"
+  username: "ユーザー名"
+  host: "ホスト"
  users:
    title: "ユーザー"
    state:
@@ -945,6 +955,11 @@ admin/views/users.vue:
      moderator: "モデレーター"
    origin:
      local: "ローカル"
+admin/views/moderators.vue:
+  logs:
+    moderator: "モデレーター"
+    type: "操作"
+    info: "情報"
 admin/views/emoji.vue:
  add-emoji:
    add: "増やす"
@@ -1234,6 +1249,8 @@ dev/views/new-app.vue:
  authority-desc: "ここにチェックした機能しかAPIからアクセスできひんから気ぃつけてな"
  authority-warning: "アプリ作った後でも変えれるけど、新しいやつ追加したらそん時関連付いてるユーザーキーは全部ほかされるで。"
 pages:
+  pin-this-page: "ピン留め"
+  unpin-this-page: "ピン留めやめる"
  like: "ええやん"
  blocks:
    image: "画像"
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -123,6 +123,7 @@ common:
    add-visible-user: "사용자 추가"
    cw-placeholder: "내용에 대한 주석 (옵션)"
    username-prompt: "사용자명을 입력해주세요"
+    enter-file-name: "파일 이름 수정"
  weekday-short:
    sunday: "일"
    monday: "월"
@@ -189,6 +190,11 @@ common:
    remember-note-visibility: "글의 공개 범위를 기억하기"
    web-search-engine: "웹 검색엔진"
    web-search-engine-desc: "예: https://www.google.com/?#q={{query}}"
+    paste: "붙여넣기"
+    pasted-file-name: "붙여넣은 파일의 이름 템플릿"
+    pasted-file-name-desc: "예시: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "붙여넣기 시 파일 이름을 편집"
+    paste-dialog-desc: "붙여넣기 시 파일 이름을 편집할 수 있도록 대화 상자를 표시합니다."
    keep-cw: "CW 유지"
    keep-cw-desc: "글에 답글을 달 때, 답글할 글에 CW가 설정되어 있는 경우 기본값으로 동일한 CW를 설정하도록 합니다."
    i-like-sushi: "저는 (푸딩보다 차라리) 초밥이 좋아요"
@@ -272,6 +278,8 @@ common:
    load-raw-images: "첨부 이미지를 고품질로 표시"
    load-remote-media: "원격 서버의 미디어를 표시"
    sync: "동기화"
+    save: "저장"
+    saved: "저장하였습니다"
    home-profile: "홈 프로필"
    deck-profile: "덱 프로필"
  search: "검색"
@@ -290,7 +298,7 @@ common:
  is-remote-user: "이 사용자 정보는 정확하지 않을 수 있습니다."
  is-remote-post: "이 글 정보는 복사본입니다."
  view-on-remote: "정확한 정보 보기"
-  renoted-by: "{user}님이 리노트"
+  renoted-by: "{user} 님이 리노트"
  no-notes: "글이 없습니다"
  turn-on-darkmode: "어둠에 삼켜져라"
  turn-off-darkmode: "빛이 있으라"
@@ -593,6 +601,14 @@ common/views/components/emoji-picker.vue:
  objects: "사물"
  symbols: "기호"
  flags: "깃발"
+common/views/components/settings/app-type.vue:
+  title: "모드"
+  intro: "데스크톱과 모바일 중 어떤 레이아웃을 사용할 지 지정할 수 있습니다."
+  choices:
+    auto: "자동으로 선택"
+    desktop: "데스크톱 레이아웃으로 고정"
+    mobile: "모바일 레이아웃으로 고정"
+  info: "변경사항은 페이지를 새로고침한 뒤에 반영됩니다."
 common/views/components/signin.vue:
  username: "사용자명"
  password: "비밀번호"
@@ -709,6 +725,9 @@ common/views/components/profile-editor.vue:
  saved: "프로필을 저장하였습니다"
  uploading: "업로드 중"
  upload-failed: "업로드에 실패하였습니다"
+  unable-to-process: "작업을 완료할 수 없습니다"
+  avatar-not-an-image: "아바타로 지정한 파일이 이미지 형식이 아닙니다"
+  banner-not-an-image: "배너로 지정한 파일이 이미지 형식이 아닙니다"
  email: "메일 설정"
  email-address: "메일 주소"
  email-verified: "매일 주소가 확인되었습니다"
@@ -728,6 +747,9 @@ common/views/components/profile-editor.vue:
  danger-zone: "위험한 설정"
  delete-account: "계정 삭제"
  account-deleted: "계정이 삭제되었습니다. 데이터가 사라질 때까지 시간이 걸릴 수 있습니다."
+  profile-metadata: "프로필 추가 정보"
+  metadata-label: "라벨"
+  metadata-content: "내용"
 common/views/components/user-list-editor.vue:
  users: "사용자"
  rename: "리스트 이름 바꾸기"
@@ -837,6 +859,7 @@ desktop:
  uploading-avatar: "새로운 아바타를 업로드하고 있습니다"
  avatar-updated: "아바타가 변경되었습니다"
  choose-avatar: "아바타 이미지를 선택"
+  unable-to-process: "작업을 완료할 수 없습니다"
  invalid-filetype: "이 형식의 파일은 지원되지 않습니다"
 desktop/views/components/activity.chart.vue:
  total: "검은색 ... 전체"
@@ -877,8 +900,8 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "열람주의 해제"
    copy-url: "URL 복사"
    download: "다운로드"
-    else-files: "기타..."
-    set-as-avatar: "아이콘으로 설정"
+    else-files: "기타"
+    set-as-avatar: "아바타로 설정"
    set-as-banner: "배너로 설정"
    open-in-app: "앱에서 열기"
    add-app: "앱 추가"
@@ -887,15 +910,20 @@ desktop/views/components/drive.file.vue:
    copied: "복사 완료"
    copied-url-to-clipboard: "URL을 클립보드에 복사하였습니다"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "기본 업로드 위치"
  unable-to-process: "작업을 완료할 수 없습니다"
  circular-reference-detected: "대상 폴더가 이동할 폴더의 하위 폴더입니다."
  unhandled-error: "알 수 없는 오류"
+  unable-to-delete: "삭제할 수 없습니다"
+  has-child-files-or-folders: "이 폴더는 비어있지 않기 때문에 삭제할 수 없습니다."
  contextmenu:
    move-to-this-folder: "이 폴더로 이동"
    show-in-new-window: "새 창으로 보기"
    rename: "이름 변경"
    rename-folder: "폴더 이름 변경"
    input-new-folder-name: "새 폴더 이름을 입력하여 주십시오"
+    else-folders: "기타"
+    set-as-upload-folder: "기본 업로드 위치로 설정"
 desktop/views/components/drive.vue:
  search: "검색"
  empty-draghover: "끌어놓으신 거 맞나요? 괜찮아요, 저는 귀여우니까요"
@@ -1010,6 +1038,7 @@ desktop/views/components/settings.2fa.vue:
  register-security-key: "키 등록 완료"
  something-went-wrong: "으악! 키를 등록하는 도중 문제가 발생하였습니다:"
  key-unregistered: "키가 등록되어 있지 않습니다"
+  use-password-less-login: "비밀번호 없는 로그인 사용"
 common/views/components/media-image.vue:
  sensitive: "열람주의"
  click-to-show: "클릭하여 보기"
@@ -1034,6 +1063,9 @@ common/views/components/drive-settings.vue:
  max: "최대 용량"
  in-use: "사용중"
  stats: "통계"
+  default-upload-folder: "기본 업로드 폴더 위치"
+  default-upload-folder-name: "폴더"
+  change-default-upload-folder: "폴더 변경"
 common/views/components/mute-and-block.vue:
  mute-and-block: "뮤트 및 차단"
  mute: "뮤트"
@@ -1340,6 +1372,8 @@ admin/views/users.vue:
  remote-user-updated: "원격 사용자 정보를 갱신하였습니다"
  delete-all-files: "모든 파일 삭제"
  delete-all-files-confirm: "모든 파일을 삭제하시겠습니까?"
+  username: "사용자명"
+  host: "관리자"
  users:
    title: "사용자"
    sort:
@@ -1370,6 +1404,12 @@ admin/views/moderators.vue:
    added: "모더레이터를 등록하였습니다"
    remove: "해제"
    removed: "모더레이터 등록을 해제했습니다"
+  logs:
+    title: "로그"
+    moderator: "모더레이터"
+    type: "작업"
+    at: "일시"
+    info: "정보"
 admin/views/emoji.vue:
  add-emoji:
    title: "이모지 등록"
@@ -1716,6 +1756,7 @@ deck/deck.user-column.vue:
  activity: "활동"
  timeline: "타임라인"
  pinned-notes: "고정해놓은 글"
+  pinned-page: "고정해놓은 페이지"
 docs:
  edit-this-page-on-github: "틀린 점이나 개선할 점을 찾으셨나요?"
  edit-this-page-on-github-link: "이 페이지를 GitHub에서 편집"
@@ -1750,6 +1791,8 @@ pages:
  are-you-sure-delete: "이 페이지를 삭제하시겠습니까?"
  page-deleted: "페이지가 삭제되었습니다"
  edit-this-page: "이 페이지를 편집"
+  pin-this-page: "프로필에 고정"
+  unpin-this-page: "프로필에서 고정 해제"
  view-source: "소스 보기"
  view-page: "페이지 보기"
  like: "좋아요"
@@ -1768,6 +1811,7 @@ pages:
  url: "페이지 URL"
  summary: "페이지 요약"
  align-center: "가운데 정렬"
+  hide-title-when-pinned: "프로필에 고정해놓은 경우 타이틀을 표시하지 않음"
  font: "글꼴"
  fontSerif: "세리프"
  fontSansSerif: "산 세리프"
@@ -1821,12 +1865,25 @@ pages:
      inc: "증가치"
    _button:
      text: "제목"
+      colored: "색상"
      action: "버튼을 눌렀을 때의 동작"
      _action:
        dialog: "대화상자를 표시"
        _dialog:
          content: "내용"
        resetRandom: "난수를 초기화"
+        pushEvent: "이벤트 보내기"
+        _pushEvent:
+          event: "이벤트 이름"
+          message: "눌렀을 때 표시할 메시지"
+          variable: "보낼 변수"
+          no-variable: "없음"
+    radioButton: "선택지"
+    _radioButton:
+      name: "변수명"
+      title: "제목"
+      values: "줄바꿈으로 구분된 선택지"
+      default: "기본값"
  script:
    categories:
      flow: "흐름 제어"
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -199,6 +199,7 @@ common/views/components/profile-editor.vue:
  name: "Naam"
  avatar: "Gebruikersafbeelding"
  banner: "Omslagfoto"
+  unable-to-process: "De operatie kan niet worden voltooid."
  export-targets:
    following-list: "Volgend"
    user-lists: "Lijsten"
@@ -226,6 +227,7 @@ common/views/pages/follow.vue:
  follow: "Volgend"
 desktop:
  banner: "Omslagfoto"
+  unable-to-process: "De operatie kan niet worden voltooid."
 desktop/views/components/activity.chart.vue:
  total: "Zwart ... totaal"
  notes: "Blauw ... notities"
@@ -260,7 +262,6 @@ desktop/views/components/drive.file.vue:
    rename: "Naam wijzigen"
    copy-url: "URL kopiëren"
    download: "Downloaden"
-    else-files: "Overig"
    set-as-avatar: "Instellen als gebruikersafbeelding"
    set-as-banner: "Instellen als omslagfoto"
    open-in-app: "Openen in app"
@@ -377,6 +378,7 @@ common/views/components/api-settings.vue:
 common/views/components/drive-settings.vue:
  in-use: "gebruikt"
  stats: "Statistieken"
+  default-upload-folder-name: "Map(pen)"
 desktop/views/components/sub-note-content.vue:
  private: "(dit bericht is privé)"
  poll: "Peilingen"
@@ -425,6 +427,7 @@ admin/views/drive.vue:
    local: "Lokaal"
  delete: "Verwijderen"
 admin/views/users.vue:
+  username: "Gebruikersnaam"
  users:
    title: "Gebruiker"
    state:
@@ -606,6 +609,7 @@ docs:
  edit-this-page-on-github: "Heb je een fout ontdekt of wil je bijdragen aan de documentatie? "
  edit-this-page-on-github-link: "Bewerk deze pagina op GitHub!"
 pages:
+  pin-this-page: "Vastmaken aan profielpagina"
  like: "Leuk"
  blocks:
    image: "Afbeeldingen"
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -78,6 +78,7 @@ common:
  _settings:
    notification: "Notifikasjon"
    password: "Passord"
+    save: "Lagre"
  search: "Søk"
  delete: "Slett"
  loading: "Laster inn..."
@@ -286,6 +287,7 @@ common/views/components/api-settings.vue:
 common/views/components/drive-settings.vue:
  in-use: "brukt"
  stats: "Statistikk"
+  default-upload-folder-name: "Mappe(r)"
 common/views/components/mute-and-block.vue:
  save: "Lagre"
 desktop/views/components/settings.tags.vue:
@@ -344,12 +346,16 @@ admin/views/drive.vue:
    local: "Lokalt"
  delete: "Slett"
 admin/views/users.vue:
+  username: "Brukernavn"
  users:
    title: "Bruker"
    state:
      all: "Alle"
    origin:
      local: "Lokalt"
+admin/views/moderators.vue:
+  logs:
+    info: "Informasjon"
 admin/views/emoji.vue:
  add-emoji:
    add: "Legg til"
@@ -484,6 +490,7 @@ deck/deck.user-column.vue:
  followers: "Følgere"
  images: "Bilder"
 pages:
+  pin-this-page: "Fest til profilen din"
  like: "Lik"
  blocks:
    image: "Bilder"
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -178,6 +178,8 @@ common:
    version: "Wersja:"
    do-update: "Sprawdź dostępność nowych aktualizacji"
    navbar-position-left: "Z lewej"
+    save: "Zapisz"
+    saved: "Zapisano"
  search: "Szukaj"
  delete: "Usuń"
  loading: "Ładowanie"
@@ -414,6 +416,8 @@ common/views/components/emoji-picker.vue:
  objects: "Rzeczy"
  symbols: "Symbole"
  flags: "Flagi"
+common/views/components/settings/app-type.vue:
+  info: "Musisz odświeżyć stronę, aby zmiany zostały uwzględnione."
 common/views/components/signin.vue:
  username: "Nazwa użytkownika"
  password: "Hasło"
@@ -514,6 +518,7 @@ common/views/components/profile-editor.vue:
  saved: "Pomyślnie zaktualizowano profil"
  uploading: "Wysyłanie"
  upload-failed: "Wysyłanie nie powiodło się"
+  unable-to-process: "Nie udało się ukończyć działania."
  email: "Ustawienia e-mail"
  email-address: "Adres e-mail"
  email-verified: "Twój adres e-mail został zweryfikowany."
@@ -608,6 +613,7 @@ desktop:
  uploading-avatar: "Wysyłanie awatara"
  avatar-updated: "Wysłano awatar"
  choose-avatar: "Wybierz awatar"
+  unable-to-process: "Nie udało się ukończyć działania."
 desktop/views/components/activity.chart.vue:
  total: "Czarny … Łącznie"
  notes: "Niebieski … Wpisy"
@@ -666,6 +672,7 @@ desktop/views/components/drive.folder.vue:
    rename: "Zmień nazwę"
    rename-folder: "Zmień nazwę katalogu"
    input-new-folder-name: "Wprowadź nową nazwę"
+    else-folders: "Inne"
 desktop/views/components/drive.vue:
  search: "Szukaj"
  empty-draghover: "Przeciągnij tutaj!"
@@ -785,6 +792,7 @@ common/views/components/drive-settings.vue:
  max: "Max"
  in-use: "użyto"
  stats: "Statystyki"
+  default-upload-folder-name: "Katalog(i)"
 common/views/components/mute-and-block.vue:
  mute-and-block: "Wycisz / Zablokuj"
  mute: "Wycisz"
@@ -904,6 +912,7 @@ admin/views/drive.vue:
  unmark-as-sensitive: "Cofnij oznaczenie jako zawartość wrażliwą"
 admin/views/users.vue:
  user-not-found: "Nie znaleziono użytkownika"
+  username: "Nazwa użytkownika"
  users:
    title: "Użytkownicy"
    sort:
@@ -919,6 +928,9 @@ admin/views/users.vue:
 admin/views/moderators.vue:
  add-moderator:
    add: "Zarejestruj się"
+  logs:
+    moderator: "Moderatorzy"
+    info: "Informacje"
 admin/views/emoji.vue:
  add-emoji:
    name: "Nazwa Emoji"
@@ -1189,6 +1201,8 @@ dev/views/new-app.vue:
  app-name: "Nazwa Aplikacji"
  authority: "Uprawnienia"
 pages:
+  pin-this-page: "Przypnij do profilu"
+  unpin-this-page: "Odepnij"
  like: "Lubię"
  title: "Tytuł"
  blocks:
@@ -1206,6 +1220,8 @@ pages:
      text: "Tytuł"
    _button:
      text: "Tytuł"
+    _radioButton:
+      title: "Tytuł"
  script:
    categories:
      random: "Losowy"
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -28,6 +28,7 @@ common:
  enter-password: "Пожалуйста, введите ваш пароль"
  2fa: "Двухфакторная аутентификация"
  customize-home: "Настройка домашней страницы"
+  featured-notes: "Рекомендуемые"
  dark-mode: "Тёмная тема"
  signin: "Войти"
  signup: "Регистрация"
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -35,6 +35,7 @@ common:
  signout: "退出"
  reload-to-apply-the-setting: "必须重新加载页面以应用此设置。 确实要立即重新加载吗？"
  fetching-as-ap-object: "联合查询"
+  unfollow-confirm: "取消对{name}的关注？"
  got-it: "知道了"
  customization-tips:
    title: "自定义提示"
@@ -122,6 +123,7 @@ common:
    add-visible-user: "添加用户"
    cw-placeholder: "评论帖子(可选)"
    username-prompt: "输入用户名"
+    enter-file-name: "编辑文件名"
  weekday-short:
    sunday: "日"
    monday: "一"
@@ -188,6 +190,11 @@ common:
    remember-note-visibility: "记住帖子可见性"
    web-search-engine: "搜索引擎"
    web-search-engine-desc: "例如: https://www.google.com/?#q={{query}}"
+    paste: "粘贴"
+    pasted-file-name: "粘贴的文件名模板"
+    pasted-file-name-desc: "例: \"yyyy-MM-dd HH-mm-ss [{{number}}]\" → \"2018-03-20 21-30-24 1\""
+    paste-dialog: "粘贴时编辑文件名"
+    paste-dialog-desc: "粘贴时显示编辑文件名的对话框"
    keep-cw: "保留内容警告"
    keep-cw-desc: "在回复帖子时，如果原帖设置了内容警告，默认情况下回帖也会设置相同的内容警告。"
    i-like-sushi: "相比于布丁来说, 我更喜欢寿司。"
@@ -271,6 +278,8 @@ common:
    load-raw-images: "以原始质量显示附加图像"
    load-remote-media: "显示来自远程服务器的媒体"
    sync: "同步"
+    save: "保存"
+    saved: "已保存"
    home-profile: "定制首页数据"
    deck-profile: "定制Deck数据"
  search: "搜索"
@@ -523,6 +532,7 @@ common/views/components/note-menu.vue:
  delete: "删除"
  delete-confirm: "确定删除这个投稿吗?"
  remote: "显示原始投稿"
+  pin-limit-exceeded: "无法置顶更多了。"
 common/views/components/user-menu.vue:
  mention: "提到"
  mute: "屏蔽"
@@ -591,6 +601,14 @@ common/views/components/emoji-picker.vue:
  objects: "物品"
  symbols: "符号"
  flags: "旗帜"
+common/views/components/settings/app-type.vue:
+  title: "模式"
+  intro: "您可以指定使用桌面版或移动版。"
+  choices:
+    auto: "自动选择"
+    desktop: "固定为桌面版"
+    mobile: "固定为移动版"
+  info: "更改将在刷新页面后生效。"
 common/views/components/signin.vue:
  username: "用户名"
  password: "密码"
@@ -601,6 +619,8 @@ common/views/components/signin.vue:
  signin-with-github: "用 GitHub 登录"
  signin-with-discord: "用 Discord 登录"
  login-failed: "登录失败。请检查用户名和密码。"
+  tap-key: "点击安全密钥登录"
+  enter-2fa-code: "输入验证码"
 common/views/components/signup.vue:
  invitation-code: "邀请码"
  invitation-info: "如果您没有邀请码，请联系<a href=\"{}\">管理员</a>。"
@@ -705,6 +725,7 @@ common/views/components/profile-editor.vue:
  saved: "您的个人资料已保存"
  uploading: "正在上传"
  upload-failed: "上传失败"
+  unable-to-process: "无法完成操作"
  email: "邮件设置"
  email-address: "电子邮件地址"
  email-verified: "电子邮件地址已验证"
@@ -724,6 +745,7 @@ common/views/components/profile-editor.vue:
  danger-zone: "危险选项"
  delete-account: "删除帐户"
  account-deleted: "帐户已被删除。 数据会在一段时间之后清除。"
+  metadata-content: "内容"
 common/views/components/user-list-editor.vue:
  users: "用户"
  rename: "重命名列表"
@@ -833,6 +855,7 @@ desktop:
  uploading-avatar: "上传一个新的头像"
  avatar-updated: "成功上传头像"
  choose-avatar: "选择作为头像的图片"
+  unable-to-process: "无法完成操作"
  invalid-filetype: "不接受此文件类型"
 desktop/views/components/activity.chart.vue:
  total: "黑 ... 总计"
@@ -873,7 +896,7 @@ desktop/views/components/drive.file.vue:
    unmark-as-sensitive: "取消标记为“敏感”"
    copy-url: "复制链接"
    download: "下载"
-    else-files: "其他..."
+    else-files: "其他"
    set-as-avatar: "设置为头像"
    set-as-banner: "设置为背景"
    open-in-app: "在应用程序中打开"
@@ -883,15 +906,20 @@ desktop/views/components/drive.file.vue:
    copied: "已复制"
    copied-url-to-clipboard: "已复制链接到剪贴板"
 desktop/views/components/drive.folder.vue:
+  upload-folder: "默认上传文件夹"
  unable-to-process: "无法完成操作"
  circular-reference-detected: "目标文件夹是您要移动的文件夹的子文件夹。"
  unhandled-error: "未知错误"
+  unable-to-delete: "无法删除"
+  has-child-files-or-folders: "此文件夹不为空，无法删除。"
  contextmenu:
    move-to-this-folder: "移动到此文件夹"
    show-in-new-window: "在新窗口打开"
    rename: "重命名"
    rename-folder: "重命名文件夹"
    input-new-folder-name: "请输入新文件名"
+    else-folders: "其他"
+    set-as-upload-folder: "设置为默认上传文件夹"
 desktop/views/components/drive.vue:
  search: "搜索"
  empty-draghover: "放在这里！因为你知道我很可爱，对吗？"
@@ -997,6 +1025,16 @@ desktop/views/components/settings.2fa.vue:
  success: "设置完成"
  failed: "设置失败, 请确保您的密钥是正确的。"
  info: "从下次登录Misskey时，您的设备上显示的令牌以及密码也是必需的。"
+  totp-header: "身份验证 App"
+  security-key-header: "安全密钥"
+  security-key: "为了增强安全性，您可以使用支持FIDO2的硬件安全密钥登录您的帐户。 登录时，您将需要注册安全密钥或身份验证应用。"
+  last-used: "最后使用："
+  activate-key: "单击以激活您的安全密钥"
+  security-key-name: "密钥名称"
+  register-security-key: "安全密钥注册完成"
+  something-went-wrong: "糟糕！安全密钥注册出现问题："
+  key-unregistered: "安全密钥已被删除。"
+  use-password-less-login: "使用免密码登录"
 common/views/components/media-image.vue:
  sensitive: "阅读注意"
  click-to-show: "点击查看"
@@ -1021,6 +1059,9 @@ common/views/components/drive-settings.vue:
  max: "容量"
  in-use: "已使用"
  stats: "统计"
+  default-upload-folder: "默认上传文件夹"
+  default-upload-folder-name: "文件夹"
+  change-default-upload-folder: "更改文件夹"
 common/views/components/mute-and-block.vue:
  mute-and-block: "屏蔽/拉黑"
  mute: "屏蔽"
@@ -1110,6 +1151,9 @@ admin/views/index.vue:
  back-to-misskey: "返回 Misskey"
 admin/views/db.vue:
  tables: "表格"
+  vacuum: "VACUUM"
+  vacuum-info: "清理数据库。 保持数据完整并减少磁盘使用量。 此操作通常会自动定期执行。"
+  vacuum-exclamation: "运行VACUUM之后，数据库上的负载可能会持续一段时间，并且可能不响应用户操作。"
 admin/views/dashboard.vue:
  dashboard: "Dashboard"
  accounts: "账户"
@@ -1324,6 +1368,8 @@ admin/views/users.vue:
  remote-user-updated: "远程用户信息已更新"
  delete-all-files: "删除所有文件"
  delete-all-files-confirm: "删除所有文件吗？"
+  username: "用户名"
+  host: "主机名"
  users:
    title: "用户"
    sort:
@@ -1354,6 +1400,12 @@ admin/views/moderators.vue:
    added: "已注册版主。"
    remove: "取消"
    removed: "取消注册版主"
+  logs:
+    title: "登录"
+    moderator: "版主"
+    type: "操作"
+    at: "日期和时间"
+    info: "信息"
 admin/views/emoji.vue:
  add-emoji:
    title: "添加emoji"
@@ -1700,6 +1752,7 @@ deck/deck.user-column.vue:
  activity: "活动"
  timeline: "时间线"
  pinned-notes: "置顶帖"
+  pinned-page: "已置顶的页面"
 docs:
  edit-this-page-on-github: "发现错误或想要为文档做出贡献？"
  edit-this-page-on-github-link: "在GitHub上编辑这个页面。"
@@ -1734,6 +1787,8 @@ pages:
  are-you-sure-delete: "是否删除此页面？"
  page-deleted: "该页面已被删除。"
  edit-this-page: "编辑此页面"
+  pin-this-page: "置顶"
+  unpin-this-page: "取消置顶"
  view-source: "查看源代码"
  view-page: "查看页面"
  like: "赞"
@@ -1752,6 +1807,7 @@ pages:
  url: "页面URL"
  summary: "页面摘要"
  align-center: "居中"
+  hide-title-when-pinned: "置顶时隐藏标题"
  font: "字体"
  fontSerif: "衬线字体"
  fontSansSerif: "无衬线字体"
@@ -1805,12 +1861,25 @@ pages:
      inc: "增加值"
    _button:
      text: "标题"
+      colored: "彩色"
      action: "按下按钮时的行为"
      _action:
        dialog: "显示对话框"
        _dialog:
          content: "内容"
        resetRandom: "随机值重置"
+        pushEvent: "发送事件"
+        _pushEvent:
+          event: "事件名称"
+          message: "按下时显示的消息"
+          variable: "发送的变量"
+          no-variable: "空"
+    radioButton: "选择项"
+    _radioButton:
+      name: "变量名"
+      title: "标题"
+      values: "使用换行区分的选择项"
+      default: "默认值"
  script:
    categories:
      flow: "控制"
--- a/migration/1562422242907-PasswordLessLogin.ts
+++ b/migration/1562422242907-PasswordLessLogin.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PasswordLessLogin1562422242907 implements MigrationInterface {
+
+	public async up(queryRunner: QueryRunner): Promise<any> {
+		await queryRunner.query(`ALTER TABLE "user_profile" ADD COLUMN "usePasswordLessLogin" boolean DEFAULT false NOT NULL`);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<any> {
+		await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "usePasswordLessLogin"`);
+	}
+
+}
--- a/migration/1562444565093-PinnedPage.ts
+++ b/migration/1562444565093-PinnedPage.ts
@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PinnedPage1562444565093 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD "pinnedPageId" character varying(32)`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27" UNIQUE ("pinnedPageId")`);
+        await queryRunner.query(`ALTER TABLE "user_profile" ADD CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27" FOREIGN KEY ("pinnedPageId") REFERENCES "page"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "FK_6dc44f1ceb65b1e72bacef2ca27"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP CONSTRAINT "UQ_6dc44f1ceb65b1e72bacef2ca27"`);
+        await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "pinnedPageId"`);
+    }
+
+}
--- a/migration/1562448332510-PageTitleHideOption.ts
+++ b/migration/1562448332510-PageTitleHideOption.ts
@@ -0,0 +1,13 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class PageTitleHideOption1562448332510 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "page" ADD "hideTitleWhenPinned" boolean NOT NULL DEFAULT false`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "page" DROP COLUMN "hideTitleWhenPinned"`);
+    }
+
+}
--- a/migration/1562869971568-ModerationLog.ts
+++ b/migration/1562869971568-ModerationLog.ts
@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class ModerationLog1562869971568 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`CREATE TABLE "moderation_log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "type" character varying(128) NOT NULL, "info" jsonb NOT NULL, CONSTRAINT "PK_d0adca6ecfd068db83e4526cc26" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_a08ad074601d204e0f69da9a95" ON "moderation_log" ("userId") `);
+        await queryRunner.query(`ALTER TABLE "moderation_log" ADD CONSTRAINT "FK_a08ad074601d204e0f69da9a954" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(`ALTER TABLE "moderation_log" DROP CONSTRAINT "FK_a08ad074601d204e0f69da9a954"`);
+        await queryRunner.query(`DROP INDEX "IDX_a08ad074601d204e0f69da9a95"`);
+        await queryRunner.query(`DROP TABLE "moderation_log"`);
+    }
+
+}
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.24.2",
+	"version": "11.26.0",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -27,7 +27,7 @@
 	},
 	"resolutions": {
 		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
-		"video-thumbnail-generator/lodash": "^4.17.11"
+		"video-thumbnail-generator/lodash": "^4.17.13"
 	},
 	"dependencies": {
 		"@elastic/elasticsearch": "7.1.0",
@@ -37,7 +37,6 @@
 		"@fortawesome/free-solid-svg-icons": "5.9.0",
 		"@fortawesome/vue-fontawesome": "0.1.6",
 		"@koa/cors": "3.0.0",
-		"@typescript-eslint/parser": "1.11.0",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.5.15",
 		"@types/cbor": "2.0.0",
@@ -50,7 +49,6 @@
 		"@types/gulp-replace": "0.0.31",
 		"@types/gulp-uglify": "3.0.6",
 		"@types/gulp-util": "3.0.34",
-		"@types/is-root": "2.1.2",
 		"@types/is-url": "1.2.28",
 		"@types/js-yaml": "3.12.1",
 		"@types/jsdom": "12.2.4",
@@ -83,7 +81,7 @@
 		"@types/ratelimiter": "2.1.28",
 		"@types/redis": "2.8.13",
 		"@types/rename": "1.0.1",
-		"@types/request": "2.48.1",
+		"@types/request": "2.48.2",
 		"@types/request-promise-native": "1.0.16",
 		"@types/request-stats": "3.0.0",
 		"@types/rimraf": "2.0.2",
@@ -100,8 +98,9 @@
 		"@types/webpack-stream": "3.2.10",
 		"@types/websocket": "0.0.40",
 		"@types/ws": "6.0.1",
+		"@typescript-eslint/parser": "1.11.0",
 		"animejs": "3.0.1",
-		"apexcharts": "3.8.1",
+		"apexcharts": "3.8.2",
 		"autobind-decorator": "2.4.0",
 		"autosize": "4.0.2",
 		"autwh": "0.1.0",
@@ -121,14 +120,14 @@
 		"cssnano": "4.1.10",
 		"dateformat": "3.0.3",
 		"deep-equal": "1.0.1",
-		"diskusage": "1.1.2",
+		"diskusage": "1.1.3",
 		"double-ended-queue": "2.1.0-0",
 		"emojilib": "2.4.0",
 		"eslint": "6.0.1",
 		"eslint-plugin-vue": "5.2.3",
 		"eventemitter3": "4.0.0",
 		"feed": "3.0.0",
-		"file-type": "12.0.0",
+		"file-type": "12.0.1",
 		"fuckadblock": "3.2.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
@@ -145,7 +144,7 @@
 		"hard-source-webpack-plugin": "0.13.1",
 		"html-minifier": "4.0.0",
 		"http-signature": "1.2.0",
-		"insert-text-at-cursor": "0.2.0",
+		"insert-text-at-cursor": "0.3.0",
 		"is-root": "2.1.0",
 		"is-svg": "4.2.0",
 		"js-yaml": "3.13.1",
@@ -182,7 +181,7 @@
 		"object-assign-deep": "0.4.0",
 		"os-utils": "0.0.14",
 		"parse5": "5.1.0",
-		"parsimmon": "1.12.0",
+		"parsimmon": "1.12.1",
 		"pg": "7.11.0",
 		"portscanner": "2.2.0",
 		"postcss-loader": "3.0.0",
@@ -194,7 +193,7 @@
 		"pug": "2.0.4",
 		"punycode": "2.1.1",
 		"pureimage": "0.1.6",
-		"qrcode": "1.3.3",
+		"qrcode": "1.4.0",
 		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",
 		"ratelimiter": "3.3.0",
@@ -220,7 +219,7 @@
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
 		"summaly": "2.3.0",
-		"systeminformation": "4.13.1",
+		"systeminformation": "4.14.3",
 		"syuilo-password-strength": "0.0.1",
 		"terser-webpack-plugin": "1.3.0",
 		"textarea-caret": "3.1.0",
@@ -243,13 +242,13 @@
 		"vue-color": "2.7.0",
 		"vue-content-loading": "1.6.0",
 		"vue-cropperjs": "4.0.0",
-		"vue-i18n": "8.11.2",
+		"vue-i18n": "8.12.0",
 		"vue-js-modal": "1.3.31",
 		"vue-json-pretty": "1.6.0",
 		"vue-loader": "15.7.0",
 		"vue-marquee-text-component": "1.1.1",
 		"vue-prism-component": "1.1.1",
-		"vue-router": "3.0.6",
+		"vue-router": "3.0.7",
 		"vue-sequential-entrance": "1.1.3",
 		"vue-style-loader": "4.1.2",
 		"vue-svg-inline-loader": "1.2.16",
@@ -259,10 +258,10 @@
 		"vuex": "3.1.1",
 		"vuex-persistedstate": "2.5.4",
 		"web-push": "3.3.5",
-		"webpack": "4.35.2",
+		"webpack": "4.35.3",
 		"webpack-cli": "3.3.5",
-		"websocket": "1.0.28",
-		"ws": "7.0.1",
+		"websocket": "1.0.29",
+		"ws": "7.1.0",
 		"xev": "2.0.1"
 	}
 }
--- a/src/client/app/admin/views/moderators.vue
+++ b/src/client/app/admin/views/moderators.vue
@@ -12,6 +12,31 @@
 			</ui-horizon-group>
 		</section>
 	</ui-card>
+
+	<ui-card>
+		<template #title>{{ $t('logs.title') }}</template>
+		<section class="fit-top">
+			<sequential-entrance animation="entranceFromTop" delay="25">
+				<div v-for="log in logs" :key="log.id" class="">
+					<ui-horizon-group inputs>
+						<ui-input :value="log.user | acct" type="text" readonly>
+							<span>{{ $t('logs.moderator') }}</span>
+						</ui-input>
+						<ui-input :value="log.type" type="text" readonly>
+							<span>{{ $t('logs.type') }}</span>
+						</ui-input>
+						<ui-input :value="log.createdAt | date" type="text" readonly>
+							<span>{{ $t('logs.at') }}</span>
+						</ui-input>
+					</ui-horizon-group>
+					<ui-textarea :value="JSON.stringify(log.info, null, 4)" readonly>
+						<span>{{ $t('logs.info') }}</span>
+					</ui-textarea>
+				</div>
+			</sequential-entrance>
+			<ui-button v-if="existMoreLogs" @click="fetchLogs">{{ $t('@.load-more') }}</ui-button>
+		</section>
+	</ui-card>
 </div>
 </template>

@@ -26,10 +51,17 @@ export default Vue.extend({
 	data() {
 		return {
 			username: '',
-			changing: false
+			changing: false,
+			logs: [],
+			untilLogId: null,
+			existMoreLogs: false
 		};
 	},

+	created() {
+		this.fetchLogs();
+	},
+
 	methods: {
 		async add() {
 			this.changing = true;
@@ -74,6 +106,22 @@ export default Vue.extend({

 			this.changing = false;
 		},
+
+		fetchLogs() {
+			this.$root.api('admin/show-moderation-logs', {
+				untilId: this.untilId,
+				limit: 10 + 1
+			}).then(logs => {
+				if (logs.length == 10 + 1) {
+					logs.pop();
+					this.existMoreLogs = true;
+				} else {
+					this.existMoreLogs = false;
+				}
+				this.logs = this.logs.concat(logs);
+				this.untilLogId = this.logs[this.logs.length - 1].id;
+			});
+		},
 	}
 });
 </script>
--- a/src/client/app/admin/views/users.user.vue
+++ b/src/client/app/admin/views/users.user.vue
@@ -5,7 +5,7 @@
 			<mk-avatar class="avatar" :user="user" :disable-link="true"/>
 		</a>
 	</div>
-	<div>
+	<div @click="click(user.id)">
 		<header>
 			<b><mk-user-name :user="user"/></b>
 			<span class="username">@{{ user | acct }}</span>
@@ -32,7 +32,7 @@ import { faSnowflake } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
 	i18n: i18n('admin/views/users.vue'),
-	props: ['user'],
+	props: ['user', 'click'],
 	data() {
 		return {
 			faSnowflake, faMicrophoneSlash
@@ -44,7 +44,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kofvwchc
 	display flex
-	padding 16px 0
+	padding 16px
 	border-top solid 1px var(--faceDivider)

 	> div:first-child
@@ -55,6 +55,7 @@ export default Vue.extend({

 	> div:last-child
 		flex 1
+		cursor pointer
 		padding-left 16px

 		@media (max-width 500px)
@@ -80,4 +81,15 @@ export default Vue.extend({
 			> .is-suspended
 				margin 0 0 0 .5em
 				color #4dabf7
+
+	&:hover
+		color var(--primaryForeground)
+		background var(--primary)
+		text-decoration none
+		border-radius 3px
+
+	&:active
+		color var(--primaryForeground)
+		background var(--primaryDarken10)
+		border-radius 3px
 </style>
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -8,7 +8,7 @@
 			</ui-input>
 			<ui-button @click="showUser"><fa :icon="faSearch"/> {{ $t('lookup') }}</ui-button>

-			<div class="user" v-if="user">
+			<div ref="user" class="user" v-if="user" :key="user.id">
 				<x-user :user="user"/>
 				<div class="actions">
 					<ui-button v-if="user.host != null" @click="updateRemoteUser"><fa :icon="faSync"/> {{ $t('update-remote-user') }}</ui-button>
@@ -54,8 +54,16 @@
 					<option value="remote">{{ $t('users.origin.remote') }}</option>
 				</ui-select>
 			</ui-horizon-group>
+			<ui-horizon-group searchboxes>
+				<ui-input v-model="searchUsername" type="text" spellcheck="false" @input="fetchUsers(true)">
+					<span>{{ $t('username') }}</span>
+				</ui-input>
+				<ui-input v-model="searchHost" type="text" spellcheck="false" @input="fetchUsers(true)" :disabled="origin === 'local'">
+					<span>{{ $t('host') }}</span>
+				</ui-input>
+			</ui-horizon-group>
 			<sequential-entrance animation="entranceFromTop" delay="25">
-				<x-user v-for="user in users" :user='user' :key="user.id"/>
+				<x-user v-for="user in users" :key="user.id" :user='user' :click="showUserOnClick"/>
 			</sequential-entrance>
 			<ui-button v-if="existMore" @click="fetchUsers">{{ $t('@.load-more') }}</ui-button>
 		</section>
@@ -85,6 +93,8 @@ export default Vue.extend({
 			sort: '+createdAt',
 			state: 'all',
 			origin: 'local',
+			searchUsername: '',
+			searchHost: '',
 			limit: 10,
 			offset: 0,
 			users: [],
@@ -107,6 +117,7 @@ export default Vue.extend({
 		},

 		origin() {
+			if (this.origin === 'local') this.searchHost = '';
 			this.users = [];
 			this.offset = 0;
 			this.fetchUsers();
@@ -157,6 +168,15 @@ export default Vue.extend({
 			this.target = '';
 		},

+		async showUserOnClick(userId: string) {
+			this.$root.api('admin/show-user', { userId: userId }).then(info => {
+				this.user = info;
+				this.$nextTick(() => {
+					this.$refs.user.scrollIntoView();
+				});
+			});
+		},
+
 		/** 処理対象ユーザーの情報を更新する */
 		async refreshUser() {
 			this.$root.api('admin/show-user', { userId: this.user.id }).then(info => {
@@ -308,13 +328,16 @@ export default Vue.extend({
 			return !confirm.canceled;
 		},

-		fetchUsers() {
+		fetchUsers(truncate?: boolean) {
+			if (truncate) this.offset = 0;
 			this.$root.api('admin/show-users', {
 				state: this.state,
 				origin: this.origin,
 				sort: this.sort,
 				offset: this.offset,
-				limit: this.limit + 1
+				limit: this.limit + 1,
+				username: this.searchUsername,
+				hostname: this.searchHost
 			}).then(users => {
 				if (users.length == this.limit + 1) {
 					users.pop();
@@ -322,7 +345,7 @@ export default Vue.extend({
 				} else {
 					this.existMore = false;
 				}
-				this.users = this.users.concat(users);
+				this.users = truncate ? users : this.users.concat(users);
 				this.offset += this.limit;
 			});
 		}
--- a/src/client/app/boot.js
+++ b/src/client/app/boot.js
@@ -84,7 +84,14 @@

 	// Detect the user agent
 	const ua = navigator.userAgent.toLowerCase();
-	const isMobile = /mobile|iphone|ipad|android/.test(ua);
+	let isMobile = /mobile|iphone|ipad|android/.test(ua) || window.innerWidth < 576;
+	if (settings && settings.device.appTypeForce) {
+		if (settings.device.appTypeForce === 'mobile') {
+			isMobile = true;
+		} else if (settings.device.appTypeForce === 'desktop') {
+			isMobile = false;
+		}
+	}

 	// Get the <head> element
 	const head = document.getElementsByTagName('head')[0];
--- a/src/client/app/common/scripts/collect-page-vars.ts
+++ b/src/client/app/common/scripts/collect-page-vars.ts
@@ -32,6 +32,12 @@ export function collectPageVars(content) {
 					type: 'number',
 					value: 0
 				});
+			} else if (x.type === 'radioButton') {
+				pageVars.push({
+					name: x.name,
+					type: 'string',
+					value: x.default || ''
+				});
 			} else if (x.children) {
 				collect(x.children);
 			}
--- a/src/client/app/common/scripts/get-face.ts
+++ b/src/client/app/common/scripts/get-face.ts
@@ -4,7 +4,8 @@ const faces = [
 	'🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!',
 	'✌️(´･_･`)✌️',
 	'(｡>﹏<｡)',
-	'(Δ・x・Δ)'
+	'(Δ・x・Δ)',
+	'(ｺ｀・ﾍ・´ｹ)'
 ];

 export default () => faces[Math.floor(Math.random() * faces.length)];
--- a/src/client/app/common/scripts/post-form.ts
+++ b/src/client/app/common/scripts/post-form.ts
@@ -8,6 +8,7 @@ import { host, url } from '../../config';
 import i18n from '../../i18n';
 import { erase, unique } from '../../../../prelude/array';
 import extractMentions from '../../../../misc/extract-mentions';
+import { formatTimeString } from '../../../../misc/format-time-string';

 export default (opts) => ({
 	i18n: i18n(),
@@ -151,9 +152,16 @@ export default (opts) => ({
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
 		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
+			if (this.reply.visibility === 'specified') {
+				this.$root.api('users/show', {
+					userIds: this.reply.visibleUserIds.filter(uid => uid !== this.$store.state.i.id && uid !== this.reply.userId)
+				}).then(users => {
+					this.visibleUsers.push(...users);
+				});
+			}
 		}

-		if (this.reply) {
+		if (this.reply && this.reply.userId !== this.$store.state.i.id) {
 			this.$root.api('users/show', { userId: this.reply.userId }).then(user => {
 				this.visibleUsers.push(user);
 			});
@@ -237,8 +245,8 @@ export default (opts) => ({
 			for (const x of Array.from((this.$refs.file as any).files)) this.upload(x);
 		},

-		upload(file) {
-			(this.$refs.uploader as any).upload(file);
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
 		},

 		onChangeUploadings(uploads) {
@@ -327,10 +335,23 @@ export default (opts) => ({
 			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && this.canPost) this.post();
 		},

-		async onPaste(e) {
-			for (const item of Array.from(e.clipboardData.items)) {
+		async onPaste(e: ClipboardEvent) {
+			for (const { item, i } of Array.from(e.clipboardData.items).map((item, i) => ({item, i}))) {
 				if (item.kind == 'file') {
-					this.upload(item.getAsFile());
+					const file = item.getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+								title: this.$t('@.post-form.enter-file-name'),
+								input: {
+									default: formatted
+								},
+								allowEmpty: false
+							}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
 				}
 			}

--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -5,17 +5,17 @@

 	<div style="overflow: hidden; line-height: 28px;">
 		<p class="turn" v-if="!iAmPlayer && !game.isEnded">
-			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'turn:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :plain="true" :custom-emojis="turnUser.emojis"/>
 			<mk-ellipsis/>
 		</p>
 		<p class="turn" v-if="logPos != logs.length">
-			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :should-break="false" :plain-text="true" :custom-emojis="turnUser.emojis"/>
+			<mfm :key="'past-turn-of:' + $options.filters.userName(turnUser)" :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :plain="true" :custom-emojis="turnUser.emojis"/>
 		</p>
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
 			<template v-if="game.winner">
-				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :should-break="false" :plain-text="true" :custom-emojis="game.winner.emojis"/>
+				<mfm :key="'won'" :text="$t('@.reversi.won', { name: $options.filters.userName(game.winner) })" :plain="true" :custom-emojis="game.winner.emojis"/>
 				<span v-if="game.surrendered != null"> ({{ $t('surrendered') }})</span>
 			</template>
 			<template v-else>{{ $t('@.reversi.drawn') }}</template>
--- a/src/client/app/common/views/components/google.vue
+++ b/src/client/app/common/views/components/google.vue
@@ -41,7 +41,6 @@ export default Vue.extend({
 		padding 10px
 		width 100%
 		height 40px
-		font-family sans-serif
 		font-size 16px
 		color var(--googleSearchFg)
 		background var(--googleSearchBg)
--- a/src/client/app/common/views/components/mention.vue
+++ b/src/client/app/common/views/components/mention.vue
@@ -1,11 +1,17 @@
 <template>
-<router-link class="ldlomzub" :to="`/${ canonical }`" v-user-preview="canonical">
+<router-link class="ldlomzub" :to="url" v-user-preview="canonical" v-if="url.startsWith('/')">
 	<span class="me" v-if="isMe">{{ $t('@.you') }}</span>
 	<span class="main">
 		<span class="username">@{{ username }}</span>
 		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="(host != localHost) || $store.state.settings.showFullAcct">@{{ toUnicode(host) }}</span>
 	</span>
 </router-link>
+<a class="ldlomzub" :href="url" target="_blank" rel="noopener" v-else>
+	<span class="main">
+		<span class="username">@{{ username }}</span>
+		<span class="host" :class="{ fade: $store.state.settings.contrastedAcct }">@{{ toUnicode(host) }}</span>
+	</span>
+</a>
 </template>

 <script lang="ts">
@@ -32,6 +38,15 @@ export default Vue.extend({
 		};
 	},
 	computed: {
+		url(): string {
+			switch (this.host) {
+				case 'twitter.com':
+				case 'github.com':
+					return `https://${this.host}/${this.username}`;
+				default:
+					return `/${this.canonical}`;
+			}
+		},
 		canonical(): string {
 			return this.host === localHost ? `@${this.username}` : `@${this.username}@${toUnicode(this.host)}`;
 		},
--- a/src/client/app/common/views/components/messaging-room.form.vue
+++ b/src/client/app/common/views/components/messaging-room.form.vue
@@ -30,6 +30,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import * as autosize from 'autosize';
+import { formatTimeString } from '../../../../../misc/format-time-string';

 export default Vue.extend({
 	i18n: i18n('common/views/components/messaging-room.form.vue'),
@@ -84,13 +85,26 @@ export default Vue.extend({
 		}
 	},
 	methods: {
-		onPaste(e) {
+		async onPaste(e: ClipboardEvent) {
 			const data = e.clipboardData;
 			const items = data.items;

 			if (items.length == 1) {
 				if (items[0].kind == 'file') {
-					this.upload(items[0].getAsFile());
+					const file = items[0].getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, '1')}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+							title: this.$t('@.post-form.enter-file-name'),
+							input: {
+								default: formatted
+							},
+							allowEmpty: false
+						}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
 				}
 			} else {
 				if (items[0].kind == 'file') {
@@ -157,8 +171,8 @@ export default Vue.extend({
 			this.upload((this.$refs.file as any).files[0]);
 		},

-		upload(file) {
-			(this.$refs.uploader as any).upload(file);
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
 		},

 		onUploaded(file) {
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -22,11 +22,11 @@ export default Vue.component('misskey-flavored-markdown', {
 			type: String,
 			required: true
 		},
-		shouldBreak: {
+		plain: {
 			type: Boolean,
-			default: true
+			default: false
 		},
-		plainText: {
+		nowrap: {
 			type: Boolean,
 			default: false
 		},
@@ -50,7 +50,7 @@ export default Vue.component('misskey-flavored-markdown', {
 	render(createElement) {
 		if (this.text == null || this.text == '') return;

-		const ast = (this.plainText ? parsePlain : parse)(this.text);
+		const ast = (this.plain ? parsePlain : parse)(this.text);

 		let bigCount = 0;
 		let motionCount = 0;
@@ -60,7 +60,7 @@ export default Vue.component('misskey-flavored-markdown', {
 				case 'text': {
 					const text = token.node.props.text.replace(/(\r\n|\n|\r)/g, '\n');

-					if (this.shouldBreak) {
+					if (!this.plain) {
 						const x = text.split('\n')
 							.map(t => t == '' ? [createElement('br')] : [createElement('span', t), createElement('br')]);
 						x[x.length - 1].pop();
@@ -270,7 +270,7 @@ export default Vue.component('misskey-flavored-markdown', {
 						},
 						props: {
 							customEmojis: this.customEmojis || customEmojis,
-							normal: this.plainText
+							normal: this.plain
 						}
 					})];
 				}
--- a/src/client/app/common/views/components/misskey-flavored-markdown.vue
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue
@@ -1,5 +1,5 @@
 <template>
-<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/>
+<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ nowrap: $attrs['nowrap'] }" v-once/>
 </template>

 <script lang="ts">
@@ -17,7 +17,7 @@ export default Vue.extend({
 .havbbuyv
 	white-space pre-wrap

-	&.plain
+	&.nowrap
 		white-space pre

 	>>> .title
@@ -30,6 +30,7 @@ export default Vue.extend({
 		border-radius 4px

 	>>> .quote
+		display block
 		margin 8px
 		padding 6px 0 6px 12px
 		color var(--mfmQuote)
--- a/src/client/app/common/views/components/page/page.block.vue
+++ b/src/client/app/common/views/components/page/page.block.vue
@@ -16,10 +16,11 @@ import XIf from './page.if.vue';
 import XTextarea from './page.textarea.vue';
 import XPost from './page.post.vue';
 import XCounter from './page.counter.vue';
+import XRadioButton from './page.radio-button.vue';

 export default Vue.extend({
 	components: {
-		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter
+		XText, XSection, XImage, XButton, XNumberInput, XTextInput, XTextareaInput, XTextarea, XPost, XSwitch, XIf, XCounter, XRadioButton
 	},

 	props: {
--- a/src/client/app/common/views/components/page/page.button.vue
+++ b/src/client/app/common/views/components/page/page.button.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-	<ui-button class="kudkigyw" @click="click()">{{ script.interpolate(value.text) }}</ui-button>
+	<ui-button class="kudkigyw" @click="click()" :primary="value.primary">{{ script.interpolate(value.text) }}</ui-button>
 </div>
 </template>

@@ -27,6 +27,19 @@ export default Vue.extend({
 			} else if (this.value.action === 'resetRandom') {
 				this.script.aiScript.updateRandomSeed(Math.random());
 				this.script.eval();
+			} else if (this.value.action === 'pushEvent') {
+				this.$root.api('page-push', {
+					pageId: this.script.page.id,
+					event: this.value.event,
+					...(this.value.var ? {
+						var: this.script.vars[this.value.var]
+					} : {})
+				});
+
+				this.$root.dialog({
+					type: 'success',
+					text: this.script.interpolate(this.value.message)
+				});
 			}
 		}
 	}
@@ -36,7 +49,7 @@ export default Vue.extend({
 <style lang="stylus" scoped>
 .kudkigyw
 	display inline-block
-	min-width 300px
+	min-width 200px
 	max-width 450px
 	margin 8px 0
 </style>
--- a/src/client/app/common/views/components/page/page.counter.vue
+++ b/src/client/app/common/views/components/page/page.counter.vue
--- a/src/client/app/common/views/components/page/page.if.vue
+++ b/src/client/app/common/views/components/page/page.if.vue
--- a/src/client/app/common/views/components/page/page.image.vue
+++ b/src/client/app/common/views/components/page/page.image.vue
--- a/src/client/app/common/views/components/page/page.number-input.vue
+++ b/src/client/app/common/views/components/page/page.number-input.vue
--- a/src/client/app/common/views/components/page/page.post.vue
+++ b/src/client/app/common/views/components/page/page.post.vue
--- a/src/client/app/common/views/components/page/page.radio-button.vue
+++ b/src/client/app/common/views/components/page/page.radio-button.vue
@@ -0,0 +1,37 @@
+<template>
+<div>
+	<div>{{ script.interpolate(value.title) }}</div>
+	<ui-radio v-for="x in value.values" v-model="v" :value="x" :key="x">{{ x }}</ui-radio>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		value: {
+			required: true
+		},
+		script: {
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			v: this.value.default,
+		};
+	},
+
+	watch: {
+		v() {
+			this.script.aiScript.updatePageVar(this.value.name, this.v);
+			this.script.eval();
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+</style>
--- a/src/client/app/common/views/components/page/page.section.vue
+++ b/src/client/app/common/views/components/page/page.section.vue
--- a/src/client/app/common/views/components/page/page.switch.vue
+++ b/src/client/app/common/views/components/page/page.switch.vue
--- a/src/client/app/common/views/components/page/page.text-input.vue
+++ b/src/client/app/common/views/components/page/page.text-input.vue
--- a/src/client/app/common/views/components/page/page.text.vue
+++ b/src/client/app/common/views/components/page/page.text.vue
--- a/src/client/app/common/views/components/page/page.textarea-input.vue
+++ b/src/client/app/common/views/components/page/page.textarea-input.vue
--- a/src/client/app/common/views/components/page/page.textarea.vue
+++ b/src/client/app/common/views/components/page/page.textarea.vue
--- a/src/client/app/common/views/components/page/page.vue
+++ b/src/client/app/common/views/components/page/page.vue
@@ -1,6 +1,6 @@
 <template>
-<div v-if="page" class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }" :key="path">
-	<header>
+<div class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter, serif: page.font === 'serif' }">
+	<header v-if="showTitle">
 		<div class="title">{{ page.title }}</div>
 	</header>

@@ -8,9 +8,13 @@
 		<x-block v-for="child in page.content" :value="child" @input="v => updateBlock(v)" :page="page" :script="script" :key="child.id" :h="2"/>
 	</div>

-	<footer>
+	<footer v-if="showFooter">
 		<small>@{{ page.user.username }}</small>
-		<router-link v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId" :to="`/i/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link>
+		<template v-if="$store.getters.isSignedIn && $store.state.i.id === page.userId">
+			<router-link :to="`/i/pages/edit/${page.id}`">{{ $t('edit-this-page') }}</router-link>
+			<a v-if="$store.state.i.pinnedPageId === page.id" @click="pin(false)">{{ $t('unpin-this-page') }}</a>
+			<a v-else @click="pin(true)">{{ $t('pin-this-page') }}</a>
+		</template>
 		<router-link :to="`./${page.name}/view-source`">{{ $t('view-source') }}</router-link>
 		<div class="like">
 			<button @click="unlike()" v-if="page.isLiked" :title="$t('unlike')"><fa :icon="faHeartS"/></button>
@@ -25,7 +29,7 @@
 import Vue from 'vue';
 import i18n from '../../../../i18n';
 import { faHeart as faHeartS } from '@fortawesome/free-solid-svg-icons';
-import { faHeart, faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import { faHeart } from '@fortawesome/free-regular-svg-icons';
 import XBlock from './page.block.vue';
 import { ASEvaluator } from '../../../../../../misc/aiscript/evaluator';
 import { collectPageVars } from '../../../scripts/collect-page-vars';
@@ -35,8 +39,10 @@ class Script {
 	public aiScript: ASEvaluator;
 	private onError: any;
 	public vars: Record<string, any>;
+	public page: Record<string, any>;

-	constructor(aiScript, onError) {
+	constructor(page, aiScript, onError) {
+		this.page = page;
 		this.aiScript = aiScript;
 		this.onError = onError;
 		this.eval();
@@ -67,64 +73,43 @@ export default Vue.extend({
 	},

 	props: {
-		pageName: {
-			type: String,
+		page: {
+			type: Object,
 			required: true
 		},
-		username: {
-			type: String,
-			required: true
+		showTitle: {
+			type: Boolean,
+			required: false,
+			default: true
+		},
+		showFooter: {
+			type: Boolean,
+			required: false,
+			default: false
 		},
 	},

 	data() {
 		return {
-			page: null,
 			script: null,
 			faHeartS, faHeart
 		};
 	},

-	computed: {
-		path(): string {
-			return this.username + '/' + this.pageName;
-		}
-	},
-
-	watch: {
-		path() {
-			this.fetch();
-		}
-	},
-
 	created() {
-		this.fetch();
+		const pageVars = this.getPageVars();
+		this.script = new Script(this.page, new ASEvaluator(this.page.variables, pageVars, {
+			randomSeed: Math.random(),
+			user: this.page.user,
+			visitor: this.$store.state.i,
+			page: this.page,
+			url: url
+		}), e => {
+			console.dir(e);
+		});
 	},

 	methods: {
-		fetch() {
-			this.$root.api('pages/show', {
-				name: this.pageName,
-				username: this.username,
-			}).then(page => {
-				this.page = page;
-				this.$emit('init', {
-					title: this.page.title,
-					icon: faStickyNote
-				});
-				const pageVars = this.getPageVars();
-				this.script = new Script(new ASEvaluator(this.page.variables, pageVars, {
-					randomSeed: Math.random(),
-					user: page.user,
-					visitor: this.$store.state.i,
-					page: page,
-					url: url
-				}), e => {
-					console.dir(e);
-				});
-			});
-		},
-
 		getPageVars() {
 			return collectPageVars(this.page.content);
 		},
@@ -145,6 +130,17 @@ export default Vue.extend({
 				this.page.isLiked = false;
 				this.page.likedCount--;
 			});
+		},
+
+		pin(pin) {
+			this.$root.api('i/update', {
+				pinnedPageId: pin ? this.page.id : null,
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					splash: true
+				});
+			});
 		}
 	}
 });
@@ -154,6 +150,10 @@ export default Vue.extend({
 .iroscrza
 	overflow hidden
 	background var(--face)
+	
+	&.serif
+		> div
+			font-family serif

 	&.center
 		text-align center
--- a/src/client/app/common/views/components/poll-editor.vue
+++ b/src/client/app/common/views/components/poll-editor.vue
@@ -26,13 +26,19 @@
 				<option value="after">{{ $t('after') }}</option>
 			</ui-select>
 			<section v-if="expiration === 'at'">
-				<ui-input v-model="atDate" type="date">{{ $t('deadline-date') }}</ui-input>
-				<ui-input v-model="atTime" type="time">{{ $t('deadline-time') }}</ui-input>
+				<ui-input v-model="atDate" type="date">
+					<template #title>{{ $t('deadline-date') }}</template>
+				</ui-input>
+				<ui-input v-model="atTime" type="time">
+					<template #title>{{ $t('deadline-time') }}</template>
+				</ui-input>
 			</section>
 			<section v-if="expiration === 'after'">
-				<ui-input v-model="after" type="number">{{ $t('interval') }}</ui-input>
+				<ui-input v-model="after" type="number">
+					<template #title>{{ $t('interval') }}</template>
+				</ui-input>
 				<ui-select v-model="unit">
-					<template #label>{{ $t('unit') }}</template>
+					<template #title>{{ $t('unit') }}</template>
 					<option value="second">{{ $t('second') }}</option>
 					<option value="minute">{{ $t('minute') }}</option>
 					<option value="hour">{{ $t('hour') }}</option>
--- a/src/client/app/common/views/components/poll.vue
+++ b/src/client/app/common/views/components/poll.vue
@@ -5,7 +5,7 @@
 			<div class="backdrop" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
 			<span>
 				<template v-if="choice.isVoted"><fa icon="check"/></template>
-				<mfm :text="choice.text" :should-break="false" :plain-text="true" :custom-emojis="note.emojis"/>
+				<mfm :text="choice.text" :plain="true" :custom-emojis="note.emojis"/>
 				<span class="votes" v-if="showResult">({{ $t('vote-count').replace('{}', choice.votes) }})</span>
 			</span>
 		</li>
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -276,6 +276,7 @@ export default Vue.extend({
 			font-size 14px
 			color var(--popupFg)
 			border-bottom solid var(--lineWidth) var(--faceDivider)
+			line-height 20px

 		> .buttons
 			padding 4px 4px 8px 4px
--- a/src/client/app/common/views/components/settings/2fa.vue
+++ b/src/client/app/common/views/components/settings/2fa.vue
@@ -28,6 +28,10 @@
 				</div>
 			</div>

+			<ui-switch v-model="usePasswordLessLogin" @change="updatePasswordLessLogin" v-if="$store.state.i.securityKeysList.length > 0">
+				{{ $t('use-password-less-login') }}
+			</ui-switch>
+
 			<ui-info warn v-if="registration && registration.error">{{ $t('something-went-wrong') }} {{ registration.error }}</ui-info>
 			<ui-button v-if="!registration || registration.error" @click="addSecurityKey">{{ $t('register') }}</ui-button>

@@ -80,6 +84,7 @@ export default Vue.extend({
 		return {
 			data: null,
 			supportsCredentials: !!navigator.credentials,
+			usePasswordLessLogin: this.$store.state.i.usePasswordLessLogin,
 			registration: null,
 			keyName: '',
 			token: null
@@ -112,6 +117,9 @@ export default Vue.extend({
 				if (canceled) return;
 				this.$root.api('i/2fa/unregister', {
 					password: password
+				}).then(() => {
+					this.usePasswordLessLogin = false;
+					this.updatePasswordLessLogin();
 				}).then(() => {
 					this.$notify(this.$t('unregistered'));
 					this.$store.state.i.twoFactorEnabled = false;
@@ -157,6 +165,9 @@ export default Vue.extend({
 				return this.$root.api('i/2fa/remove-key', {
 					password,
 					credentialId: key.id
+				}).then(() => {
+					this.usePasswordLessLogin = false;
+					this.updatePasswordLessLogin();
 				}).then(() => {
 					this.$notify(this.$t('key-unregistered'));
 				});
@@ -213,6 +224,11 @@ export default Vue.extend({
 					this.registration.stage = -1;
 				});
 			});
+		},
+		updatePasswordLessLogin() {
+			this.$root.api('i/2fa/password-less', {
+				value: !!this.usePasswordLessLogin
+			});
 		}
 	}
 });
--- a/src/client/app/common/views/components/settings/app-type.vue
+++ b/src/client/app/common/views/components/settings/app-type.vue
@@ -0,0 +1,53 @@
+<template>
+<ui-card>
+	<template #title><fa :icon="faMobileAlt"/> {{ $t('title') }}</template>
+
+	<section class="fit-top">
+		<p>{{ $t('intro') }}</p>
+		<ui-select v-model="appTypeForce" :placeholder="$t('intro')">
+			<option v-for="x in ['auto', 'desktop', 'mobile']" :value="x" :key="x">{{ $t(`choices.${x}`) }}</option>
+		</ui-select>
+		<ui-info warn>{{ $t('info') }}</ui-info>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faMobileAlt } from '@fortawesome/free-solid-svg-icons'
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/settings/app-type.vue'),
+
+	data() {
+		return {
+			faMobileAlt
+		};
+	},
+
+	computed: {
+		appTypeForce: {
+			get() { return this.$store.state.device.appTypeForce; },
+			set(value) {
+				this.$store.commit('device/set', { key: 'appTypeForce', value });
+				this.reload();
+			}
+		},
+	},
+
+	methods: {
+		reload() {
+			this.$root.dialog({
+				type: 'warning',
+				text: this.$t('@.reload-to-apply-the-setting'),
+				showCancelButton: true
+			}).then(({ canceled }) => {
+				if (!canceled) {
+					location.reload();
+				}
+			});
+		},
+	}
+});
+</script>
--- a/src/client/app/common/views/components/settings/drive.vue
+++ b/src/client/app/common/views/components/settings/drive.vue
@@ -11,6 +11,12 @@
 		<header>{{ $t('stats') }}</header>
 		<div ref="chart" style="margin-bottom: -16px; margin-left: -8px; color: #000;"></div>
 	</section>
+
+	<section>
+		<header>{{ $t('default-upload-folder') }}</header>
+		<ui-input v-model="uploadFolderName" readonly>{{ $t('default-upload-folder-name') }}</ui-input>
+		<ui-button @click="chooseUploadFolder()">{{ $t('change-default-upload-folder') }}</ui-button>
+	</section>
 </ui-card>
 </template>

@@ -26,7 +32,8 @@ export default Vue.extend({
 		return {
 			fetching: true,
 			usage: null,
-			capacity: null
+			capacity: null,
+			uploadFolderName: null
 		};
 	},

@@ -40,10 +47,25 @@ export default Vue.extend({
 					l: 0.5
 				})
 			};
-		}
+		},
+
+		uploadFolder: {
+			get() { return this.$store.state.settings.uploadFolder; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'uploadFolder', value }); }
+		},
 	},

 	mounted() {
+		if (this.uploadFolder == null) {
+			this.uploadFolderName = this.$t('@._settings.root');
+		} else {
+			this.$root.api('drive/folders/show', {
+				folderId: this.uploadFolder
+			}).then(folder => {
+				this.uploadFolderName = folder.name;
+			});
+		}
+	
 		this.$root.api('drive').then(info => {
 			this.capacity = info.capacity;
 			this.usage = info.usage;
@@ -89,6 +111,9 @@ export default Vue.extend({
 						height: 150,
 						zoom: {
 							enabled: false
+						},
+						toolbar: {
+							show: false
 						}
 					},
 					plotOptions: {
@@ -152,6 +177,13 @@ export default Vue.extend({

 				chart.render();
 			});
+		},
+
+		chooseUploadFolder() {
+			this.$chooseDriveFolder().then(folder => {
+				this.uploadFolder = folder ? folder.id : null;
+				this.uploadFolderName = folder ? folder.name : this.$t('@._settings.root');
+			})
 		}
 	}
 });
--- a/src/client/app/common/views/components/settings/profile.vue
+++ b/src/client/app/common/views/components/settings/profile.vue
@@ -51,6 +51,26 @@
 				<template #desc v-if="bannerUploading">{{ $t('uploading') }}<mk-ellipsis/></template>
 			</ui-input>

+			<div class="fields">
+				<header>{{ $t('profile-metadata') }}</header>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName0">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue0">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName1">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue1">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName2">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue2">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+				<ui-horizon-group>
+					<ui-input v-model="fieldName3">{{ $t('metadata-label') }}</ui-input>
+					<ui-input v-model="fieldValue3">{{ $t('metadata-content') }}</ui-input>
+				</ui-horizon-group>
+			</div>
+
 			<ui-button @click="save(true)"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
 		</ui-form>
 	</section>
@@ -189,6 +209,17 @@ export default Vue.extend({
 		this.isLocked = this.$store.state.i.isLocked;
 		this.carefulBot = this.$store.state.i.carefulBot;
 		this.autoAcceptFollowed = this.$store.state.i.autoAcceptFollowed;
+
+		if (this.$store.state.i.fields) {
+			this.fieldName0 = this.$store.state.i.fields[0].name;
+			this.fieldValue0 = this.$store.state.i.fields[0].value;
+			this.fieldName1 = this.$store.state.i.fields[1].name;
+			this.fieldValue1 = this.$store.state.i.fields[1].value;
+			this.fieldName2 = this.$store.state.i.fields[2].name;
+			this.fieldValue2 = this.$store.state.i.fields[2].value;
+			this.fieldName3 = this.$store.state.i.fields[3].name;
+			this.fieldValue3 = this.$store.state.i.fields[3].value;
+		}
 	},

 	methods: {
@@ -237,6 +268,13 @@ export default Vue.extend({
 		},

 		save(notify) {
+			const fields = [
+				{ name: this.fieldName0, value: this.fieldValue0 },
+				{ name: this.fieldName1, value: this.fieldValue1 },
+				{ name: this.fieldName2, value: this.fieldValue2 },
+				{ name: this.fieldName3, value: this.fieldValue3 },
+			];
+
 			this.saving = true;

 			this.$root.api('i/update', {
@@ -247,6 +285,7 @@ export default Vue.extend({
 				birthday: this.birthday || null,
 				avatarId: this.avatarId || undefined,
 				bannerId: this.bannerId || undefined,
+				fields,
 				isCat: !!this.isCat,
 				isBot: !!this.isBot,
 				isLocked: !!this.isLocked,
@@ -265,6 +304,29 @@ export default Vue.extend({
 						text: this.$t('saved')
 					});
 				}
+			}).catch(err => {
+				this.saving = false;
+				switch(err.id) {
+					case 'f419f9f8-2f4d-46b1-9fb4-49d3a2fd7191':
+						this.$root.dialog({
+							type: 'error',
+							title: this.$t('unable-to-process'),
+							text: this.$t('avatar-not-an-image')
+						});
+						break;
+					case '75aedb19-2afd-4e6d-87fc-67941256fa60':
+						this.$root.dialog({
+							type: 'error',
+							title: this.$t('unable-to-process'),
+							text: this.$t('banner-not-an-image')
+						});
+						break;
+					default:
+						this.$root.dialog({
+							type: 'error',
+							text: this.$t('unable-to-process')
+						});
+				}
 			});
 		},

@@ -366,4 +428,11 @@ export default Vue.extend({
 			height 72px
 			margin auto

+.fields
+	> header
+		padding 8px 0px
+		font-weight bold
+	> div
+		padding-left 16px
+
 </style>
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -140,7 +140,23 @@

 			<section>
 				<header>{{ $t('@._settings.web-search-engine') }}</header>
-				<ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}<template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template></ui-input>
+				<ui-input v-model="webSearchEngine">{{ $t('@._settings.web-search-engine') }}
+					<template #desc>{{ $t('@._settings.web-search-engine-desc') }}</template>
+				</ui-input>
+				<ui-button @click="save('webSearchEngine', webSearchEngine)"><fa :icon="faSave"/> {{ $t('@._settings.save') }}</ui-button>
+			</section>
+
+			<section v-if="!$root.isMobile">
+				<header>{{ $t('@._settings.paste') }}</header>
+				<ui-input v-model="pastedFileName">{{ $t('@._settings.pasted-file-name') }}
+					<template v-if="pastedFileName === this.$store.state.settings.pastedFileName" #desc>{{ $t('@._settings.pasted-file-name-desc') }}</template>
+					<template v-else #desc>{{ pastedFileNamePreview() }}</template>
+				</ui-input>
+				<ui-button @click="save('pastedFileName', pastedFileName)"><fa :icon="faSave"/> {{ $t('@._settings.save') }}</ui-button>
+
+				<ui-switch v-model="pasteDialog">{{ $t('@._settings.paste-dialog') }}
+					<template #desc>{{ $t('@._settings.paste-dialog-desc') }}</template>
+				</ui-switch>
 			</section>
 		</ui-card>

@@ -163,6 +179,7 @@
 		</ui-card>

 		<x-language/>
+		<x-app-type/>
 	</template>

 	<template v-if="page == null || page == 'notification'">
@@ -271,10 +288,13 @@ import XPassword from './password.vue';
 import XProfile from './profile.vue';
 import XApi from './api.vue';
 import XLanguage from './language.vue';
+import XAppType from './app-type.vue';
 import XNotification from './notification.vue';

 import { url, version } from '../../../../config';
 import checkForUpdate from '../../../scripts/check-for-update';
+import { formatTimeString } from '../../../../../../misc/format-time-string';
+import { faSave } from '@fortawesome/free-regular-svg-icons';

 export default Vue.extend({
 	i18n: i18n(),
@@ -291,6 +311,7 @@ export default Vue.extend({
 		XProfile,
 		XApi,
 		XLanguage,
+		XAppType,
 		XNotification,
 	},
 	props: {
@@ -304,8 +325,11 @@ export default Vue.extend({
 		return {
 			meta: null,
 			version,
+			webSearchEngine: this.$store.state.settings.webSearchEngine,
+			pastedFileName : this.$store.state.settings.pastedFileName,
 			latestVersion: undefined,
-			checkingForUpdate: false
+			checkingForUpdate: false,
+			faSave
 		};
 	},
 	computed: {
@@ -404,9 +428,9 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'defaultNoteVisibility', value }); }
 		},

-		webSearchEngine: {
-			get() { return this.$store.state.settings.webSearchEngine; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'webSearchEngine', value }); }
+		pasteDialog: {
+			get() { return this.$store.state.settings.pasteDialog; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'pasteDialog', value }); }
 		},

 		showReplyTarget: {
@@ -540,6 +564,17 @@ export default Vue.extend({
 				}
 			});
 		},
+		save(key, value) {
+			this.$store.dispatch('settings/set', {
+				key,
+				value
+			}).then(() => {
+				this.$root.dialog({
+					type: 'success',
+					text: this.$t('@._settings.saved')
+				})
+			});
+		},
 		customizeHome() {
 			location.href = '/?customize';
 		},
@@ -575,7 +610,10 @@ export default Vue.extend({
 			const sound = new Audio(`${url}/assets/message.mp3`);
 			sound.volume = this.$store.state.device.soundVolume;
 			sound.play();
-		}
+		},
+		pastedFileNamePreview() {
+			return `${formatTimeString(new Date(), this.pastedFileName).replace(/{{number}}/g, `1`)}.png`
+		},
 	}
 });
 </script>
--- a/src/client/app/common/views/components/signin.vue
+++ b/src/client/app/common/views/components/signin.vue
@@ -7,7 +7,7 @@
 			<template #prefix>@</template>
 			<template #suffix>@{{ host }}</template>
 		</ui-input>
-		<ui-input v-model="password" type="password" :with-password-toggle="true" required>
+		<ui-input v-model="password" type="password" :with-password-toggle="true" v-if="!user || user && !user.usePasswordLessLogin" required>
 			<span>{{ $t('password') }}</span>
 			<template #prefix><fa icon="lock"/></template>
 		</ui-input>
@@ -28,6 +28,10 @@
 		</div>
 		<div class="twofa-group totp-group">
 			<p style="margin-bottom:0;">{{ $t('enter-2fa-code') }}</p>
+			<ui-input v-model="password" type="password" :with-password-toggle="true" v-if="user && user.usePasswordLessLogin" required>
+				<span>{{ $t('password') }}</span>
+				<template #prefix><fa icon="lock"/></template>
+			</ui-input>
 			<ui-input v-model="token" type="text" pattern="^[0-9]{6}$" autocomplete="off" spellcheck="false" required>
 				<span>{{ $t('@.2fa') }}</span>
 				<template #prefix><fa icon="gavel"/></template>
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -43,7 +43,7 @@
 			</i18n>
 		</ui-switch>
 		<div v-if="meta.enableRecaptcha" class="g-recaptcha" :data-sitekey="meta.recaptchaSiteKey" style="margin: 16px 0;"></div>
-		<ui-button type="submit" :disabled="!(meta.ToSUrl ? ToSAgreement : true) || passwordRetypeState == 'not-match'">{{ $t('create') }}</ui-button>
+		<ui-button type="submit" :disabled=" submitting || !(meta.ToSUrl ? ToSAgreement : true) || passwordRetypeState == 'not-match'">{{ $t('create') }}</ui-button>
 	</template>
 </form>
 </template>
@@ -70,6 +70,7 @@ export default Vue.extend({
 			passwordStrength: '',
 			passwordRetypeState: null,
 			meta: {},
+			submitting: false,
 			ToSAgreement: false
 		}
 	},
@@ -145,6 +146,9 @@ export default Vue.extend({
 		},

 		onSubmit() {
+			if (this.submitting) return;
+			this.submitting = true;
+
 			this.$root.api('signup', {
 				username: this.username,
 				password: this.password,
@@ -159,6 +163,8 @@ export default Vue.extend({
 					location.href = '/';
 				});
 			}).catch(() => {
+				this.submitting = false;
+
 				this.$root.dialog({
 					type: 'error',
 					text: this.$t('some-error')
--- a/src/client/app/common/views/components/uploader.vue
+++ b/src/client/app/common/views/components/uploader.vue
@@ -46,7 +46,7 @@ export default Vue.extend({
 			});
 		},

-		upload(file: File, folder: any) {
+		upload(file: File, folder: any, name?: string) {
 			if (folder && typeof folder == 'object') folder = folder.id;

 			const id = Math.random();
@@ -61,7 +61,7 @@ export default Vue.extend({

 					const ctx = {
 						id: id,
-						name: file.name || 'untitled',
+						name: name || file.name || 'untitled',
 						progress: undefined,
 						img: window.URL.createObjectURL(file)
 					};
@@ -75,6 +75,7 @@ export default Vue.extend({
 					data.append('file', file);

 					if (folder) data.append('folderId', folder);
+					if (name) data.append('name', name);

 					const xhr = new XMLHttpRequest();
 					xhr.open('POST', apiUrl + '/drive/files/create', true);
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -63,8 +63,10 @@ export default Vue.extend({
 	data() {
 		const isSelf = this.url.startsWith(local);
 		const hasRoute =
+			(this.url.substr(local.length) === '/') ||
 			this.url.substr(local.length).startsWith('/@') ||
 			this.url.substr(local.length).startsWith('/notes/') ||
+			this.url.substr(local.length).startsWith('/tags/') ||
 			this.url.substr(local.length).startsWith('/pages/');
 		return {
 			local,
--- a/src/client/app/common/views/components/url.vue
+++ b/src/client/app/common/views/components/url.vue
@@ -28,6 +28,7 @@ export default Vue.extend({
 			(this.url.substr(local.length) === '/') ||
 			this.url.substr(local.length).startsWith('/@') ||
 			this.url.substr(local.length).startsWith('/notes/') ||
+			this.url.substr(local.length).startsWith('/tags/') ||
 			this.url.substr(local.length).startsWith('/pages/'));
 		return {
 			local,
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@@ -16,7 +16,7 @@
 					<p class="username">@{{ user | acct }}</p>
 				</div>
 				<div class="description" v-if="user.description" :title="user.description">
-					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :should-break="false" :plain-text="true"/>
+					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :plain="true" :nowrap="true"/>
 				</div>
 				<mk-follow-button class="follow-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/>
 			</div>
--- a/src/client/app/common/views/components/user-name.vue
+++ b/src/client/app/common/views/components/user-name.vue
@@ -1,5 +1,5 @@
 <template>
-<mfm :text="user.name || user.username" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+<mfm :text="user.name || user.username" :plain="true" :nowrap="true" :custom-emojis="user.emojis"/>
 </template>

 <script lang="ts">
--- a/src/client/app/common/views/deck/deck.notification.vue
+++ b/src/client/app/common/views/deck/deck.notification.vue
@@ -12,7 +12,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>
-					<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+					<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :custom-emojis="notification.note.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -30,7 +30,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 				<fa icon="quote-left"/>
-					<mfm :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
+					<mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="true" :custom-emojis="notification.note.renote.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -74,7 +74,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>
-					<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+					<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :custom-emojis="notification.note.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
--- a/src/client/app/common/views/deck/deck.page-column.vue
+++ b/src/client/app/common/views/deck/deck.page-column.vue
@@ -0,0 +1,69 @@
+<template>
+<x-column>
+	<template #header>
+		<fa :icon="faStickyNote"/>{{ page ? page.name : '' }}
+	</template>
+
+	<div v-if="page">
+		<x-page :page="page" :key="page.id"/>
+	</div>
+</x-column>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import i18n from '../../../i18n';
+import XColumn from './deck.column.vue';
+import XPage from '../../../common/views/components/page/page.vue';
+
+export default Vue.extend({
+	i18n: i18n(),
+
+	components: {
+		XColumn,
+		XPage
+	},
+
+	props: {
+		pageName: {
+			type: String,
+			required: true
+		},
+		username: {
+			type: String,
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			page: null,
+			faStickyNote
+		};
+	},
+
+	watch: {
+		$route: 'fetch'
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.username,
+			}).then(page => {
+				this.page = page;
+				this.$emit('init', {
+					title: this.page.title,
+					icon: faStickyNote
+				});
+			});
+		}
+	}
+});
+</script>
--- a/src/client/app/common/views/deck/deck.user-column.home.vue
+++ b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -1,5 +1,11 @@
 <template>
 <div>
+	<ui-container v-if="user.pinnedPage" :body-togglable="true">
+		<template #header><fa icon="thumbtack"/> {{ $t('pinned-page') }}</template>
+		<div>
+			<x-page :page="user.pinnedPage" :key="user.pinnedPage.id" :show-title="!user.pinnedPage.hideTitleWhenPinned"/>
+		</div>
+	</ui-container>
 	<ui-container v-if="user.pinnedNotes && user.pinnedNotes.length > 0" :body-togglable="true">
 		<template #header><fa icon="thumbtack"/> {{ $t('pinned-notes') }}</template>
 		<div>
@@ -48,6 +54,7 @@ export default Vue.extend({

 	components: {
 		XNotes,
+		XPage: () => import('../../../common/views/components/page/page.vue').then(m => m.default),
 	},

 	props: {
--- a/src/client/app/common/views/deck/deck.user-column.vue
+++ b/src/client/app/common/views/deck/deck.user-column.vue
@@ -30,7 +30,7 @@
 			<div class="fields" v-if="user.fields">
 				<dl class="field" v-for="(field, i) in user.fields" :key="i">
 					<dt class="name">
-						<mfm :text="field.name" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+						<mfm :text="field.name" :plain="true" :custom-emojis="user.emojis"/>
 					</dt>
 					<dd class="value">
 						<mfm :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching">
 	<div class="signed-in-as">
-		<mfm :text="$t('signed-in-as').replace('{}', myName)" :should-break="false" :plain-text="true" :custom-emojis="$store.state.i.emojis"/>
+		<mfm :text="$t('signed-in-as').replace('{}', myName)" :plain="true" :custom-emojis="$store.state.i.emojis"/>
 	</div>
 	<main>
 		<div class="banner" :style="bannerStyle"></div>
--- a/src/client/app/common/views/pages/page-editor/els/page-editor.el.button.vue
+++ b/src/client/app/common/views/pages/page-editor/els/page-editor.el.button.vue
@@ -4,12 +4,31 @@

 	<section class="xfhsjczc">
 		<ui-input v-model="value.text"><span>{{ $t('blocks._button.text') }}</span></ui-input>
+		<ui-switch v-model="value.primary"><span>{{ $t('blocks._button.colored') }}</span></ui-switch>
 		<ui-select v-model="value.action">
 			<template #label>{{ $t('blocks._button.action') }}</template>
 			<option value="dialog">{{ $t('blocks._button._action.dialog') }}</option>
 			<option value="resetRandom">{{ $t('blocks._button._action.resetRandom') }}</option>
+			<option value="pushEvent">{{ $t('blocks._button._action.pushEvent') }}</option>
 		</ui-select>
-		<ui-input v-if="value.action === 'dialog'" v-model="value.content"><span>{{ $t('blocks._button._action._dialog.content') }}</span></ui-input>
+		<template v-if="value.action === 'dialog'">
+			<ui-input v-model="value.content"><span>{{ $t('blocks._button._action._dialog.content') }}</span></ui-input>
+		</template>
+		<template v-else-if="value.action === 'pushEvent'">
+			<ui-input v-model="value.event"><span>{{ $t('blocks._button._action._pushEvent.event') }}</span></ui-input>
+			<ui-input v-model="value.message"><span>{{ $t('blocks._button._action._pushEvent.message') }}</span></ui-input>
+			<ui-select v-model="value.var">
+				<template #label>{{ $t('blocks._button._action._pushEvent.variable') }}</template>
+				<option :value="null">{{ $t('blocks._button._action._pushEvent.no-variable') }}</option>
+				<option v-for="v in aiScript.getVarsByType()" :value="v.name">{{ v.name }}</option>
+				<optgroup :label="$t('script.pageVariables')">
+					<option v-for="v in aiScript.getPageVarsByType()" :value="v">{{ v }}</option>
+				</optgroup>
+				<optgroup :label="$t('script.enviromentVariables')">
+					<option v-for="v in aiScript.getEnvVarsByType()" :value="v">{{ v }}</option>
+				</optgroup>
+			</ui-select>
+		</template>
 	</section>
 </x-container>
 </template>
@@ -31,6 +50,9 @@ export default Vue.extend({
 		value: {
 			required: true
 		},
+		aiScript: {
+			required: true,
+		},
 	},

 	data() {
@@ -43,6 +65,10 @@ export default Vue.extend({
 		if (this.value.text == null) Vue.set(this.value, 'text', '');
 		if (this.value.action == null) Vue.set(this.value, 'action', 'dialog');
 		if (this.value.content == null) Vue.set(this.value, 'content', null);
+		if (this.value.event == null) Vue.set(this.value, 'event', null);
+		if (this.value.message == null) Vue.set(this.value, 'message', null);
+		if (this.value.primary == null) Vue.set(this.value, 'primary', false);
+		if (this.value.var == null) Vue.set(this.value, 'var', null);
 	},
 });
 </script>
--- a/src/client/app/common/views/pages/page-editor/els/page-editor.el.radio-button.vue
+++ b/src/client/app/common/views/pages/page-editor/els/page-editor.el.radio-button.vue
@@ -0,0 +1,53 @@
+<template>
+<x-container @remove="() => $emit('remove')" :draggable="true">
+	<template #header><fa :icon="faBolt"/> {{ $t('blocks.radioButton') }}</template>
+
+	<section style="padding: 0 16px 16px 16px;">
+		<ui-input v-model="value.name"><template #prefix><fa :icon="faMagic"/></template><span>{{ $t('blocks._radioButton.name') }}</span></ui-input>
+		<ui-input v-model="value.title"><span>{{ $t('blocks._radioButton.title') }}</span></ui-input>
+		<ui-textarea v-model="values"><span>{{ $t('blocks._radioButton.values') }}</span></ui-textarea>
+		<ui-input v-model="value.default"><span>{{ $t('blocks._radioButton.default') }}</span></ui-input>
+	</section>
+</x-container>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faBolt, faMagic } from '@fortawesome/free-solid-svg-icons';
+import i18n from '../../../../../i18n';
+import XContainer from '../page-editor.container.vue';
+
+export default Vue.extend({
+	i18n: i18n('pages'),
+
+	components: {
+		XContainer
+	},
+
+	props: {
+		value: {
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			values: '',
+			faBolt, faMagic
+		};
+	},
+
+	watch: {
+		values() {
+			Vue.set(this.value, 'values', this.values.split('\n'));
+		}
+	},
+
+	created() {
+		if (this.value.name == null) Vue.set(this.value, 'name', '');
+		if (this.value.title == null) Vue.set(this.value, 'title', '');
+		if (this.value.values == null) Vue.set(this.value, 'values', []);
+		this.values = this.value.values.join('\n');
+	},
+});
+</script>
--- a/src/client/app/common/views/pages/page-editor/page-editor.blocks.vue
+++ b/src/client/app/common/views/pages/page-editor/page-editor.blocks.vue
@@ -19,10 +19,11 @@ import XSwitch from './els/page-editor.el.switch.vue';
 import XIf from './els/page-editor.el.if.vue';
 import XPost from './els/page-editor.el.post.vue';
 import XCounter from './els/page-editor.el.counter.vue';
+import XRadioButton from './els/page-editor.el.radio-button.vue';

 export default Vue.extend({
 	components: {
-		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter
+		XDraggable, XSection, XText, XImage, XButton, XTextarea, XTextInput, XTextareaInput, XNumberInput, XSwitch, XIf, XPost, XCounter, XRadioButton
 	},

 	props: {
--- a/src/client/app/common/views/pages/page-editor/page-editor.vue
+++ b/src/client/app/common/views/pages/page-editor/page-editor.vue
@@ -35,6 +35,8 @@
 					<option value="sans-serif">{{ $t('fontSansSerif') }}</option>
 				</ui-select>

+				<ui-switch v-model="hideTitleWhenPinned">{{ $t('hide-title-when-pinned') }}</ui-switch>
+
 				<div class="eyeCatch">
 					<ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catching-image') }}</ui-button>
 					<div v-else-if="eyeCatchingImage">
@@ -140,6 +142,7 @@ export default Vue.extend({
 			font: 'sans-serif',
 			content: [],
 			alignCenter: false,
+			hideTitleWhenPinned: false,
 			variables: [],
 			aiScript: null,
 			showOptions: false,
@@ -192,6 +195,7 @@ export default Vue.extend({
 			this.currentName = this.page.name;
 			this.summary = this.page.summary;
 			this.font = this.page.font;
+			this.hideTitleWhenPinned = this.page.hideTitleWhenPinned;
 			this.alignCenter = this.page.alignCenter;
 			this.content = this.page.content;
 			this.variables = this.page.variables;
@@ -223,6 +227,7 @@ export default Vue.extend({
 					name: this.name.trim(),
 					summary: this.summary,
 					font: this.font,
+					hideTitleWhenPinned: this.hideTitleWhenPinned,
 					alignCenter: this.alignCenter,
 					content: this.content,
 					variables: this.variables,
@@ -240,6 +245,7 @@ export default Vue.extend({
 					name: this.name.trim(),
 					summary: this.summary,
 					font: this.font,
+					hideTitleWhenPinned: this.hideTitleWhenPinned,
 					alignCenter: this.alignCenter,
 					content: this.content,
 					variables: this.variables,
@@ -336,6 +342,7 @@ export default Vue.extend({
 				label: this.$t('input-blocks'),
 				items: [
 					{ value: 'button', text: this.$t('blocks.button') },
+					{ value: 'radioButton', text: this.$t('blocks.radioButton') },
 					{ value: 'textInput', text: this.$t('blocks.textInput') },
 					{ value: 'textareaInput', text: this.$t('blocks.textareaInput') },
 					{ value: 'numberInput', text: this.$t('blocks.numberInput') },
--- a/src/client/app/common/views/pages/page.vue
+++ b/src/client/app/common/views/pages/page.vue
@@ -0,0 +1,63 @@
+<template>
+<x-page v-if="page" :page="page" :key="page.id" :show-footer="true"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
+import XPage from '../components/page/page.vue';
+
+export default Vue.extend({
+	components: {
+		XPage
+	},
+
+	props: {
+		pageName: {
+			type: String,
+			required: true
+		},
+		username: {
+			type: String,
+			required: true
+		},
+	},
+
+	data() {
+		return {
+			page: null,
+		};
+	},
+
+	computed: {
+		path(): string {
+			return this.username + '/' + this.pageName;
+		}
+	},
+
+	watch: {
+		path() {
+			this.fetch();
+		}
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.username,
+			}).then(page => {
+				this.page = page;
+				this.$emit('init', {
+					title: this.page.title,
+					icon: faStickyNote
+				});
+			});
+		},
+	}
+});
+</script>
--- a/src/client/app/common/views/widgets/post-form.vue
+++ b/src/client/app/common/views/widgets/post-form.vue
@@ -38,6 +38,7 @@
 import define from '../../../common/define-widget';
 import i18n from '../../../i18n';
 import insertTextAtCursor from 'insert-text-at-cursor';
+import { formatTimeString } from '../../../../../misc/format-time-string';

 export default define({
 	name: 'post-form',
@@ -109,10 +110,23 @@ export default define({
 			if ((e.which == 10 || e.which == 13) && (e.ctrlKey || e.metaKey) && !this.posting && this.text) this.post();
 		},

-		onPaste(e) {
-			for (const item of Array.from(e.clipboardData.items)) {
+		async onPaste(e: ClipboardEvent) {
+			for (const { item, i } of Array.from(e.clipboardData.items).map((item, i) => ({item, i}))) {
 				if (item.kind == 'file') {
-					this.upload(item.getAsFile());
+					const file = item.getAsFile();
+					const lio = file.name.lastIndexOf('.');
+					const ext = lio >= 0 ? file.name.slice(lio) : '';
+					const formatted = `${formatTimeString(new Date(file.lastModified), this.$store.state.settings.pastedFileName).replace(/{{number}}/g, `${i + 1}`)}${ext}`;
+					const name = this.$store.state.settings.pasteDialog
+						? await this.$root.dialog({
+								title: this.$t('@.post-form.enter-file-name'),
+								input: {
+									default: formatted
+								},
+								allowEmpty: false
+							}).then(({ canceled, result }) => canceled ? false : result)
+						: formatted;
+					if (name) this.upload(file, name);
 				}
 			}
 		},
@@ -121,8 +135,8 @@ export default define({
 			for (const x of Array.from((this.$refs.file as any).files)) this.upload(x);
 		},

-		upload(file) {
-			(this.$refs.uploader as any).upload(file);
+		upload(file: File, name?: string) {
+			(this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder, name);
 		},

 		onDragover(e) {
--- a/src/client/app/desktop/api/update-avatar.ts
+++ b/src/client/app/desktop/api/update-avatar.ts
@@ -83,6 +83,21 @@ export default ($root: any) => {
 			});

 			return i;
+		}).catch(err => {
+			switch (err.id) {
+				case 'f419f9f8-2f4d-46b1-9fb4-49d3a2fd7191':
+					$root.dialog({
+						type: 'error',
+						title: locale['desktop']['unable-to-process'],
+						text: locale['desktop']['invalid-filetype']
+					});
+					break;
+				default:
+					$root.dialog({
+						type: 'error',
+						text: locale['desktop']['unable-to-process']
+					});
+			}
 		});
 	};

--- a/src/client/app/desktop/api/update-banner.ts
+++ b/src/client/app/desktop/api/update-banner.ts
@@ -83,6 +83,21 @@ export default ($root: any) => {
 			});

 			return i;
+		}).catch(err => {
+			switch (err.id) {
+				case '75aedb19-2afd-4e6d-87fc-67941256fa60':
+					$root.dialog({
+						type: 'error',
+						title: locale['desktop']['unable-to-process'],
+						text: locale['desktop']['invalid-filetype']
+					});
+					break;
+				default:
+					$root.dialog({
+						type: 'error',
+						text: locale['desktop']['unable-to-process']
+					});
+			}
 		});
 	};

--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -148,6 +148,7 @@ init(async (launch, os) => {
 					{ path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) },
 					{ path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) },
 					{ path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) },
+					{ path: '/@:username/pages/:pageName', name: 'page', props: true, component: () => import('../common/views/deck/deck.page-column.vue').then(m => m.default) },
 				]}
 				: { path: '/', component: MkHome, children: [
 					{ path: '', name: 'index', component: MkHomeTimeline },
@@ -171,12 +172,11 @@ init(async (launch, os) => {
 					{ path: '/i/follow-requests', component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) },
 					{ path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) },
 					{ path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) },
-					{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
+					{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
 					{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 				]},
 			{ path: '/i/pages/new', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default) },
 			{ path: '/i/pages/edit/:pageId', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initPageId: route.params.pageId }) },
-			{ path: '/@:user/pages/:page', component: () => import('../common/views/pages/page/page.vue').then(m => m.default), props: route => ({ pageName: route.params.page, username: route.params.user }) },
 			{ path: '/@:user/pages/:pageName/view-source', component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), props: route => ({ initUser: route.params.user, initPageName: route.params.pageName }) },
 			{ path: '/i/messaging/group/:group', component: MkMessagingRoom },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
--- a/src/client/app/desktop/views/components/drive.folder.vue
+++ b/src/client/app/desktop/views/components/drive.folder.vue
@@ -20,6 +20,9 @@
 		<template v-if="!hover"><fa :icon="['far', 'folder']" fixed-width/></template>
 		{{ folder.name }}
 	</p>
+	<p class="upload" v-if="$store.state.settings.uploadFolder == folder.id">
+		{{ $t('upload-folder') }}
+	</p>
 </div>
 </template>

@@ -73,6 +76,14 @@ export default Vue.extend({
 				text: this.$t('@.delete'),
 				icon: ['far', 'trash-alt'],
 				action: this.deleteFolder
+			}, null, {
+				type: 'nest',
+				text: this.$t('contextmenu.else-folders'),
+				menu: [{
+					type: 'item',
+					text: this.$t('contextmenu.set-as-upload-folder'),
+					action: this.setAsUploadFolder
+				}]
 			}], {
 				closed: () => {
 					this.isContextmenuShowing = false;
@@ -213,8 +224,37 @@ export default Vue.extend({
 		deleteFolder() {
 			this.$root.api('drive/folders/delete', {
 				folderId: this.folder.id
+			}).then(() => {
+				if (this.$store.state.settings.uploadFolder === this.folder.id) {
+					this.$store.dispatch('settings/set', {
+						key: 'uploadFolder',
+						value: null
+					});
+				}
+			}).catch(err => {
+				switch(err.id) {
+					case 'b0fc8a17-963c-405d-bfbc-859a487295e1':
+						this.$root.dialog({
+							type: 'error',
+							title: this.$t('unable-to-delete'),
+							text: this.$t('has-child-files-or-folders')
+						});
+						break;
+					default:
+						this.$root.dialog({
+							type: 'error',
+							text: this.$t('unable-to-delete')
+						});
+				}
 			});
-		}
+		},
+
+		setAsUploadFolder() {
+			this.$store.dispatch('settings/set', {
+				key: 'uploadFolder',
+				value: this.folder.id
+			});
+		},
 	}
 });
 </script>
@@ -264,4 +304,10 @@ export default Vue.extend({
 			margin-left 2px
 			text-align left

+	> .upload
+		margin 4px 4px
+		font-size 0.8em
+		text-align right
+		color var(--desktopDriveFolderFg)
+
 </style>
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@@ -10,10 +10,6 @@
 			<span class="separator" v-if="folder != null"><fa icon="angle-right"/></span>
 			<span class="folder current" v-if="folder != null">{{ folder.name }}</span>
 		</div>
-		<!--
-			TODO: #343
-			<input class="search" type="search" placeholder="&#xf002; %i18n:@search%"/>
-		-->
 	</nav>
 	<div class="main" :class="{ uploading: uploadings.length > 0, fetching }"
 		ref="main"
@@ -26,19 +22,19 @@
 	>
 		<div class="selection" ref="selection"></div>
 		<div class="contents" ref="contents">
-			<div class="folders" ref="foldersContainer" v-if="folders.length > 0">
+			<div class="folders" ref="foldersContainer" v-if="folders.length > 0 || moreFolders">
 				<x-folder v-for="folder in folders" :key="folder.id" class="folder" :folder="folder"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="n in 16"></div>
 				<ui-button v-if="moreFolders">{{ $t('@.load-more') }}</ui-button>
 			</div>
-			<div class="files" ref="filesContainer" v-if="files.length > 0">
+			<div class="files" ref="filesContainer" v-if="files.length > 0 || moreFiles">
 				<x-file v-for="file in files" :key="file.id" class="file" :file="file"/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div class="padding" v-for="n in 16"></div>
 				<ui-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('@.load-more') }}</ui-button>
 			</div>
-			<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
+			<div class="empty" v-if="files.length == 0 && !moreFiles && folders.length == 0 && !moreFolders && !fetching">
 				<p v-if="draghover">{{ $t('empty-draghover') }}</p>
 				<p v-if="!draghover && folder == null"><strong>{{ $t('empty-drive') }}</strong><br/>{{ $t('empty-drive-description') }}</p>
 				<p v-if="!draghover && folder != null">{{ $t('empty-folder') }}</p>
@@ -647,33 +643,6 @@ export default Vue.extend({
 					> [data-icon]
 						margin 0

-		> .search
-			display inline-block
-			vertical-align bottom
-			user-select text
-			cursor auto
-			margin 0
-			padding 0 18px
-			width 200px
-			font-size 1em
-			line-height 38px
-			background transparent
-			outline none
-			//border solid 1px #ddd
-			border none
-			border-radius 0
-			box-shadow none
-			transition color 0.5s ease, border 0.5s ease
-			font-family FontAwesome, sans-serif
-
-			&[data-active='true']
-				background #fff
-
-			&::-webkit-input-placeholder,
-			&:-ms-input-placeholder,
-			&:-moz-placeholder
-				color $ui-control-foreground-color
-
 	> .main
 		padding 8px
 		height calc(100% - 38px)
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -24,7 +24,7 @@
 							</p>
 							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 								<fa icon="quote-left"/>
-									<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+									<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :custom-emojis="notification.note.emojis"/>
 								<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -40,7 +40,7 @@
 							</p>
 							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 								<fa icon="quote-left"/>
-									<mfm :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
+									<mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="true" :custom-emojis="notification.note.renote.emojis"/>
 								<fa icon="quote-right"/>
 							</router-link>
 						</div>
@@ -55,7 +55,7 @@
 								</router-link>
 							</p>
 							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
-								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+								<mfm :text="getNoteSummary(notification.note)" :plain="true" :custom-emojis="notification.note.emojis"/>
 							</router-link>
 						</div>
 					</template>
@@ -91,7 +91,7 @@
 								</router-link>
 							</p>
 							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
-								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+								<mfm :text="getNoteSummary(notification.note)" :plain="true" :custom-emojis="notification.note.emojis"/>
 							</router-link>
 						</div>
 					</template>
@@ -105,7 +105,7 @@
 								</router-link>
 							</p>
 							<router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
-								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+								<mfm :text="getNoteSummary(notification.note)" :plain="true" :custom-emojis="notification.note.emojis"/>
 							</router-link>
 						</div>
 					</template>
@@ -118,7 +118,7 @@
 							</router-link></p>
 							<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 								<fa icon="quote-left"/>
-									<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+									<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :custom-emojis="notification.note.emojis"/>
 								<fa icon="quote-right"/>
 							</router-link>
 						</div>
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -197,7 +197,6 @@ export default Vue.extend({
 			max-width 16em
 			line-height 48px
 			font-weight bold
-			font-family Meiryo, sans-serif
 			text-decoration none

 			@media (max-width 1100px)
--- a/src/client/app/desktop/views/home/home.vue
+++ b/src/client/app/desktop/views/home/home.vue
@@ -62,7 +62,7 @@
 				</div>
 			</template>
 			<template v-else>
-				<div v-for="place in ['left', 'right']" :class="place">
+				<div v-for="place in ['left', 'right']" :class="place" :key="place">
 					<component v-for="widget in widgets[place]" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" platform="desktop"/>
 				</div>
 				<div class="main">
@@ -392,7 +392,7 @@ export default Vue.extend({
 					margin 0 auto

 		&:not(.side)
-			@media (max-width 1200px)
+			@media (max-width 1100px)
 				> *:not(.main)
 					display none

--- a/src/client/app/desktop/views/home/timeline.vue
+++ b/src/client/app/desktop/views/home/timeline.vue
@@ -4,12 +4,12 @@
 	<div class="main">
 		<component :is="src == 'list' ? 'mk-user-list-timeline' : 'x-core'" ref="tl" v-bind="options">
 			<header class="zahtxcqi">
-				<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
-				<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
-				<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
-				<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
-				<span :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</span>
-				<span :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</span>
+				<div :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</div>
+				<div :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</div>
+				<div :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</div>
+				<div :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</div>
+				<div :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</div>
+				<div :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.name }}</div>
 				<div class="buttons">
 					<button :data-active="src == 'mentions'" @click="src = 'mentions'" :title="$t('mentions')"><fa icon="at"/><i class="indicator" v-if="$store.state.i.hasUnreadMentions"><fa icon="circle"/></i></button>
 					<button :data-active="src == 'messages'" @click="src = 'messages'" :title="$t('messages')"><fa :icon="['far', 'envelope']"/><i class="indicator" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></button>
@@ -200,18 +200,19 @@ export default Vue.extend({
 		&.shadow
 			box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)

-	.zahtxcqi
+	header.zahtxcqi
+		display flex
+		flex-wrap wrap
 		padding 0 8px
 		z-index 10
 		background var(--faceHeader)
 		box-shadow 0 var(--lineWidth) var(--desktopTimelineHeaderShadow)

+		> *
+			flex-shrink 0
+
 		> .buttons
-			position absolute
-			z-index 2
-			top 0
-			right 0
-			padding-right 8px
+			margin-left auto

 			> button
 				padding 0 8px
@@ -244,8 +245,7 @@ export default Vue.extend({
 						height 2px
 						background var(--primary)

-		> span
-			display inline-block
+		> div:not(.buttons)
 			padding 0 10px
 			line-height 42px
 			font-size 12px
--- a/src/client/app/desktop/views/home/user/user.header.vue
+++ b/src/client/app/desktop/views/home/user/user.header.vue
@@ -28,7 +28,7 @@
 		<div class="fields" v-if="user.fields">
 			<dl class="field" v-for="(field, i) in user.fields" :key="i">
 				<dt class="name">
-					<mfm :text="field.name" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+					<mfm :text="field.name" :plain="true" :custom-emojis="user.emojis"/>
 				</dt>
 				<dd class="value">
 					<mfm :text="field.value" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/>
--- a/src/client/app/desktop/views/home/user/user.home.vue
+++ b/src/client/app/desktop/views/home/user/user.home.vue
@@ -1,5 +1,6 @@
 <template>
 <div class="lnctpgve">
+	<x-page v-if="user.pinnedPage" :page="user.pinnedPage" :key="user.pinnedPage.id" :show-title="!user.pinnedPage.hideTitleWhenPinned"/>
 	<mk-note-detail v-for="n in user.pinnedNotes" :key="n.id" :note="n" :compact="true"/>
 	<!--<mk-calendar @chosen="warp" :start="new Date(user.createdAt)"/>-->
 	<div class="activity">
@@ -21,13 +22,15 @@ import i18n from '../../../../i18n';
 import XTimeline from './user.timeline.vue';
 import XPhotos from './user.photos.vue';
 import XActivity from '../../../../common/views/components/activity.vue';
+import XPage from '../../../../common/views/components/page/page.vue';

 export default Vue.extend({
 	i18n: i18n(),
 	components: {
 		XTimeline,
 		XPhotos,
-		XActivity
+		XActivity,
+		XPage,
 	},
 	props: {
 		user: {
--- a/src/client/app/desktop/views/widgets/profile.vue
+++ b/src/client/app/desktop/views/widgets/profile.vue
@@ -118,6 +118,8 @@ export default define({
 		line-height 16px
 		font-weight bold
 		color var(--text)
+		overflow hidden
+		text-overflow ellipsis

 	> .username
 		display block
--- a/src/client/app/init.css
+++ b/src/client/app/init.css
@@ -5,7 +5,7 @@
 */

 html {
-	font-family: sans-serif;
+	font-family: Roboto, HelveticaNeue, Arial, sans-serif;
 }

 body > noscript {
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@@ -129,6 +129,7 @@ init((launch, os) => {
 					{ path: '/i/groups', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-groups.vue').then(m => m.default) }) },
 					{ path: '/i/groups/:groupId', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/user-group-editor.vue').then(m => m.default), groupId: route.params.groupId }) },
 					{ path: '/i/follow-requests', component: DeckColumn, props: route => ({ component: () => import('../common/views/pages/follow-requests.vue').then(m => m.default) }) },
+					{ path: '/@:username/pages/:pageName', name: 'page', props: true, component: () => import('../common/views/deck/deck.page-column.vue').then(m => m.default) },
 				]}]
 			: [
 				{ path: '/', name: 'index', component: MkIndex },
@@ -163,7 +164,7 @@ init((launch, os) => {
 				{ path: 'following', component: () => import('../common/views/pages/following.vue').then(m => m.default) },
 				{ path: 'followers', component: () => import('../common/views/pages/followers.vue').then(m => m.default) },
 			]},
-			{ path: '/@:user/pages/:page', component: UI, props: route => ({ component: () => import('../common/views/pages/page/page.vue').then(m => m.default), pageName: route.params.page, username: route.params.user }) },
+			{ path: '/@:user/pages/:page', component: UI, props: route => ({ component: () => import('../common/views/pages/page.vue').then(m => m.default), pageName: route.params.page, username: route.params.user }) },
 			{ path: '/@:user/pages/:pageName/view-source', component: UI, props: route => ({ component: () => import('../common/views/pages/page-editor/page-editor.vue').then(m => m.default), initUser: route.params.user, initPageName: route.params.pageName }) },
 			{ path: '/notes/:note', component: MkNote },
 			{ path: '/authorize-follow', component: MkFollow },
--- a/src/client/app/mobile/views/components/drive.vue
+++ b/src/client/app/mobile/views/components/drive.vue
@@ -25,17 +25,17 @@
 				<template v-if="folder.filesCount > 0">{{ folder.filesCount }} {{ $t('file-count') }}</template>
 			</p>
 		</div>
-		<div class="folders" v-if="folders.length > 0">
+		<div class="folders" v-if="folders.length > 0 || moreFolders">
 			<x-folder class="folder" v-for="folder in folders" :key="folder.id" :folder="folder"/>
 			<p v-if="moreFolders">{{ $t('@.load-more') }}</p>
 		</div>
-		<div class="files" v-if="files.length > 0">
+		<div class="files" v-if="files.length > 0 || moreFiles">
 			<x-file class="file" v-for="file in files" :key="file.id" :file="file"/>
 			<button class="more" v-if="moreFiles" @click="fetchMoreFiles">
 				{{ fetchingMoreFiles ? this.$t('@.loading') : this.$t('@.load-more') }}
 			</button>
 		</div>
-		<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
+		<div class="empty" v-if="files.length == 0 && !moreFiles && folders.length == 0 && !moreFolders && !fetching">
 			<p v-if="folder == null">{{ $t('nothing-in-drive') }}</p>
 			<p v-if="folder != null">{{ $t('folder-is-empty') }}</p>
 		</div>
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -10,7 +10,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>
-					<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+					<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :custom-emojis="notification.note.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -26,7 +26,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
 				<fa icon="quote-left"/>
-					<mfm :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
+					<mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="true" :custom-emojis="notification.note.renote.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
@@ -64,7 +64,7 @@
 			</header>
 			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
 				<fa icon="quote-left"/>
-					<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+					<mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :custom-emojis="notification.note.emojis"/>
 				<fa icon="quote-right"/>
 			</router-link>
 		</div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
syuilo	cd5b24d4eb	Merge branch 'develop'	2019-07-19 03:38:05 +09:00
syuilo	c8abd512e1	11.26.0	2019-07-19 03:37:48 +09:00
syuilo	de9bd2651b	Remove unused import	2019-07-19 03:37:34 +09:00
syuilo	c432310cae	MFMの引用がインライン表示になっている問題を修正	2019-07-19 03:30:37 +09:00
syuilo	1c95cdffdc	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-19 03:27:53 +09:00
syuilo	c3ec668e16	Update CHANGELOG.md	2019-07-19 03:27:49 +09:00
rinsuki	2af79e9855	特定ホストへのメンションの特別処理をクライアントに追加 (#5185 ) * 特定ホストへのメンションの特別処理をクライアントに追加 Fix #5168 * Apply suggestions from code review Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * Apply suggestions from code review Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * Apply suggestions from code review Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * Fix indent	2019-07-19 03:13:47 +09:00
Oni-Men	f6ac6f9c6f	fix #5071 (#5184 )	2019-07-18 20:56:48 +09:00
MeiMei	d8c835fa51	Fix signin (#5181 ) * Revert "Fix signin history (#5180)" This reverts commit `a97c14a7b7`. * fix signin * failはfail専用に * fix password less 200	2019-07-18 05:26:58 +09:00
Satsuki Yanagi	a97c14a7b7	Fix signin history (#5180 ) * Fix #5179 * Fix wrong value in signin history	2019-07-18 04:22:44 +09:00
syuilo	54ecf97c22	New Crowdin translations (#5175 ) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (Dutch) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (Dutch) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean)	2019-07-18 02:03:47 +09:00
MeiMei	9c4e64b7b5	Send Delete activity on suspend (#5165 ) * Send Delete Person activity * Delete activityの後にフォロー解除する * アカウント削除でもDelete activity	2019-07-18 02:03:28 +09:00
MeiMei	ef44eda69e	Mastodonのリンクの所有者認証に対応 (#5161 ) * Profile metadata を設定できるように * API desc	2019-07-18 00:11:39 +09:00
Satsuki Yanagi	f1a7ab639b	Resolve #5117 (#5171 ) * Resolve #5117 * 出来立てのユーザーがストリームコネクションを持ってるはずがない	2019-07-18 00:00:03 +09:00
Satsuki Yanagi	0d8286cb2a	Improve #5176 (#5178 ) * 🎨 * Follow review * Remove unnecessary colon	2019-07-17 23:59:21 +09:00
Satsuki Yanagi	8e4ad4b919	Improve usability of users view (#5176 ) * Improve usability of users view Resolve #5173 * Fix query * Follow review and fix * Follow review	2019-07-17 18:59:10 +09:00
Satsuki Yanagi	9a09ed6290	Cleanup source (#5177 ) * Cleanup source * 🙏	2019-07-17 17:13:38 +09:00
Satsuki Yanagi	9ca36021b0	Fix #5172 (#5174 )	2019-07-17 13:28:27 +09:00
Acid Chicken (硫酸鶏)	eaebb95827	Update README.md [AUTOGEN] (#5163 )	2019-07-17 04:28:11 +09:00
syuilo	b8cce2067c	New translations ja-JP.yml (French) (#5170 )	2019-07-17 01:34:32 +09:00
syuilo	07a0631964	New translations ja-JP.yml (French) (#5169 )	2019-07-17 01:25:56 +09:00
MeiMei	ebc2b05231	fix build error (#5162 )	2019-07-17 00:59:19 +09:00
Acid Chicken (硫酸鶏)	4c79dd4e96	Use yarn (#5154 ) * Revert "✌️" This reverts commit `b5b437b878`. * Welcome back, yarn.lock [lockfiles for all](https://yarnpkg.com/blog/2016/11/24/lockfiles-for-all/) * Use alpine package registry instead of npm's * Avoid npx * Remove `"` * Follow review refs: https://github.com/syuilo/misskey/pull/5154#discussion_r303227256 * Update lockfile * Use yarn instead of npm run refs: https://github.com/syuilo/misskey/pull/5154#discussion_r303227285 * Back to npm * Follow review refs: https://github.com/syuilo/misskey/pull/5154#discussion_r303292279	2019-07-15 21:32:09 +09:00
syuilo	abc57519a7	New Crowdin translations (#5155 ) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Czech)	2019-07-15 20:47:49 +09:00
Aya Morisawa	a23a10d375	Improve CONTRIBUTING.md (#5157 )	2019-07-15 20:47:09 +09:00
Satsuki Yanagi	01e7716170	（ｺ｀・ﾍ・´ｹ） (#5156 )	2019-07-15 02:28:30 +09:00
Acid Chicken (硫酸鶏)	6d0ee61661	Corriger les omissions	2019-07-14 11:04:27 +09:00
Acid Chicken (硫酸鶏)	9c684fd6c4	Welcome back, yarn.lock [lockfiles for all](https://yarnpkg.com/blog/2016/11/24/lockfiles-for-all/)	2019-07-14 10:16:30 +09:00
Acid Chicken (硫酸鶏)	cbb8edd5ed	Revert "Add yarn.lock to .gitignore (#3408 )" This reverts commit `e8439679a5`.	2019-07-14 10:09:00 +09:00
Acid Chicken (硫酸鶏)	f933fa0e78	Add FAQ in CONTRIBUTING.md	2019-07-14 10:06:10 +09:00
Acid Chicken (硫酸鶏)	b3e5198f23	Use yarn instead of npm	2019-07-14 10:04:52 +09:00
Acid Chicken (硫酸鶏)	6e042ca344	Revert "Docker: Back to npm from yarn (#4730 )" This reverts commit `112a72abdf`.	2019-07-14 09:58:45 +09:00
Acid Chicken (硫酸鶏)	9381842af2	Bye @types/is-root	2019-07-14 09:42:22 +09:00
Acid Chicken (硫酸鶏)	a6644c540a	Update dependency resolutions	2019-07-14 09:38:49 +09:00
syuilo	063427a660	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-14 04:02:41 +09:00
syuilo	6846067a5d	Update CONTRIBUTING.md	2019-07-14 04:02:24 +09:00
Satsuki Yanagi	b7273c90ae	Fix #5128 (#5153 )	2019-07-14 03:56:34 +09:00
syuilo	a6f5e23069	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-14 03:54:02 +09:00
syuilo	f37f22b163	Fix bug	2019-07-14 03:53:45 +09:00
syuilo	9440fdb2d0	New Crowdin translations (#5152 ) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean)	2019-07-14 03:33:31 +09:00
syuilo	96c19b2607	New Crowdin translations (#5151 ) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai)	2019-07-14 03:28:30 +09:00
syuilo	b34c1379e9	Resolve #3238	2019-07-14 03:18:45 +09:00
syuilo	0fc965f342	New translations ja-JP.yml (Chinese Simplified) (#5149 )	2019-07-13 02:04:09 +09:00
syuilo	617db05808	New translations ja-JP.yml (Chinese Simplified) (#5148 )	2019-07-13 01:45:09 +09:00
syuilo	6a20ab687c	New translations ja-JP.yml (Chinese Simplified) (#5146 )	2019-07-13 01:13:50 +09:00
syuilo	6c3bcdad54	New translations ja-JP.yml (Chinese Simplified) (#5145 )	2019-07-13 01:04:06 +09:00
syuilo	aeea275ec2	New Crowdin translations (#5144 ) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai)	2019-07-12 22:36:09 +09:00
Satsuki Yanagi	b3c6e28717	Improve usability (#5142 ) Fix #3862	2019-07-12 22:24:29 +09:00
MeiMei	70691e1523	Fix: proxy-media後のContent-Typeが違う (#5143 )	2019-07-12 22:21:47 +09:00
syuilo	2cb032b0e0	Fix #5140	2019-07-12 03:17:31 +09:00
syuilo	ebbf5268ac	Improve usability	2019-07-12 02:08:13 +09:00
syuilo	b2030e8403	🎨	2019-07-12 00:40:10 +09:00
syuilo	82493bb741	Update dependencies 🚀	2019-07-11 23:46:46 +09:00
syuilo	aa15901c23	New Crowdin translations (#5131 ) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean)	2019-07-10 18:47:19 +09:00
syuilo	0bd4d069a2	New Crowdin translations (#5130 ) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish)	2019-07-10 18:37:38 +09:00
syuilo	ab871c6991	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-10 18:30:58 +09:00
syuilo	feec5e88fc	Pages: Implement radio button	2019-07-10 18:30:51 +09:00
MeiMei	a091cbb93a	Prevent duplicate user registration (#5129 )	2019-07-10 03:47:07 +09:00
Satsuki Yanagi	a59ab79da0	Fix drive browser showing false empty (#5127 )	2019-07-09 17:38:14 +09:00
syuilo	8ca4d39440	Update doc	2019-07-09 17:06:12 +09:00
syuilo	41d041f701	Merge branch 'develop'	2019-07-09 17:03:38 +09:00
syuilo	3e516474c2	11.25.1	2019-07-09 17:03:24 +09:00
syuilo	405c9c258b	New translations ja-JP.yml (English) (#5126 )	2019-07-09 17:01:28 +09:00
MeiMei	24e389bcf3	Tune font (#5125 )	2019-07-09 17:01:08 +09:00
syuilo	933c83679e	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-09 16:55:59 +09:00
syuilo	a7aa924949	Add userId prop	2019-07-09 16:55:55 +09:00
syuilo	0eb84fe874	Fix bug	2019-07-09 16:55:33 +09:00
syuilo	2f451fa058	New translations ja-JP.yml (English) (#5123 )	2019-07-09 09:53:24 +09:00
syuilo	2465a377a1	Delete init.ts	2019-07-09 04:09:02 +09:00
syuilo	697219e946	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-09 00:11:18 +09:00
syuilo	4478298a0a	Update uodate docs	2019-07-09 00:11:04 +09:00
syuilo	925f89720a	New translations ja-JP.yml (Korean) (#5121 )	2019-07-08 17:02:58 +09:00
syuilo	0f71d9f47a	Merge branch 'develop'	2019-07-08 16:17:47 +09:00
syuilo	a7ec54ea97	11.25.0	2019-07-08 16:17:14 +09:00
syuilo	1d43d18b19	🎨	2019-07-08 16:11:52 +09:00
syuilo	0bcb25a983	New Crowdin translations (#5102 ) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (Dutch) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (Dutch) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Norwegian) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Czech) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Danish) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (English)	2019-07-08 16:04:24 +09:00
syuilo	ec1f2a285b	Resolve #5116	2019-07-08 16:03:17 +09:00
Satsuki Yanagi	c2c06694da	Allow only one kind of date identifier at once (#5120 )	2019-07-08 13:55:22 +09:00
tamaina	5343b005df	Improve paste uploading Resolve #3023 (#4542 ) * resolve #3023 * fix * fix * better description * widget * fix text * Update post-form.vue * Fix enter-file-name dialog title text * Fix type * On messaging room * Replace moment.js to original one * Fix formatDateTimeString	2019-07-08 13:46:31 +09:00
syuilo	eb783f827c	Better display in narrow desktop and choosing client type; Fix #1442 , Fix #2106 , Resolve #4552 (#4549 ) * fix #1442, fix #2106 * revert * wip * ✌️ * clean up * fix * https://github.com/syuilo/misskey/pull/4549#discussion_r287750004	2019-07-08 04:36:06 +09:00
syuilo	6064c3ae47	Add semicolons	2019-07-08 04:32:57 +09:00
syuilo	05862a420f	Merge branch 'develop' into pr/4549	2019-07-08 04:27:18 +09:00
syuilo	393ad283e1	🎨	2019-07-08 04:19:17 +09:00
syuilo	841c8d619f	既定のアップロード先フォルダを設定できるように	2019-07-08 04:17:53 +09:00
YuzuRyo61	5c2ed9e5d3	11.24.0の注意書きを追記 (#5108 )	2019-07-07 19:00:38 +09:00
MeiMei	d39aabc143	Fix notification wrap (#5118 )	2019-07-07 18:59:54 +09:00
Satsuki Yanagi	4628f507e5	公開以外へのリプライ時元の公開範囲で指定したユーザー情報を引き継ぐように (#5119 ) * 公開以外へのリプライ時元の公開範囲で指定したユーザー情報を引き継ぐように * Use users/show userIds	2019-07-07 17:14:08 +09:00
syuilo	8b05816860	Refactor: Remove needless return	2019-07-07 15:29:08 +09:00
Satsuki Yanagi	3b8ea90fdc	フォルダーを削除できないときダイアログボックスで知らせる (#5111 ) * フォルダーを削除できないときダイアログボックスで知らせる * https://github.com/syuilo/misskey/pull/5111#issuecomment-508959068 かわいい	2019-07-07 14:56:51 +09:00
MeiMei	638458e2c1	Fix: postgres redis cache の option が適用されない (#5114 )	2019-07-07 07:59:59 +09:00
syuilo	bd8d7c3d0f	Improve Page * ページをピン留めできるように * デッキでカラム内でページを見れるように	2019-07-07 06:56:13 +09:00
syuilo	4b747d20b7	Use npx to avoid global install of ts-node	2019-07-07 05:26:04 +09:00
syuilo	351b236014	Merge branch 'develop' of https://github.com/syuilo/misskey into develop	2019-07-07 05:13:21 +09:00
syuilo	e9251debe0	イベント送信時に指定の変数の値を添付出来るように	2019-07-07 05:12:31 +09:00
tamaina	22c4842154	https://github.com/syuilo/misskey/pull/4549#discussion_r287750004	2019-07-07 02:22:33 +09:00
tamaina	788edd3622	fix	2019-07-07 02:22:33 +09:00
tamaina	5afe96e15a	clean up	2019-07-07 02:22:08 +09:00
tamaina	899fc8a7bd	✌️	2019-07-07 02:22:08 +09:00
tamaina	2afcdda058	wip	2019-07-07 02:21:13 +09:00
tamaina	c2fc637575	revert	2019-07-07 02:18:24 +09:00
tamaina	82d2b0608f	fix #1442 , fix #2106	2019-07-07 02:18:24 +09:00
Satsuki Yanagi	047a46d966	Support password-less login with WebAuthn (#5112 ) * Support password-less login with WebAuthn * Fix initial value of usePasswordLessLogin	2019-07-07 01:38:36 +09:00
syuilo	e97dd13e81	Pages: ボタンを色付き表示できるように	2019-07-06 23:11:16 +09:00
syuilo	067e9ec6f4	Fix bug	2019-07-06 22:53:15 +09:00
syuilo	64397708fd	MisskeyPagesにイベント送信ボタンを追加	2019-07-06 18:14:50 +09:00
syuilo	5ae6b0058f	やった (#5110 )	2019-07-06 00:46:00 +09:00