Skip to content

Commit

Permalink
Update repository name
Browse files Browse the repository at this point in the history
  • Loading branch information
Hironsan committed Mar 2, 2020
1 parent a8fc7ee commit 357287f
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/01-question.md
Expand Up @@ -6,7 +6,7 @@ about: For the question to confirm suspiciously behaviors or feature usage. Plea

How to reproduce the behaviour
---------
<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/chakki-works/doccano/wiki/Frequently-Asked-Questions -->
<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/doccano/doccano/wiki/Frequently-Asked-Questions -->

<!--
Include a code example or the steps that led to the problem. Please try to be as specific as possible. -->
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/02-bug.md
Expand Up @@ -6,7 +6,7 @@ about: For the bug report or unexpected behavior differing from the docs

How to reproduce the behaviour
---------
<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/chakki-works/doccano/wiki/Frequently-Asked-Questions -->
<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/doccano/doccano/wiki/Frequently-Asked-Questions -->

<!-- Include a code example or the steps that led to the problem. Please try to be as specific as possible. -->

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/03-install.md
Expand Up @@ -4,7 +4,7 @@ about: For the problem that you faced when installing doccano which none of the

---

<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/chakki-works/doccano/wiki/Frequently-Asked-Questions -->
<!-- Before submitting an issue, make sure to check the docs and closed issues and FAQ to see if any of the solutions work for you. https://github.com/doccano/doccano/wiki/Frequently-Asked-Questions -->

How to reproduce the problem
---------
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -46,19 +46,19 @@ 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
skip_cleanup: true
github_token: $GITHUB_TOKEN
local_dir: site
on:
repo: chakki-works/doccano
repo: doccano/doccano
branch: master
4 changes: 2 additions & 2 deletions app.json
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion app/server/templates/base.html
Expand Up @@ -73,7 +73,7 @@
</a>
</div>
</div>
<a class="navbar-item" href="https://github.com/chakki-works/doccano">
<a class="navbar-item" href="https://github.com/doccano/doccano">
<span>GitHub</span>
</a>
{% endif %}
Expand Down
8 changes: 4 additions & 4 deletions app/server/templates/index.html
Expand Up @@ -173,16 +173,16 @@ <h2>
</h2>
<ul>
<li>
<a href="https://github.com/chakki-works/doccano">Documentation</a>
<a href="https://github.com/doccano/doccano">Documentation</a>
</li>
<li>
<a href="{% url 'demo-named-entity-recognition' %}">Live Demo</a>
</li>
<li>
<a href="https://github.com/chakki-works/doccano">Source code</a>
<a href="https://github.com/doccano/doccano">Source code</a>
</li>
<li>
<a href="https://github.com/chakki-works/doccano">Contribution</a>
<a href="https://github.com/doccano/doccano">Contribution</a>
</li>
</ul>
</div>
Expand All @@ -205,7 +205,7 @@ <h2>
</div>
<div class="content has-text-centered">
<p>
<a href="https://github.com/chakki-works/doccano">doccano</a> by
<a href="https://github.com/doccano/doccano">doccano</a> by
<a href="https://github.com/Hironsan">Hironsan</a>. The source code is licensed
<a href="http://opensource.org/licenses/mit-license.php">MIT</a>.
<br>
Expand Down
4 changes: 2 additions & 2 deletions awsdeploy.yml
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion azuredeploy.json
Expand Up @@ -102,7 +102,7 @@
"dockerImageName": {
"type": "string",
"minLength": 1,
"defaultValue": "chakkiworks/doccano:latest",
"defaultValue": "doccano/doccano:latest",
"metadata": {
"description": "The Docker image to deploy."
}
Expand Down
2 changes: 1 addition & 1 deletion docs/CODE_OF_CONDUCT.md
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
12 changes: 6 additions & 6 deletions docs/faq.md
Expand Up @@ -2,24 +2,24 @@

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`
3. Install from source
* **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`
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started.md
Expand Up @@ -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
```

Expand All @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Expand Up @@ -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

Expand All @@ -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).
2 changes: 1 addition & 1 deletion frontend/components/organisms/layout/TheTopBanner.vue
Expand Up @@ -23,7 +23,7 @@
large
outlined
color="white"
href="https://github.com/chakki-works/doccano"
href="https://github.com/doccano/doccano"
>
<v-icon left>
mdi-github-circle
Expand Down
6 changes: 3 additions & 3 deletions mkdocs.yml
Expand Up @@ -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 &copy; 2018 - 2019 Hiroki Nakayama'
Expand Down
2 changes: 1 addition & 1 deletion tools/azure.sh
Expand Up @@ -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}" \
Expand Down

0 comments on commit 357287f

Please sign in to comment.