Merge branch 'develop' into mk/share_without_copying_

.eslintignore

@@ -7,3 +7,4 @@ datumaro/
 keys/
 logs/
 static/
+templates/

.eslintrc.js

@@ -4,14 +4,13 @@
 
 module.exports = {
     env: {
-        node: false,
+        node: true,
         browser: true,
         es6: true,
-        jquery: true,
-        qunit: true,
     },
     parserOptions: {
-        sourceType: 'script',
+        sourceType: 'module',
+        ecmaVersion: 2018,
     },
     plugins: ['eslint-plugin-header'],
     extends: ['eslint:recommended', 'prettier'],

.gitignore

@@ -30,3 +30,7 @@ yarn-debug.log*
 yarn-error.log*
 
 .DS_Store
+
+#Ignore Cypress tests temp files
+/tests/cypress/fixtures
+/tests/cypress/screenshots

.prettierignore

@@ -7,3 +7,4 @@ datumaro/
 keys/
 logs/
 static/
+templates/

.vscode/launch.json

@@ -21,6 +21,21 @@
             },
             "smartStep": true,
         },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "ui.js: test",
+            "cwd": "${workspaceRoot}/tests",
+            "runtimeExecutable": "${workspaceRoot}/tests/node_modules/.bin/cypress",
+            "args": [
+                "run",
+                "--headless",
+                "--browser",
+                "chrome"
+            ],
+            "outputCapture": "std",
+            "console": "internalConsole"
+        },
         {
             "name": "server: django",
             "type": "python",

.vscode/settings.json

@@ -1,27 +1,22 @@
 {
     "python.pythonPath": ".env/bin/python",
     "eslint.enable": true,
-    "eslint.validate": [
+    "eslint.probe": [
         "javascript",
         "typescript",
-        "typescriptreact",
+        "typescriptreact"
     ],
+    "eslint.onIgnoredFiles": "warn",
     "eslint.workingDirectories": [
         {
-            "directory":  "./cvat-core",
-            "changeProcessCWD": true
+            "directory": "${cwd}",
         },
         {
-            "directory":  "./cvat-canvas",
-            "changeProcessCWD": true
+            "pattern":  "cvat-*"
         },
         {
-            "directory":  "./cvat-ui",
-            "changeProcessCWD": true
-        },
-        {
-            "directory":  ".",
-            "changeProcessCWD": true
+            "directory": "tests",
+            "!cwd": true
         }
     ],
     "python.linting.pylintEnabled": true,

CHANGELOG.md

@@ -5,10 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.2.0] - Unreleased
+## [1.2.0-beta] - Unreleased
 
 ### Added
-- Removed Z-Order flag from task creation process
+
+- Added basic projects implementation (<https://github.com/openvinotoolkit/cvat/pull/2255>)
+
+### Changed
+
+- PATCH requests from cvat-core submit only changed fields (<https://github.com/openvinotoolkit/cvat/pull/2445>)
+
+### Deprecated
+
+-
+
+### Removed
+
+-
+
+### Fixed
+
+- Django templates for email and user guide (<https://github.com/openvinotoolkit/cvat/pull/2412>)
+- Saving relative paths in dummy chunks instead of absolute (<https://github.com/openvinotoolkit/cvat/pull/2424>)
+- Objects with a specific label cannot be displayed if at least one tag with the label exist (<https://github.com/openvinotoolkit/cvat/pull/2435>)
+- Wrong attribute can be removed in labels editor (<https://github.com/openvinotoolkit/cvat/pull/2436>)
+- UI fails with the error "Cannot read property 'label' of undefined" (<https://github.com/openvinotoolkit/cvat/pull/2442>)
+- Exception: "Value must be a user instance" (<https://github.com/openvinotoolkit/cvat/pull/2441>)
+- Reset zoom option doesn't work in tag annotation mode (<https://github.com/openvinotoolkit/cvat/pull/2443>)
+- Canvas is busy error (<https://github.com/openvinotoolkit/cvat/pull/2437>)
+
+### Security
+
+-
+
+## [1.2.0-alpha] - 2020-11-09
+
+### Added
+
 - Ability to login into CVAT-UI with token from api/v1/auth/login (<https://github.com/openvinotoolkit/cvat/pull/2234>)
 - Added layout grids toggling ('ctrl + alt + Enter')
 - Added password reset functionality (<https://github.com/opencv/cvat/pull/2058>)
@@ -29,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Optional chaining plugin for cvat-canvas and cvat-ui (<https://github.com/openvinotoolkit/cvat/pull/2249>)
 - MOTS png mask format support (<https://github.com/openvinotoolkit/cvat/pull/2198>)
 - Ability to correct upload video with a rotation record in the metadata (<https://github.com/openvinotoolkit/cvat/pull/2218>)
+- User search field for assignee fields (<https://github.com/openvinotoolkit/cvat/pull/2370>)
 
 ### Changed
 
@@ -42,13 +76,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Track frames in skips between annotation is presented in MOT and MOTS formats are marked `outside` (<https://github.com/openvinotoolkit/cvat/pull/2198>)
 - UI packages installation with `npm ci` instead of `npm install` (<https://github.com/openvinotoolkit/cvat/pull/2350>)
 
-### Deprecated
-
--
-
 ### Removed
 
--
+- Removed Z-Order flag from task creation process
 
 ### Fixed
 
@@ -72,10 +102,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 'List of tasks' Kibana visualization (<https://github.com/openvinotoolkit/cvat/pull/2361>)
 - An error on exporting not `jpg` or `png` images in TF Detection API format (<https://github.com/openvinotoolkit/datumaro/issues/35>)
 
-### Security
-
--
-
 ## [1.1.0] - 2020-08-31
 
 ### Added

Dockerfile.ui

@@ -21,8 +21,6 @@ COPY cvat-canvas/package*.json /tmp/cvat-canvas/
 COPY cvat-ui/package*.json /tmp/cvat-ui/
 COPY cvat-data/package*.json /tmp/cvat-data/
 
-RUN npm config set loglevel info
-
 # Install cvat-data dependencies
 WORKDIR /tmp/cvat-data/
 RUN npm ci

README.md

@@ -124,4 +124,5 @@ Other ways to ask questions and get our support:
 - [VentureBeat: Intel open-sources CVAT, a toolkit for data labeling](https://venturebeat.com/2019/03/05/intel-open-sources-cvat-a-toolkit-for-data-labeling/)
 
 ## Projects using CVAT
+
 - [Onepanel](https://github.com/onepanelio/core) - Onepanel is an open source vision AI platform that fully integrates CVAT with scalable data processing and parallelized training pipelines.

cvat-canvas/.eslintignore

@@ -0,0 +1 @@
+webpack.config.js

cvat-core/.eslintignore

@@ -0,0 +1 @@
+webpack.config.js

cvat-core/.eslintrc.js

@@ -4,19 +4,17 @@
 
 module.exports = {
     env: {
-        node: false,
+        node: true,
         browser: true,
         es6: true,
-        jquery: true,
-        qunit: true,
         'jest/globals': true,
     },
     parserOptions: {
         parser: 'babel-eslint',
         sourceType: 'module',
         ecmaVersion: 2018,
     },
-    plugins: ['security', 'jest', 'no-unsanitized', 'no-unsafe-innerhtml'],
+    plugins: ['security', 'jest', 'no-unsafe-innerhtml'],
     extends: ['eslint:recommended', 'plugin:security/recommended', 'plugin:no-unsanitized/DOM', 'airbnb-base'],
     rules: {
         'no-await-in-loop': [0],