From 7c6d6c9c30f0a6c6c6e33e8e63d3aad65c7b1c0e Mon Sep 17 00:00:00 2001
From: Flymax
Date: Mon, 29 Jun 2020 01:00:40 +0900
Subject: [PATCH 1/3] Bug fixes: logout
---
cvat-ui/src/containers/header/header.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cvat-ui/src/containers/header/header.tsx b/cvat-ui/src/containers/header/header.tsx
index 59dc3f02..ed0e55f6 100644
--- a/cvat-ui/src/containers/header/header.tsx
+++ b/cvat-ui/src/containers/header/header.tsx
@@ -32,7 +32,7 @@ interface StateToProps {
}
interface DispatchToProps {
- onLogout: typeof logoutAsync;
+ onLogout: () => void;
switchSettingsDialog: (show: boolean) => void;
}
@@ -80,7 +80,7 @@ function mapStateToProps(state: CombinedState): StateToProps {
function mapDispatchToProps(dispatch: any): DispatchToProps {
return {
- onLogout: logoutAsync,
+ onLogout: (): void => dispatch(logoutAsync()),
switchSettingsDialog: (show: boolean): void => dispatch(switchSettingsDialog(show)),
};
}
From 38b19cbe7740b55990820ba2d577397f7d274cc3 Mon Sep 17 00:00:00 2001
From: lizhming
Date: Tue, 30 Jun 2020 20:24:31 +0900
Subject: [PATCH 2/3] Update CHANGELOG.md
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef041139..79bdeceb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,7 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- A couple of exceptions in AAM related with early object activation ()
- Propagation from the latest frame ()
- Number attribute value validation (didn't work well with floats) ()
-
+- Fixed Logout function ()
### Security
- SQL injection in Django `CVE-2020-9402` ()
From bb926fc2093762e46ad593a807af2ffee4913c90 Mon Sep 17 00:00:00 2001
From: Nikita Manovich
Date: Tue, 30 Jun 2020 23:07:02 +0300
Subject: [PATCH 3/3] Updated version of cvat-ui.
---
cvat-ui/package-lock.json | 2 +-
cvat-ui/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
index 516c9917..4b8be0d7 100644
--- a/cvat-ui/package-lock.json
+++ b/cvat-ui/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
- "version": "1.5.0",
+ "version": "1.5.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
index 157bed2d..9e698d2c 100644
--- a/cvat-ui/package.json
+++ b/cvat-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
- "version": "1.5.0",
+ "version": "1.5.1",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {