clean up rebase

This commit is contained in:
Isabell 2023-05-23 07:05:43 +10:00
parent 5ee098e51f
commit 45a8b9831e
2 changed files with 15 additions and 14 deletions

View File

@ -83,11 +83,14 @@ If you have access to a server that supports one of the sources below, I recomme
- Web Proxy (one of the following) - Web Proxy (one of the following)
- 🍀 Nginx (recommended) - 🍀 Nginx (recommended)
- 🪶 Apache - 🪶 Apache
- 🦦 Caddy
### 😗 Optional dependencies ### 😗 Optional dependencies
- [FFmpeg](https://ffmpeg.org/) for video transcoding - [FFmpeg](https://ffmpeg.org/) for video transcoding
- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search - Full text search (one of the following)
- 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
- [ElasticSearch](https://www.elastic.co/elasticsearch/)
### 🏗️ Build dependencies ### 🏗️ Build dependencies
@ -181,7 +184,15 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
- Run `sudo a2ensite calckey.apache` to enable the site - Run `sudo a2ensite calckey.apache` to enable the site
- Run `sudo service apache2 restart` to reload apache2 configuration - Run `sudo service apache2 restart` to reload apache2 configuration
</details> ### 🦦 Caddy
- Add the following block to your `Caddyfile`, replacing `example.tld` with your own domain:
```caddy
example.tld {
reverse_proxy http://127.0.0.1:3000
}
```
- Reload your caddy configuration
## 🚀 Build and launch! ## 🚀 Build and launch!

View File

@ -416,19 +416,9 @@
<div class="content"> <div class="content">
<p>{{ i18n.ts._mfm.plainDescription }}</p> <p>{{ i18n.ts._mfm.plainDescription }}</p>
<div class="preview"> <div class="preview">
<Mfm :text="preview_plain" /> <Mfm :text="preview_plain"/>
<MkTextarea v-model="preview_plain" <MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
><span>MFM</span></MkTextarea
>
</div> </div>
</div>
<div class="section _block">
<div class="title">{{ i18n.ts._mfm.plain }}</div>
<div class="content">
<p>{{ i18n.ts._mfm.plainDescription }}</p>
<div class="preview">
<Mfm :text="preview_plain"/>
<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
</div> </div>
</div> </div>
</div> </div>