From 452b0309a59915ef0f18df419be740fe7c248420 Mon Sep 17 00:00:00 2001 From: warrows Date: Wed, 10 May 2023 12:28:50 +0200 Subject: [PATCH 1/8] Doc : Add apache2 basic configuration to documentation Signed-off-by: warrows --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 79bd8f86cb..328c85aa6e 100644 --- a/README.md +++ b/README.md @@ -168,31 +168,25 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md). -## 🌐 Web proxy +## Web proxy -### 🍀 Nginx (recommended) +Choose between NGINX or Apache (we recommend NGINX) + +### 🍀 NGINX - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/` - Edit `calckey.nginx.conf` to reflect your instance properly - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf` - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service. -### 🪶 Apache +### Apache 2 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/` - Edit `calckey.apache.conf` to reflect your instance properly - Run `sudo a2ensite calckey.apache` to enable the site - Run `sudo service apache2 restart` to reload apache2 configuration -### 🦦 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! From 454fec34b9a1fa006e998c917bca028f9e3337a1 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 10 May 2023 17:08:16 -0700 Subject: [PATCH 2/8] docs: cleanup apache --- README.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 328c85aa6e..b8fd09b770 100644 --- a/README.md +++ b/README.md @@ -83,14 +83,11 @@ If you have access to a server that supports one of the sources below, I recomme - Web Proxy (one of the following) - 🍀 Nginx (recommended) - 🪶 Apache - - 🦦 Caddy ### 😗 Optional dependencies - [FFmpeg](https://ffmpeg.org/) for video transcoding -- Full text search (one of the following) - - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended) - - [ElasticSearch](https://www.elastic.co/elasticsearch/) +- [ElasticSearch](https://www.elastic.co/elasticsearch/) for full-text search ### 🏗️ Build dependencies @@ -168,18 +165,16 @@ In Calckey's directory, fill out the `sonic` section of `.config/default.yml` wi For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md). -## Web proxy +## 🌐 Web proxy -Choose between NGINX or Apache (we recommend NGINX) - -### 🍀 NGINX +### 🍀 Nginx (recommended) - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/` - Edit `calckey.nginx.conf` to reflect your instance properly - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf` - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service. -### Apache 2 +### 🪶 Apache - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/` - Edit `calckey.apache.conf` to reflect your instance properly From e2552bdfbb9fafab161a9697d62dccc8b51c4215 Mon Sep 17 00:00:00 2001 From: Isabell Date: Mon, 15 May 2023 13:18:58 +1000 Subject: [PATCH 3/8] Add MFM fade functionality --- .../src/components/global/MkMisskeyFlavoredMarkdown.vue | 5 +++++ packages/client/src/scripts/mfm-tags.ts | 1 + 2 files changed, 6 insertions(+) diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue index c235b48354..896891d5e5 100644 --- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue +++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue @@ -299,6 +299,11 @@ const props = withDefaults( filter: hue-rotate(360deg) contrast(150%) saturate(150%); } } + +@keyframes mfm-fade { + 0% { opacity: 0; } + 100% { opacity: 1; } +}