From 357287f3f87a28aebb76634951b1749c973533f9 Mon Sep 17 00:00:00 2001 From: Hironsan Date: Mon, 2 Mar 2020 16:04:23 +0900 Subject: [PATCH] Update repository name --- .github/ISSUE_TEMPLATE/01-question.md | 2 +- .github/ISSUE_TEMPLATE/02-bug.md | 2 +- .github/ISSUE_TEMPLATE/03-install.md | 2 +- .travis.yml | 6 +++--- app.json | 4 ++-- app/server/templates/base.html | 2 +- app/server/templates/index.html | 8 ++++---- awsdeploy.yml | 4 ++-- azuredeploy.json | 2 +- docs/CODE_OF_CONDUCT.md | 2 +- docs/advanced/oauth2_settings.md | 2 +- docs/faq.md | 12 ++++++------ docs/getting-started.md | 6 +++--- docs/index.md | 4 ++-- .../components/organisms/layout/TheTopBanner.vue | 2 +- mkdocs.yml | 6 +++--- tools/azure.sh | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-question.md b/.github/ISSUE_TEMPLATE/01-question.md index 67e94cef..5e7c5836 100644 --- a/.github/ISSUE_TEMPLATE/01-question.md +++ b/.github/ISSUE_TEMPLATE/01-question.md @@ -6,7 +6,7 @@ about: For the question to confirm suspiciously behaviors or feature usage. Plea How to reproduce the behaviour --------- - + diff --git a/.github/ISSUE_TEMPLATE/02-bug.md b/.github/ISSUE_TEMPLATE/02-bug.md index 4b189ca9..4044e038 100644 --- a/.github/ISSUE_TEMPLATE/02-bug.md +++ b/.github/ISSUE_TEMPLATE/02-bug.md @@ -6,7 +6,7 @@ about: For the bug report or unexpected behavior differing from the docs How to reproduce the behaviour --------- - + diff --git a/.github/ISSUE_TEMPLATE/03-install.md b/.github/ISSUE_TEMPLATE/03-install.md index 342b410e..f3670965 100644 --- a/.github/ISSUE_TEMPLATE/03-install.md +++ b/.github/ISSUE_TEMPLATE/03-install.md @@ -4,7 +4,7 @@ about: For the problem that you faced when installing doccano which none of the --- - + How to reproduce the problem --------- diff --git a/.travis.yml b/.travis.yml index fc287d37..8c91cac1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,13 +46,13 @@ deploy: - provider: script script: tools/cd.sh travis-${TRAVIS_BUILD_NUMBER} on: - repo: chakki-works/doccano + repo: doccano/doccano branch: master - provider: script script: tools/cd.sh ${TRAVIS_TAG} on: - repo: chakki-works/doccano + repo: doccano/doccano tags: true - provider: pages @@ -60,5 +60,5 @@ deploy: github_token: $GITHUB_TOKEN local_dir: site on: - repo: chakki-works/doccano + repo: doccano/doccano branch: master diff --git a/app.json b/app.json index db59ffbb..a5bddf0b 100644 --- a/app.json +++ b/app.json @@ -3,8 +3,8 @@ "description": "Open source text annotation tool for machine learning practitioner.", "keywords": ["Python", "Machine Learning", "Annotation"], "website": "https://doccano.herokuapp.com/", - "repository": "https://github.com/chakki-works/doccano", - "logo": "https://github.com/chakki-works/doccano/wiki/images/doccano.png", + "repository": "https://github.com/doccano/doccano", + "logo": "https://github.com/doccano/doccano/wiki/images/doccano.png", "success_url": "/", "env": { "ADMIN_USER_NAME": { diff --git a/app/server/templates/base.html b/app/server/templates/base.html index 12925c69..9d44f041 100644 --- a/app/server/templates/base.html +++ b/app/server/templates/base.html @@ -73,7 +73,7 @@ - + GitHub {% endif %} diff --git a/app/server/templates/index.html b/app/server/templates/index.html index 7820c399..07c55c32 100644 --- a/app/server/templates/index.html +++ b/app/server/templates/index.html @@ -173,16 +173,16 @@ @@ -205,7 +205,7 @@

- doccano by + doccano by Hironsan. The source code is licensed MIT.
diff --git a/awsdeploy.yml b/awsdeploy.yml index 1e703f49..bc1b0f25 100644 --- a/awsdeploy.yml +++ b/awsdeploy.yml @@ -82,10 +82,10 @@ Resources: - | set +a - | - sudo docker pull chakkiworks/doccano:latest + sudo docker pull doccano/doccano:latest - > sudo docker run -d --name doccano --env-file /env.list -p 80:8000 - chakkiworks/doccano:latest + doccano/doccano:latest - > sudo docker exec doccano tools/create-admin.sh ${ADMIN} ${EMAIL} ${PASSWORD} diff --git a/azuredeploy.json b/azuredeploy.json index 1f16cfcc..07977d95 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -102,7 +102,7 @@ "dockerImageName": { "type": "string", "minLength": 1, - "defaultValue": "chakkiworks/doccano:latest", + "defaultValue": "doccano/doccano:latest", "metadata": { "description": "The Docker image to deploy." } diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md index 4f5c6ad4..320c0360 100644 --- a/docs/CODE_OF_CONDUCT.md +++ b/docs/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at chakki.works@gmail.com. All +reported by contacting the project team at hiroki.nakayama.py@gmail.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/docs/advanced/oauth2_settings.md b/docs/advanced/oauth2_settings.md index 77afb836..e8ad4c43 100644 --- a/docs/advanced/oauth2_settings.md +++ b/docs/advanced/oauth2_settings.md @@ -1,4 +1,4 @@ -This document aims to instruct how to setup OAuth for doccano. doccano now supports social login via GitHub and Active Directory by [#75](https://github.com/chakki-works/doccano/pull/75). In this document, we show GitHub OAuth as an example. +This document aims to instruct how to setup OAuth for doccano. doccano now supports social login via GitHub and Active Directory by [#75](https://github.com/doccano/doccano/pull/75). In this document, we show GitHub OAuth as an example. ## Create OAuth App diff --git a/docs/faq.md b/docs/faq.md index fac7f0ae..9199a7c2 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -2,16 +2,16 @@ Following list is ordered by from easy to hard. If you are not familiar with Python development, please consider easy setup. -1. [One click deployment to Cloud Service.](https://github.com/chakki-works/doccano#deployment) +1. [One click deployment to Cloud Service.](https://github.com/doccano/doccano#deployment) * Only you have to do is create an account. Especially [Heroku](https://www.heroku.com/home) does not require your credit card (if free plan). - * [![Deploy to Azure](https://azuredeploy.net/deploybutton.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fchakki-works%2Fdoccano%2Fmaster%2Fazuredeploy.json) + * [![Deploy to Azure](https://azuredeploy.net/deploybutton.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fdoccano%2Fdoccano%2Fmaster%2Fazuredeploy.json) * [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) * [![AWS CloudFormation Launch Stack SVG Button](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/create/review?templateURL=https://s3-external-1.amazonaws.com/cf-templates-10vry9l3mp71r-us-east-1/20190732wl-new.templatexloywxxyimi&stackName=doccano) - * > Notice: (1) EC2 KeyPair cannot be created automatically, so make sure you have an existing EC2 KeyPair in one region. Or [create one yourself](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#having-ec2-create-your-key-pair). (2) If you want to access doccano via HTTPS in AWS, here is an [instruction](https://github.com/chakki-works/doccano/wiki/HTTPS-setting-for-doccano-in-AWS). + * > Notice: (1) EC2 KeyPair cannot be created automatically, so make sure you have an existing EC2 KeyPair in one region. Or [create one yourself](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#having-ec2-create-your-key-pair). (2) If you want to access doccano via HTTPS in AWS, here is an [instruction](https://github.com/doccano/doccano/wiki/HTTPS-setting-for-doccano-in-AWS). 2. [Use Docker](https://docs.docker.com/install/) * Docker doesn't bother you by the OS, Python version, etc problems. Because an environment for application is packed as a container. - * Get doccano's image: `docker pull chakkiworks/doccano` - * Create & Run doccano container: `docker run -d --name doccano -p 8000:80 chakkiworks/doccano` + * Get doccano's image: `docker pull doccano/doccano` + * Create & Run doccano container: `docker run -d --name doccano -p 8000:80 doccano/doccano` * Create a user: `docker exec doccano tools/create-admin.sh "admin" "admin@example.com" "password"` * Stop doccano container: `docker stop doccano` * Re-Launch doccano container: `docker start doccano` @@ -19,7 +19,7 @@ Following list is ordered by from easy to hard. If you are not familiar with Pyt * **I want to remember you that this is the hardest setup way. You have to install Python/Node.js and type many commands.** * [Install Python](https://www.python.org/downloads/) * [Install Node.js](https://nodejs.org/en/download/) - * Get the source code of doccano: `git clone https://github.com/chakki-works/doccano.git` + * Get the source code of doccano: `git clone https://github.com/doccano/doccano.git` * Move to doccano directory: `cd doccano` * Create environment for doccano: `virtualenv venv` * Activate environment: `source venv/bin/activate` diff --git a/docs/getting-started.md b/docs/getting-started.md index c52c707c..7cff13e7 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -5,7 +5,7 @@ First of all, you have to clone the repository: ```bash -git clone https://github.com/chakki-works/doccano.git +git clone https://github.com/doccano/doccano.git cd doccano ``` @@ -14,7 +14,7 @@ To install doccano, there are three options: ### Option1: Pull the production Docker image ```bash -docker pull chakkiworks/doccano +docker pull doccano/doccano ``` ### Option2: Pull the development Docker-Compose images @@ -54,7 +54,7 @@ Depending on your installation method, there are two options: First, run a Docker container: ```bash -docker run -d --name doccano -p 8000:80 chakkiworks/doccano +docker run -d --name doccano -p 8000:80 doccano/doccano ``` Then, execute `create-admin.sh` script for creating a superuser. diff --git a/docs/index.md b/docs/index.md index 3fe8e0c0..21ff65b0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -34,7 +34,7 @@ Final demo is one of the sequence to sequence tasks, machine translation. Since Doccano can be deployed to Azure ([Web App for Containers](https://azure.microsoft.com/en-us/services/app-service/containers/) + [PostgreSQL database](https://azure.microsoft.com/en-us/services/postgresql/)) by clicking on the button below: -[![Deploy to Azure](https://azuredeploy.net/deploybutton.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fchakki-works%2Fdoccano%2Fmaster%2Fazuredeploy.json) +[![Deploy to Azure](https://azuredeploy.net/deploybutton.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fdoccano%2Fdoccano%2Fmaster%2Fazuredeploy.json) ### Heroku @@ -56,4 +56,4 @@ Doccano can be deployed to AWS ([Cloudformation](https://docs.aws.amazon.com/AWS [![AWS CloudFormation Launch Stack SVG Button](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/create/review?templateURL=https://s3-external-1.amazonaws.com/cf-templates-10vry9l3mp71r-us-east-1/20190732wl-new.templatexloywxxyimi&stackName=doccano) -> Notice: (1) EC2 KeyPair cannot be created automatically, so make sure you have an existing EC2 KeyPair in one region. Or [create one yourself](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#having-ec2-create-your-key-pair). (2) If you want to access doccano via HTTPS in AWS, here is an [instruction](https://github.com/chakki-works/doccano/wiki/HTTPS-setting-for-doccano-in-AWS). +> Notice: (1) EC2 KeyPair cannot be created automatically, so make sure you have an existing EC2 KeyPair in one region. Or [create one yourself](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#having-ec2-create-your-key-pair). (2) If you want to access doccano via HTTPS in AWS, here is an [instruction](https://github.com/doccano/doccano/wiki/HTTPS-setting-for-doccano-in-AWS). diff --git a/frontend/components/organisms/layout/TheTopBanner.vue b/frontend/components/organisms/layout/TheTopBanner.vue index 95d05f51..d2bf0b1a 100644 --- a/frontend/components/organisms/layout/TheTopBanner.vue +++ b/frontend/components/organisms/layout/TheTopBanner.vue @@ -23,7 +23,7 @@ large outlined color="white" - href="https://github.com/chakki-works/doccano" + href="https://github.com/doccano/doccano" > mdi-github-circle diff --git a/mkdocs.yml b/mkdocs.yml index d19f97b4..fb6024a1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,11 +2,11 @@ site_name: 'doccano' site_description: 'A Text Annotation tool for Humans' site_author: 'Hiroki Nakayama' -site_url: 'https://chakki-works.github.io/doccano/' +site_url: 'https://doccano.github.io/doccano/' # Repository -repo_name: 'chakki-works/doccano' -repo_url: 'https://github.com/chakki-works/doccano' +repo_name: 'doccano/doccano' +repo_url: 'https://github.com/doccano/doccano' # Copyright copyright: 'Copyright © 2018 - 2019 Hiroki Nakayama' diff --git a/tools/azure.sh b/tools/azure.sh index 5ed5839b..d08a19e9 100755 --- a/tools/azure.sh +++ b/tools/azure.sh @@ -24,7 +24,7 @@ az group deployment create \ adminUserName="${DOCCANO_ADMIN_USERNAME}" \ adminContactEmail="${DOCCANO_ADMIN_CONTACT_EMAIL}" \ adminPassword="${DOCCANO_ADMIN_PASSWORD}" \ - dockerImageName="${DOCKER_REGISTRY:-${DOCKER_USERNAME:-chakkiworks}}/doccano:${1:-latest}" \ + dockerImageName="${DOCKER_REGISTRY:-${DOCKER_USERNAME:-doccano}}/doccano:${1:-latest}" \ dockerRegistry="${DOCKER_REGISTRY}" \ dockerRegistryUserName="${DOCKER_USERNAME}" \ dockerRegistryPassword="${DOCKER_PASSWORD}" \