From 141f5aabbecee9720b23050ed5113e4dfa4677da Mon Sep 17 00:00:00 2001
From: tusharmakkar08 <tusharmakkar08@gmail.com>
Date: Sun, 12 Apr 2020 01:22:57 +0530
Subject: [PATCH 01/25] Added project name in sidebar

---
 frontend/components/organisms/layout/TheSideBar.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/components/organisms/layout/TheSideBar.vue b/frontend/components/organisms/layout/TheSideBar.vue
index f9f36921..275b3b6b 100644
--- a/frontend/components/organisms/layout/TheSideBar.vue
+++ b/frontend/components/organisms/layout/TheSideBar.vue
@@ -1,5 +1,10 @@
 <template>
   <v-list dense>
+    <v-list-item>
+      <h1 style="text-transform:capitalize;">
+        {{ currentProject.name }}
+      </h1>
+    </v-list-item>
     <v-btn
       :to="to"
       color="ms-4 my-1 mb-2 primary text-capitalize"
@@ -32,6 +37,8 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+
 export default {
   props: {
     link: {
@@ -62,7 +69,8 @@ export default {
   computed: {
     to() {
       return `/projects/${this.$route.params.id}/${this.link}`
-    }
+    },
+    ...mapGetters('projects', ['currentProject'])
   },
 
   methods: {

From 05e56df1ec870aa39e027e83e343527924429681 Mon Sep 17 00:00:00 2001
From: icoxfog417 <icoxfog417@yahoo.co.jp>
Date: Sat, 2 May 2020 09:30:52 +0900
Subject: [PATCH 02/25] Update FAQ (#723)

---
 docs/faq.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/faq.md b/docs/faq.md
index 4ded3032..9911ca54 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -21,3 +21,4 @@ Please check the following list.
 1. Add a user from [Django Admin site](https://djangobook.com/django-admin-site/).
 ![Add a user](./images/faq/add_user.png)
 2. Add the user to the project in the member page(`/projects/{project_id}/members`).
+3. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).

From b17e04444d9fbf1a276c3a714d6e43fda5fa2b47 Mon Sep 17 00:00:00 2001
From: Tushar Makkar <tusharmakkar08@gmail.com>
Date: Tue, 5 May 2020 07:22:31 +0530
Subject: [PATCH 03/25] Updated faq with rebuild info (#734)

Updated FAQ for rebuilding by latest doccano image
---
 docs/faq.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/faq.md b/docs/faq.md
index 9911ca54..7a49f846 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -22,3 +22,25 @@ Please check the following list.
 ![Add a user](./images/faq/add_user.png)
 2. Add the user to the project in the member page(`/projects/{project_id}/members`).
 3. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).
+
+## I want to update to the latest doccano image
+
+1. Execute `git pull` to reflect the latest doccano.
+2. Delete the volume that `doccano_www` and `doccano_static_volume`.  
+  **Do not delete `doccano_postgres_data` because it stores your projects data.**
+3. Rebuild the doccano image.
+
+The following commands are the procedure for 2~3.
+
+```
+❯ docker volume ls
+DRIVER              VOLUME NAME
+local               doccano_node_modules
+local               doccano_postgres_data
+local               doccano_static_volume
+local               doccano_venv
+local               doccano_www
+❯ docker volume rm doccano_www
+❯ docker volume rm doccano_static_volume
+❯ docker-compose -f docker-compose.prod.yml build --no-cache
+```

From 60091a7d370b1d3190a967436d331c5d301180be Mon Sep 17 00:00:00 2001
From: Hiroki Nakayama <hiroki.nakayama.py@gmail.com>
Date: Wed, 6 May 2020 14:51:31 +0900
Subject: [PATCH 04/25] Create CONTRIBUTING.md

---
 CONTRIBUTING.md | 73 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..02b77c7f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,73 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue with the owners of this repository before making a change. 
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## How to contribute to doccano
+
+### Reporting Bugs
+
+#### Before submitting a bug report
+
+* Check the [FAQs](https://github.com/doccano/doccano/blob/master/docs/faq.md) for a list of common questions and problems.
+* Ensure the bug was not already reported by searching on GitHub under [Issues](https://github.com/doccano/doccano/issues).
+* [Open a new issue](https://github.com/doccano/doccano/issues/new/choose) if you're unable to find an open one addressing the problem.
+* Use the relevant bug report templates to create the issue.
+
+#### How do I submit a good bug report?
+
+Explain the problem and include additional details to help maintainers reproduce the problem:
+
+* Use a clear and descriptive title for the issue to identify the problem.
+* Describe the exact steps which reproduce the problem in as many details as possible.
+* Provide specific examples to demonstrate the steps.
+* Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior.
+* Explain which behavior you expected to see instead and why.
+* Include screenshots and animated GIFs which show you following the described steps and clearly demonstrate the problem.
+* If the problem is related to performance or memory, include a CPU profile capture with your report.
+* If the problem is related to network, include a network activity in Chrome/Firefox/Safari DevTools.
+* If the problem wasn't triggered by a specific action, describe what you were doing before the problem happened and share more information using the guidelines below.
+
+### Suggesting Enhancements
+
+#### Before submitting an enhancement suggestion
+
+* Ensure the suggestion was not already reported by searching on GitHub under [Issues](https://github.com/doccano/doccano/issues).
+* [Open a new issue](https://github.com/doccano/doccano/issues/new/choose) if you're unable to find an open one addressing the suggestion.
+* Use the relevant issue templates to create one.
+
+#### How do I submit a good enhancement suggestion?
+
+Explain the suggestion and include additional details to help developers understand it:
+
+* Use a clear and descriptive title for the issue to identify the suggestion.
+* Provide a step-by-step description of the suggested enhancement in as many details as possible.
+* Provide specific examples to demonstrate the steps.
+* Describe the current behavior and explain which behavior you expected to see instead and why.
+* Include screenshots and animated GIFs which help you demonstrate the steps or point out the part of doccano which the suggestion is related to.
+* Explain why this enhancement would be useful to most doccano users.
+* List some other annotation tools or applications where this enhancement exists.
+* Specify which version of doccano you're using.
+* Specify the name and version of the OS you're using.
+
+### Pull Request Process
+
+Please follow these steps to have your contribution considered by the maintainers:
+
+1. Open a related issue before making a pull request as much as possible.
+2. Follow all instructions in [the template](PULL_REQUEST_TEMPLATE.md)
+3. Follow the [styleguides](#styleguides)
+4. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing <details><summary>What if the status checks are failing?</summary>If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track that problem with our status check suite.</details>
+5. You may merge the Pull Request in once you have the sign-off of the project members([@Hironsan](https://github.com/Hironsan) or [@icoxfog417](https://github.com/icoxfog417)).
+
+While the prerequisites above must be satisfied prior to having your pull request reviewed, the reviewer(s) may ask you to complete additional design work, tests, or other changes before your pull request can be ultimately accepted.
+
+## Styleguides
+
+### Git Commit Messages
+
+* Use the present tense ("Add feature" not "Added feature")
+* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
+* Limit the first line to 72 characters or less
+* Reference issues and pull requests liberally after the first line

From 4378b878d38d990537b76e4d52998195afe9679d Mon Sep 17 00:00:00 2001
From: Sathya Narrayanan <sathyanarrayanan@yandex.com>
Date: Sun, 10 May 2020 20:34:03 +0800
Subject: [PATCH 05/25] Update Heroku deploy link in README.md (#761)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c2de754e..71b76cf8 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ Go to <http://127.0.0.1:3000/>.
 | AWS[^1]   | [![AWS CloudFormation Launch Stack SVG Button](https://cdn.rawgit.com/buildkite/cloudformation-launch-stack-button-svg/master/launch-stack.svg)](https://console.aws.amazon.com/cloudformation/home?#/stacks/create/review?stackName=doccano&templateURL=https://s3-external-1.amazonaws.com/cf-templates-10vry9l3mp71r-us-east-1/2019290i9t-AppSGl1poo4j8qpq)  |
 | Azure | [![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)  |
 | GCP[^2] | [![GCP Cloud Run PNG Button](https://storage.googleapis.com/gweb-cloudblog-publish/images/run_on_google_cloud.max-300x300.png)](https://console.cloud.google.com/cloudshell/editor?shellonly=true&cloudshell_image=gcr.io/cloudrun/doccano&cloudshell_git_repo=https://github.com/doccano/doccano.git)  |
-| Heroku  | [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)  |
+| Heroku  | [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://dashboard.heroku.com/new?template=https%3A%2F%2Fgithub.com%2Fdoccano%2Fdoccano)  |
 
 > [^1]: (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]: Although this is a very cheap option, it is only suitable for very small teams (up to 80 concurrent requests). Read more on [Cloud Run docs](https://cloud.google.com/run/docs/concepts).

From 79449b7c789ba34f8508cbdb844fdcfcd8ddcb52 Mon Sep 17 00:00:00 2001
From: Christian Gill <christiangill14@gmail.com>
Date: Tue, 12 May 2020 16:27:46 +0200
Subject: [PATCH 06/25] change of permission for annotation edits

---
 app/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/views.py b/app/api/views.py
index afa030f4..ee94f879 100644
--- a/app/api/views.py
+++ b/app/api/views.py
@@ -212,7 +212,7 @@ class AnnotationList(generics.ListCreateAPIView):
 
 class AnnotationDetail(generics.RetrieveUpdateDestroyAPIView):
     lookup_url_kwarg = 'annotation_id'
-    permission_classes = [IsAuthenticated & (((IsAnnotator | IsAnnotationApprover) & IsOwnAnnotation) | IsProjectAdmin)]
+    permission_classes = [IsAuthenticated & (((IsAnnotator & IsOwnAnnotation) | IsAnnotationApprover)  | IsProjectAdmin)]
     swagger_schema = None
 
     def get_serializer_class(self):

From 2be9fe4daee11722c87c3efc71762961a3e6845d Mon Sep 17 00:00:00 2001
From: Nitin Kumar <nitin.cypher@gmail.com>
Date: Thu, 14 May 2020 18:35:26 -0400
Subject: [PATCH 07/25] Added flag for allowing downgrades while using apt

---
 tools/install-mssql.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install-mssql.sh b/tools/install-mssql.sh
index 3e527945..1a27eb2e 100755
--- a/tools/install-mssql.sh
+++ b/tools/install-mssql.sh
@@ -12,7 +12,7 @@ set -eo pipefail
 
 # install build dependencies
 apt-get update
-apt-get install --no-install-recommends -y \
+apt-get install --no-install-recommends -y --allow-downgrades \
       curl=7.52.1-5+deb9u10 \
       gnupg=2.1.18-8~deb9u4 \
       apt-transport-https=1.4.9

From 3035cd2b98918c0349d70f4c08d367e9d531eca5 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Sat, 2 May 2020 20:24:36 +0300
Subject: [PATCH 08/25] Update project_structure.md

---
 docs/project_structure.md | 79 +++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 36 deletions(-)

diff --git a/docs/project_structure.md b/docs/project_structure.md
index 20144592..ab28a73b 100644
--- a/docs/project_structure.md
+++ b/docs/project_structure.md
@@ -1,70 +1,77 @@
 # Project Structure
 
-In doccano v1.x, the application consists of a frontend and backend API. They are stored in the `frontend` and `app` directories.
+The important files/directories are as follows:
 
 ```bash
-.
-├── app
+/
+├── app/
+├── frontend/
+├── nginx/
+├── tools/
 ├── docker-compose.dev.yml
-├── docker-compose.prod.yml
-├── frontend
-├── nginx
-└── tools
+└── docker-compose.prod.yml
 ```
 
-The other important files/directories are as follows:
+Consider them:
 
-- [docker-compose.dev.yml](https://github.com/doccano/doccano/blob/master/docker-compose.dev.yml)
-- [docker-compose.prod.yml](https://github.com/doccano/doccano/blob/master/docker-compose.prod.yml)
-- [nginx](https://github.com/doccano/doccano/tree/master/nginx)
-- [tools](https://github.com/doccano/doccano/tree/master/tools)
+**[app/](https://github.com/doccano/doccano/tree/master/app)**
+
+The `app/api` directory contains backend code. See [below](#Backend).
+
+**[frontend/](https://github.com/doccano/doccano/tree/master/frontend)**
+
+The `app/api` directory contains frontend code. See [below](#Frontend).
 
 **[docker-compose.dev.yml](https://github.com/doccano/doccano/blob/master/docker-compose.dev.yml)**
 
-The `docker-compose.dev.yml` file contains configuration to run a development environment. Once we run the command `docker-compose -f docker-compose.dev.yml up`, compose runs backend API and frontend development containers.
+The `docker-compose.dev.yml` file contains [Docker Compose](https://docs.docker.com/compose) configuration to run a development environment.
+Once we run the command `docker-compose -f docker-compose.dev.yml up`, compose runs backend API and frontend development containers.
 
 **[docker-compose.prod.yml](https://github.com/doccano/doccano/blob/master/docker-compose.prod.yml)**
 
-The `docker-compose.prod.yml` file contains configuration to run a production environment. We adopted the three tier architecture. Once we run the command `docker-compose -f docker-compose.prod.yml up`, compose builds frontend and runs DBMS, backend API and web server containers.
+The `docker-compose.prod.yml` file contains [Docker Compose](https://docs.docker.com/compose) configuration to run a production environment.
+We adopted the three tier architecture. Once we run the command `docker-compose -f docker-compose.prod.yml up`, compose builds frontend and runs DBMS, backend API and web server containers.
 
 **[nginx](https://github.com/doccano/doccano/tree/master/nginx)**
 
-The `nginx` directory contains a nginx configuration file and Docker container. They are used only in `docker-compose.prod.yml`.
+The `nginx` directory contains a NGINX configuration file and Docker container. They are used only in `docker-compose.prod.yml`.
 
 **[tools](https://github.com/doccano/doccano/tree/master/tools)**
 
 The `tools` directory contains some shell scripts. They are used for CI, CD and so on.
 
-## Frontend
-
-The directory structure of the frontend follows Nuxt.js one. See the Nuxt.js documentation for details:
+## Backend
 
-- [Nuxt.js/Directory Structure](https://nuxtjs.org/guide/directory-structure/)
-
-## Backend API
-
-The directory structure of the backend api follows Django one. The important directories are as follows:
+The directory structure of the backend follows [Django](https://www.djangoproject.com) one.
+The important directories are as follows:
 
 ```bash
-.
-├── api
-├── app
-├── authentification
-└── server
+/
+├── app/
+├── ├── api/
+├── ├── app/
+├── ├── authentification/
+└── └── server/
 ```
 
-**[app/api](https://github.com/doccano/doccano/tree/master/app/api)**
+**[app/api/](https://github.com/doccano/doccano/tree/master/app/api)**
+
+The `app/api` directory contains backend API application. We use [Django Rest Framework](https://www.django-rest-framework.org) to implement the API.
+If you want to add new API, change the contents of this directory.
 
-The `api` directory contains backend API application. We use Django Rest Framework to implement the API. If you want to add new API, change the contents of this directory.
+**[app/app/](https://github.com/doccano/doccano/tree/master/app/app)**
 
-**[app/app](https://github.com/doccano/doccano/tree/master/app/app)**
+The `app/app` directory contains Django project settings. See [Writing your first Django app, part 1](https://docs.djangoproject.com/en/3.0/intro/tutorial01/#creating-a-project).
 
-The `app` directory contains Django project settings. See [Writing your first Django app, part 1](https://docs.djangoproject.com/en/3.0/intro/tutorial01/#creating-a-project).
+**[app/authentification/](https://github.com/doccano/doccano/tree/master/app/authentification)**
 
-**[app/authentification](https://github.com/doccano/doccano/tree/master/app/authentification)**
+The `app/authentification` directory contains authentification application. It is mainly used for user signup.
 
-The `authentification` directory contains authentification application. It is mainly used for user signup.
+**[app/server/](https://github.com/doccano/doccano/tree/master/app/server)**
 
-**[app/server](https://github.com/doccano/doccano/tree/master/app/server)**
+The `app/server` directory contains doccano v0.x codes. In the future, this directory will be integrated into the `api` directory.
+
+## Frontend
 
-The `server` directory contains doccano v0.x codes. In the future, this directory will be integrated into the `api` directory.
+The `frontent` directory structure of the frontend follows [Nuxt.js](https://ru.nuxtjs.org) one.
+See the [Nuxt.js documentation](https://nuxtjs.org/guide/directory-structure/) for details.

From 73965d43c72418d6c770bda1d07a2be51eadce65 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Tue, 5 May 2020 14:14:25 +0300
Subject: [PATCH 09/25] Adding annotators documentation improvement

---
 README.md   | 2 +-
 docs/faq.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 71b76cf8..fa200d5b 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ ADMIN_USERNAME: "admin"
 ADMIN_PASSWORD: "password"
 ```
 
-> Note: If you want to add annotators, see [Frequently Asked Questions](./docs/faq.md)
+> Note: If you want to add annotators/annotation approvers, see [Frequently Asked Questions](./docs/faq.md#i-want-to-add-annotators-annotatorsannotation-approvers)
 
 <!--
 
diff --git a/docs/faq.md b/docs/faq.md
index 7a49f846..fff6bdc6 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -16,12 +16,12 @@ Please check the following list.
 
 **You don't need your real & all data to validate file format. The picked data & masked data is suitable if your data is large or secret.**
 
-## I want to add annotators
+## I want to add annotators annotators/annotation approvers
 
 1. Add a user from [Django Admin site](https://djangobook.com/django-admin-site/).
 ![Add a user](./images/faq/add_user.png)
-2. Add the user to the project in the member page(`/projects/{project_id}/members`).
-3. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).
+2. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).
+3. Add the user to the project in the member page(`/projects/{project_id}/members`).
 
 ## I want to update to the latest doccano image
 

From 649fce2edec4426837adb12a25d529713dc6dbd2 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Mon, 18 May 2020 19:00:56 +0300
Subject: [PATCH 10/25] Mention v0.x files in a right way (#784)

---
 docs/project_structure.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/project_structure.md b/docs/project_structure.md
index ab28a73b..7ece9c27 100644
--- a/docs/project_structure.md
+++ b/docs/project_structure.md
@@ -2,7 +2,7 @@
 
 The important files/directories are as follows:
 
-```bash
+```
 /
 ├── app/
 ├── frontend/
@@ -40,18 +40,27 @@ The `nginx` directory contains a NGINX configuration file and Docker container.
 
 The `tools` directory contains some shell scripts. They are used for CI, CD and so on.
 
+Also, there are directories and files contain doccano v0.x codes.
+In the future, they will be integrated into the currect code or removed:
+
+```
+/
+├── app/
+├── └── server/
+└── docker-compose.prod.yml
+```
+
 ## Backend
 
 The directory structure of the backend follows [Django](https://www.djangoproject.com) one.
 The important directories are as follows:
 
-```bash
+```
 /
 ├── app/
 ├── ├── api/
 ├── ├── app/
-├── ├── authentification/
-└── └── server/
+└── └── authentification/
 ```
 
 **[app/api/](https://github.com/doccano/doccano/tree/master/app/api)**
@@ -67,10 +76,6 @@ The `app/app` directory contains Django project settings. See [Writing your firs
 
 The `app/authentification` directory contains authentification application. It is mainly used for user signup.
 
-**[app/server/](https://github.com/doccano/doccano/tree/master/app/server)**
-
-The `app/server` directory contains doccano v0.x codes. In the future, this directory will be integrated into the `api` directory.
-
 ## Frontend
 
 The `frontent` directory structure of the frontend follows [Nuxt.js](https://ru.nuxtjs.org) one.

From 36d2b6aa9e036897c95740a3f6337e81b3286978 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Tue, 5 May 2020 14:00:16 +0300
Subject: [PATCH 11/25] Update rebuild FAQ

 We should also remove `doccano_node_modules`, `doccano_venv` volumes on remove since doccano's dependencies could change.
---
 docs/faq.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 7a49f846..d68b890f 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -40,7 +40,6 @@ local               doccano_postgres_data
 local               doccano_static_volume
 local               doccano_venv
 local               doccano_www
-❯ docker volume rm doccano_www
-❯ docker volume rm doccano_static_volume
+❯ docker volume rm doccano_node_modules doccano_static_volume doccano_venv doccano_www
 ❯ docker-compose -f docker-compose.prod.yml build --no-cache
 ```

From 77a7d740d4f97f2b9a7b398fd00488ec7f17014f Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Sat, 2 May 2020 19:10:25 +0300
Subject: [PATCH 12/25] Update README.md

More concrete instructions about setting the superuser account credentials.
---
 README.md | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 71b76cf8..125da129 100644
--- a/README.md
+++ b/README.md
@@ -28,17 +28,29 @@ You can try the [annotation demo](http://doccano.herokuapp.com).
 
 Two options to run doccano:
 
-- Production
-- Development
+- production,
+- development.
 
-In any case, you need Docker and Docker Compose. Anyway, you need to clone the repository:
+To use doccano, please follow:
+
+### Install dependencies
+
+You need to install dependencies:
+
+- [Git](https://git-scm.com),
+- [Docker](https://www.docker.com),
+- [Docker Compose](https://docs.docker.com/compose).
+
+### Get the code
+
+You need to clone the repository:
 
 ```bash
 $ git clone https://github.com/doccano/doccano.git
 $ cd doccano
 ```
 
-_Note for Windows developers: Be sure to configure git to correctly handle line endings or you may encounter `status code 127` errors while running the services in future steps. Running with the git config options below will ensure your git directory correctly handles line endings._
+_Note for Windows developers:_ Be sure to configure git to correctly handle line endings or you may encounter `status code 127` errors while running the services in future steps. Running with the git config options below will ensure your git directory correctly handles line endings.
 
 ```bash
 git clone https://github.com/doccano/doccano.git --config core.autocrlf=input
@@ -46,20 +58,20 @@ git clone https://github.com/doccano/doccano.git --config core.autocrlf=input
 
 ### Production
 
-```bash
-$ docker-compose -f docker-compose.prod.yml up
-```
-
-Go to <http://0.0.0.0/>.
-
-Note the superuser account credentials located in the `docker-compose.prod.yml` file:
+Set the superuser account credentials in the `docker-compose.prod.yml` file:
 
 ```yml
 ADMIN_USERNAME: "admin"
 ADMIN_PASSWORD: "password"
 ```
 
-> Note: If you want to add annotators, see [Frequently Asked Questions](./docs/faq.md)
+Run doccano:
+
+```bash
+$ docker-compose -f docker-compose.prod.yml up
+```
+
+Go to <http://0.0.0.0/>.
 
 <!--
 
@@ -91,12 +103,25 @@ Go to <http://127.0.0.1:8000/>.
 
 ### Development
 
+Set the superuser account credentials in the `docker-compose.dev.yml` file:
+
+```yml
+ADMIN_USERNAME: "admin"
+ADMIN_PASSWORD: "password"
+```
+
+Run Doccano:
+
 ```bash
 $ docker-compose -f docker-compose.dev.yml up
 ```
 
 Go to <http://127.0.0.1:3000/>.
 
+### Add annotators (optionally)
+
+If you want to add annotators, see [Frequently Asked Questions](./docs/faq.md)
+
 ## One-click Deployment
 
 | Service | Button |

From 32d42b66709a8a5e7696ebe097d5836b73d7b3c8 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Thu, 21 May 2020 11:34:03 +0300
Subject: [PATCH 13/25] Typo fix

---
 docs/faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index d416adbb..0fcd0c4d 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -21,7 +21,7 @@ Please check the following list.
 1. Add a user from [Django Admin site](https://djangobook.com/django-admin-site/).
 ![Add a user](./images/faq/add_user.png)
 2. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).
-3. Add the user to the project in the member page(`/projects/{project_id}/members`).
+3. Add the user to the project in the member page (`/projects/{project_id}/members`).
 
 ## I want to update to the latest doccano image
 

From bb530cc476437a6fbb849387cfc245139cca23d2 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Fri, 22 May 2020 09:42:22 +0300
Subject: [PATCH 14/25] Fix

---
 docs/project_structure.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/project_structure.md b/docs/project_structure.md
index 7ece9c27..c7615f97 100644
--- a/docs/project_structure.md
+++ b/docs/project_structure.md
@@ -47,7 +47,7 @@ In the future, they will be integrated into the currect code or removed:
 /
 ├── app/
 ├── └── server/
-└── docker-compose.prod.yml
+└── docker-compose.yml
 ```
 
 ## Backend

From 719d001f3d7d9e55554b4851330ec8dedc66f097 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Fri, 22 May 2020 15:30:24 +0200
Subject: [PATCH 15/25] Remove legacy endpoint

As having this configured without a working backend will return dummy
data (projects) to the browser.

Fixes upstream #789
---
 frontend/nuxt.config.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js
index d3ccb678..d20b8393 100644
--- a/frontend/nuxt.config.js
+++ b/frontend/nuxt.config.js
@@ -26,10 +26,6 @@ export default {
     ]
   },
 
-  serverMiddleware: [
-    '~/api/index.js'
-  ],
-
   server: {
     host: '0.0.0.0' // default: localhost
   },

From b2ba6354c200b24df3d7992a6152ad6b8daf3699 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Tue, 26 May 2020 22:06:52 +0200
Subject: [PATCH 16/25] Use Alpine as root image

---
 app/Dockerfile      | 20 ++++++++------------
 frontend/Dockerfile | 15 ++++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 68711629..9709fae6 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,20 +1,16 @@
-FROM python:3.6
+FROM alpine:3.9.6
+
+CMD ["python3"]
 
-# set work directory
 WORKDIR /app
 
-# set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-# install psycopg2 dependencies
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y python3-dev libpq-dev unixodbc-dev
+COPY . /app/
 
-# install dependencies
-RUN pip install --upgrade pip setuptools
-COPY ./requirements.txt /app/requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
+RUN apk add -U python3 python3-dev libpq postgresql-dev unixodbc-dev musl-dev g++ libffi-dev \
+  && pip3 install --upgrade pip setuptools \
+  && pip3 install --no-cache-dir -r requirements.txt \
+  && apk del python3-dev postgresql-dev unixodbc-dev musl-dev g++ libffi-dev
 
-# copy project
-COPY . /app/
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index bf124695..66e68674 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1,14 +1,11 @@
-FROM node:13.2.0
+FROM node:13.2-alpine
 
-# set work directory
 WORKDIR /app
 
-# copy project
 COPY . /app/
 
-# install dependencies
-RUN npm install -g npm@latest
-RUN npm install
-
-# build project
-RUN npm run build
+RUN apk add -U git python3 make g++ \
+  && npm install -g npm@latest \
+  && npm install \
+  && npm run build \
+  && apk del git make g++

From 44d9ef1195e3f55fbfac9b3eabc2e6d9b4ae3402 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Thu, 28 May 2020 14:17:56 +0200
Subject: [PATCH 17/25] Extremely simple /v1/health endpoint

Anonymous endpoint that may be used by a container platform to verify
availability of the application.

Simply returns: HTTP/200 {"status":"green"}

Future iterations could extend this into reflecting status of
dependencies like database connections.
---
 app/api/tests/test_api.py | 10 ++++++++++
 app/api/urls.py           |  3 ++-
 app/api/views.py          |  9 ++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/api/tests/test_api.py b/app/api/tests/test_api.py
index 55303f74..5f8b08e7 100644
--- a/app/api/tests/test_api.py
+++ b/app/api/tests/test_api.py
@@ -29,6 +29,16 @@ def remove_all_role_mappings():
     RoleMapping.objects.all().delete()
 
 
+class TestHealthEndpoint(APITestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.url = reverse(viewname='health')
+
+    def test_returns_green_status_on_health_endpoint(self):
+        response = self.client.get(self.url, format='json')
+        self.assertEqual(response.data['status'], 'green')
+
+
 class TestUtilsMixin:
     def _patch_project(self, project, attribute, value):
         old_value = getattr(project, attribute, None)
diff --git a/app/api/urls.py b/app/api/urls.py
index b6154c57..a8941b6d 100644
--- a/app/api/urls.py
+++ b/app/api/urls.py
@@ -2,7 +2,7 @@ from django.urls import path
 from rest_framework.authtoken.views import obtain_auth_token
 from rest_framework.urlpatterns import format_suffix_patterns
 
-from .views import Me, Features, Users
+from .views import Me, Features, Users, Health
 from .views import ProjectList, ProjectDetail
 from .views import LabelList, LabelDetail, ApproveLabelsAPI, LabelUploadAPI
 from .views import DocumentList, DocumentDetail
@@ -12,6 +12,7 @@ from .views import StatisticsAPI
 from .views import RoleMappingList, RoleMappingDetail, Roles
 
 urlpatterns = [
+    path('health', Health.as_view(), name='health'),
     path('auth-token', obtain_auth_token),
     path('me', Me.as_view(), name='me'),
     path('features', Features.as_view(), name='features'),
diff --git a/app/api/views.py b/app/api/views.py
index afa030f4..d081a08c 100644
--- a/app/api/views.py
+++ b/app/api/views.py
@@ -11,7 +11,7 @@ from libcloud.base import DriverType, get_driver
 from libcloud.storage.types import ContainerDoesNotExistError, ObjectDoesNotExistError
 from rest_framework import generics, filters, status
 from rest_framework.exceptions import ParseError, ValidationError
-from rest_framework.permissions import IsAuthenticated
+from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework.parsers import MultiPartParser
@@ -30,6 +30,13 @@ IsInProjectReadOnlyOrAdmin = (IsAnnotatorAndReadOnly | IsAnnotationApproverAndRe
 IsInProjectOrAdmin = (IsAnnotator | IsAnnotationApprover | IsProjectAdmin)
 
 
+class Health(APIView):
+    permission_classes = (IsAuthenticatedOrReadOnly,)
+
+    def get(self, request, *args, **kwargs):
+        return Response({'status': 'green'})
+
+
 class Me(APIView):
     permission_classes = (IsAuthenticated,)
 

From 1df7cab04d1955d390c66694cd151c5dee5597cf Mon Sep 17 00:00:00 2001
From: Sergey Kolesnikov <scitator@gmail.com>
Date: Wed, 3 Jun 2020 14:16:23 +0300
Subject: [PATCH 18/25] Dockerfile cleanup

---
 app/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 68711629..f349b033 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -9,7 +9,9 @@ ENV PYTHONUNBUFFERED 1
 
 # install psycopg2 dependencies
 RUN apt-get update \
-    && apt-get install --no-install-recommends -y python3-dev libpq-dev unixodbc-dev
+    && apt-get install --no-install-recommends -y python3-dev libpq-dev unixodbc-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # install dependencies
 RUN pip install --upgrade pip setuptools

From 19c8dc4fe1064852fa28d759ec1c60dd79561201 Mon Sep 17 00:00:00 2001
From: Yuri Baburov <burchik@gmail.com>
Date: Fri, 5 Jun 2020 05:45:22 +0700
Subject: [PATCH 19/25] Display newlines for sequence-labeling projects in old
 frontend

---
 app/server/static/assets/css/annotation.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/static/assets/css/annotation.css b/app/server/static/assets/css/annotation.css
index f7f6abf6..bfce8bca 100644
--- a/app/server/static/assets/css/annotation.css
+++ b/app/server/static/assets/css/annotation.css
@@ -162,7 +162,7 @@ body {
 }
 
 .content .text-sequence {
-  white-space: normal; /* Not render newlines for sequence labelling */
+  white-space: pre-wrap; /* Not render newlines for sequence labelling */
   height: auto;
 }
 

From b6aed7f3ec46eb35ca8d573c1586004dd448d6d3 Mon Sep 17 00:00:00 2001
From: Yuri Baburov <burchik@gmail.com>
Date: Fri, 5 Jun 2020 05:45:59 +0700
Subject: [PATCH 20/25] Show annotation verification status with thumbs up icon
 on the left side view.

---
 app/server/static/components/annotation.pug | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/server/static/components/annotation.pug b/app/server/static/components/annotation.pug
index a3aaacf8..d8ae4b73 100644
--- a/app/server/static/components/annotation.pug
+++ b/app/server/static/components/annotation.pug
@@ -73,7 +73,8 @@ div.columns(v-cloak="")
           href="#"
         )
           span.icon
-            i.fa.fa-check(v-show="annotations[index] && annotations[index].length")
+            i.fa.fa-thumbs-up(v-show="annotations[index] && docs[index].annotation_approver")
+            i.fa.fa-check(v-show="annotations[index] && annotations[index].length && !docs[index].annotation_approver")
           span.name {{ doc.text.slice(0, 60) }}...
 
   div.column.is-7.is-offset-1.message.hero.is-fullheight#message-pane

From bf83280524c442d908bb9f610aaa54d357b6a2b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 01:25:49 +0000
Subject: [PATCH 21/25] Bump django from 2.2.10 to 2.2.13 in /app

Bumps [django](https://github.com/django/django) from 2.2.10 to 2.2.13.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.10...2.2.13)

Signed-off-by: dependabot[bot] <support@github.com>
---
 app/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/requirements.txt b/app/requirements.txt
index 74643b1b..ccd53d14 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -4,7 +4,7 @@ colour==0.1.5
 chardet==3.0.4
 coverage==4.5.3
 dj-database-url==0.5.0
-Django==2.2.10
+Django==2.2.13
 django-cloud-browser==0.5.0
 django-cors-headers==3.1.1
 django-filter==2.0.0

From e37be8dde0e97004437809ab87effb263841ba6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 16:33:26 +0000
Subject: [PATCH 22/25] Bump websocket-extensions from 0.1.3 to 0.1.4 in
 /app/server/static

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 app/server/static/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/server/static/package-lock.json b/app/server/static/package-lock.json
index a238c003..586ca9bf 100644
--- a/app/server/static/package-lock.json
+++ b/app/server/static/package-lock.json
@@ -9194,9 +9194,9 @@
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
     "which": {

From 532ce7d76251a0c906935421bfb9b494413f2c3c Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Wed, 10 Jun 2020 10:16:23 +0900
Subject: [PATCH 23/25] Show project name in the header

---
 .../components/organisms/layout/TheHeader.vue   | 17 ++++++++++++++++-
 .../components/organisms/layout/TheSideBar.vue  | 10 +---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/frontend/components/organisms/layout/TheHeader.vue b/frontend/components/organisms/layout/TheHeader.vue
index 2aaf87fd..f94db5c6 100644
--- a/frontend/components/organisms/layout/TheHeader.vue
+++ b/frontend/components/organisms/layout/TheHeader.vue
@@ -17,6 +17,16 @@
     >
       doccano
     </v-toolbar-title>
+    <v-btn
+      v-if="isAuthenticated && isIndividualProject"
+      text
+      style="text-transform:none"
+    >
+      <v-icon small class="mr-1">
+        mdi-hexagon-multiple
+      </v-icon>
+      <span> {{ currentProject.name }}</span>
+    </v-btn>
     <div class="flex-grow-1" />
     <the-color-mode-switcher />
     <v-btn
@@ -105,7 +115,12 @@ export default {
 
   computed: {
     ...mapGetters('auth', ['isAuthenticated']),
-    ...mapState('auth', ['username'])
+    ...mapState('auth', ['username']),
+    ...mapGetters('projects', ['currentProject']),
+
+    isIndividualProject() {
+      return this.$route.name.startsWith('projects-id')
+    }
   },
 
   methods: {
diff --git a/frontend/components/organisms/layout/TheSideBar.vue b/frontend/components/organisms/layout/TheSideBar.vue
index 275b3b6b..f9f36921 100644
--- a/frontend/components/organisms/layout/TheSideBar.vue
+++ b/frontend/components/organisms/layout/TheSideBar.vue
@@ -1,10 +1,5 @@
 <template>
   <v-list dense>
-    <v-list-item>
-      <h1 style="text-transform:capitalize;">
-        {{ currentProject.name }}
-      </h1>
-    </v-list-item>
     <v-btn
       :to="to"
       color="ms-4 my-1 mb-2 primary text-capitalize"
@@ -37,8 +32,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-
 export default {
   props: {
     link: {
@@ -69,8 +62,7 @@ export default {
   computed: {
     to() {
       return `/projects/${this.$route.params.id}/${this.link}`
-    },
-    ...mapGetters('projects', ['currentProject'])
+    }
   },
 
   methods: {

From f1349e662b0a892787fa033b28b09615b54d56a9 Mon Sep 17 00:00:00 2001
From: Alexander Kurakin <kuraga333@mail.ru>
Date: Wed, 10 Jun 2020 11:28:49 +0300
Subject: [PATCH 24/25] FAQ correction

Sync with below instructions
---
 docs/faq.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.md b/docs/faq.md
index 0fcd0c4d..88042750 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -26,7 +26,7 @@ Please check the following list.
 ## I want to update to the latest doccano image
 
 1. Execute `git pull` to reflect the latest doccano.
-2. Delete the volume that `doccano_www` and `doccano_static_volume`.  
+2. Delete the volume that `doccano_node_modules`, `doccano_static_volume`, `doccano_venv` and `doccano_www`.
   **Do not delete `doccano_postgres_data` because it stores your projects data.**
 3. Rebuild the doccano image.
 

From 8232a6b035b3a27f405f840e625bf88abaa17437 Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Wed, 10 Jun 2020 13:36:39 +0200
Subject: [PATCH 25/25] Add in bash and symlink /usr/bin/python

Pip3 doesn't need to be symlinked as the creation of /usr/bin/pip is
done through installation of setuptools (or the pip upgrade).
---
 app/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 9709fae6..9af1b4fc 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -9,8 +9,9 @@ ENV PYTHONUNBUFFERED 1
 
 COPY . /app/
 
-RUN apk add -U python3 python3-dev libpq postgresql-dev unixodbc-dev musl-dev g++ libffi-dev \
+RUN apk add -U bash python3 python3-dev libpq postgresql-dev unixodbc-dev musl-dev g++ libffi-dev \
   && pip3 install --upgrade pip setuptools \
   && pip3 install --no-cache-dir -r requirements.txt \
+  && ln -s /usr/bin/python3 /usr/bin/python \
   && apk del python3-dev postgresql-dev unixodbc-dev musl-dev g++ libffi-dev