From fc872109add9dea6fe66e7475039991678c156a7 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 21 Feb 2017 05:25:09 +0900 Subject: [PATCH 1/5] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 2380e4a9b3..3d8ca818d0 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ and more! You can touch with your own eyes at https://misskey.xyz/. 4. `npm install` 5. `npm run config` 6. `npm run build` -7. ✌🏻💴✌🏻 -8. 🤔 GLHF! From 29cb5d2eb8f3020231cde718be5b9577097ca04d Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 21 Feb 2017 05:30:54 +0900 Subject: [PATCH 2/5] Update .travis.yml --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 78f700cb1d..1d8409e160 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ services: - mongodb - redis-server +before-install: + - sudo apt-get -qq update + - sudo apt-get install -y graphicsmagick + before_script: - mkdir ./.config - cp ./.ci-files/default.yml ./.config From b05922ad800c6770dc30b2f335a57ced13d9ab9c Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 21 Feb 2017 05:32:12 +0900 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d8409e160..8fda9cdaf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ services: - mongodb - redis-server -before-install: +before_install: - sudo apt-get -qq update - sudo apt-get install -y graphicsmagick From dc76699244df75b72b3edd6c9d0cf683a6112e17 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 21 Feb 2017 05:34:32 +0900 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fda9cdaf8..a90cb13c8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,6 @@ services: - mongodb - redis-server -before_install: - - sudo apt-get -qq update - - sudo apt-get install -y graphicsmagick - before_script: - mkdir ./.config - cp ./.ci-files/default.yml ./.config @@ -29,6 +25,7 @@ addons: - ubuntu-toolchain-r-test packages: - g++-4.8 + - graphicsmagick cache: directories: From 7d15d1c196f8477f60c59adf62dac390bfd26a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?syuilo=E2=AD=90=EF=B8=8F?= Date: Tue, 21 Feb 2017 07:34:14 +0900 Subject: [PATCH 5/5] Update README.md --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3d8ca818d0..f0206a189e 100644 --- a/README.md +++ b/README.md @@ -57,14 +57,14 @@ Misskey requires two domains called the primary domain and the secondary domain. **Ensure that the secondary domain is not a subdomain of the primary domain.** -#### Dubdomains -Misskey uses subdomains below: +#### Subdomains +Misskey uses following subdomains: -* **api**. -* **auth**. -* **about**. -* **dev**. -* **file**. +* **api**.*{primary domain}* +* **auth**.*{primary domain}* +* **about**.*{primary domain}* +* **dev**.*{primary domain}* +* **file**.*{secondary domain}* ### reCAPTCHA Please visit https://www.google.com/recaptcha/intro/ and generate keys.