Merge develop master

backend/cli.py

@@ -6,6 +6,7 @@
 import sys
 
 from .app.celery import app
+os.environ['DEBUG'] = 'False'
 base = os.path.abspath(os.path.dirname(__file__))
 sys.path.append(base)
 manage_path = os.path.join(base, 'manage.py')

docs/faq.md

@@ -1,5 +1,63 @@
 # FAQ
 
+## How to create a user
+
+After running doccano webserver, login to the admin site(in the case of pip installation) via <http://localhost:{port}/admin/>. The below is the example of port `8000` and username `admin`. If you set your own port or username and password on running the server, please change to your one.
+
+![](images/faq/user_creation/login.png)
+
+After login to the admin site, select `Users`:
+
+![](images/faq/user_creation/select_users.png)
+
+Select the ADD USER button in the upper right corner:
+
+![](images/faq/user_creation/select_add_user.png)
+
+After entering the username and password for the new user, select the `SAVE` button:
+
+![](images/faq/user_creation/create_user.png)
+
+Congratulations. Now you are able to log in to doccano as a new user. After logging out of the admin site, try logging in as a new user.
+
+## How to add a user to your project
+
+Note: This step assumes you have already created a new user. See [How to create a user](#how-to-create-a-user) in detail.
+
+After logging in to doccano, select your project. Note that you must be the administrator of the project to add users to the project.
+
+Select `Members` from the left side menu. If you are not the administrator of the project, `Members` will not be displayed.
+
+![](images/faq/add_annotator/select_members.png)
+
+Select the `Add` button to display the form. Fill in this form with the user name and role you want to add to the project. Then, select the `Save` button.
+
+![](images/faq/add_annotator/select_user.png)
+
+Congratulations. Now the new user are able to access the project.
+
+## How to change the password
+
+After running doccano webserver, login to the admin site(in the case of pip installation) via <http://localhost:{port}/admin/>. Note that you need to have a staff permission to login to the admin site. If you don't have it, please ask the administrator to change your password.
+
+![](images/faq/user_creation/login.png)
+
+After login to the admin site, select `Users`:
+
+![](images/faq/user_creation/select_users.png)
+
+Select the user you want to change the password:
+
+![](images/faq/how_to_change_password/user_list.png)
+
+Click `this form` link:
+
+![](images/faq/how_to_change_password/user_page.png)
+
+After showing a form below, change password there:
+
+![](images/faq/how_to_change_password/change_password.png)
+
 ## I can't upload my data
 
 Please check the following list.
@@ -16,30 +74,6 @@ 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 annotators/annotation approvers
-
-1. Login to [Django Admin](https://djangobook.com/django-admin-site/) (URL: `/admin/`).
-2. Add a user to `Users` table (`Add` link).
-3. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).
-4. Add the user to the project in the member page (`/projects/{project_id}/members`).
-
-## I want to change user's or admin's password
-
-For ordinary user:
-
-1. Login to [Django Admin](https://djangobook.com/django-admin-site/) (URL: `/admin/`).
-2. Open `Users` table.
-3. Open user you want to change password.
-4. In `Password` property, you'll see: `Raw passwords are not stored, so there is no way to see this user's password, but you can change the password using *this form*.` Click `this form` link.
-5. Fill the form. Click `CHANGE PASSWORD` button.
-6. **Logout from Django Admin site.** [You'll face login error without logout of Django Admin site](https://github.com/doccano/doccano/issues/723).
-
-For the superuser account credentials, you have to set new password in the `docker-compose.dev.yml` and `docker-compose.prod.yml` files:
-
-```yml
-ADMIN_PASSWORD: "new_password"
-```
-
 ## I want to change port number
 
 On production, edit `docker-compose.prod.yml` file: change `80:80` substring in `nginx`/`ports` section to `<your_port>:80`.

setup.py

@@ -43,6 +43,8 @@
     'sqlalchemy>=1.4.7',
     'gunicorn>=20.1.0',
     'waitress>=2.0.0',
+    'pydantic>=1.8.2',
+    'chardet>=4.0.0'
 ]
 
 setup(