Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Az/data streaming resolve conflicts #1325

Merged
merged 60 commits into from
Mar 27, 2020
Merged

Az/data streaming resolve conflicts #1325

Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
26da003
Merge pull request #468 from opencv/hotfix-0.4.2
nmanovic Jun 4, 2019
52c9b5f
Changed version number (0, 5, 'final', 0).
Sep 10, 2019
0967a74
Updated changelog file.
Sep 10, 2019
fda7c1a
fixed default attribute values for tracked shapes (#703)
azhavoro Sep 10, 2019
242b3df
Release 0.5.0
nmanovic Sep 12, 2019
eacfab7
Updated CHANGELOG with information about Zenodo
Oct 17, 2019
69bc32b
Updated CHANGELOG with information about Zenodo (#777)
nmanovic Oct 17, 2019
87a74a7
Updated version of the project.
Oct 17, 2019
0913abf
Merge pull request #778 from opencv/hotfix-0.5.1
nmanovic Oct 17, 2019
9124584
Hotfix: fixed skikit-image version (#965)
bsekachev Dec 16, 2019
42aad8b
Increased CVAT version (0.5.2)
Dec 16, 2019
965ff77
wip
ActiveChooN Mar 12, 2020
8bf647b
Release 0.6.0 (#1238)
nmanovic Mar 15, 2020
4d0c225
temp
ActiveChooN Mar 16, 2020
b0dbbb3
Merge branch 'develop' into dk/point-deletion
ActiveChooN Mar 18, 2020
936d305
[Datumaro] Fix frame matching in video annotations import (#1274)
zhiltsov-max Mar 18, 2020
9545132
[Datumaro] Allow empty COCO dataset export (#1272)
zhiltsov-max Mar 18, 2020
08688b0
[Datumaro] Fix occluded and z_order attributes export (#1271)
zhiltsov-max Mar 18, 2020
731b896
Fix LabelMe format (#1260)
zhiltsov-max Mar 18, 2020
845be3b
Added point deletion context menu
ActiveChooN Mar 18, 2020
bfd3000
React UI: Added logging (#1288)
bsekachev Mar 19, 2020
1408443
OpenVino 2020 (#1269)
benhoff Mar 20, 2020
1c1ab6a
fixed point context menu for rectangles
ActiveChooN Mar 20, 2020
7e7a5a6
Merge branch 'develop' into dk/point-deletion
ActiveChooN Mar 20, 2020
8efaf58
Add recursive importers (#1290)
zhiltsov-max Mar 20, 2020
0744c6a
[Datumaro] MOT format (#1289)
zhiltsov-max Mar 20, 2020
c91e895
[Datumaro] LabelMe format (#1293)
zhiltsov-max Mar 20, 2020
fe862b4
[Datumaro] Update LabelMe format (#1296)
zhiltsov-max Mar 20, 2020
feebec2
Release v0.6.1 (#1267)
nmanovic Mar 21, 2020
267c765
Add information about v0.6.1 release.
Mar 21, 2020
9ef89c7
Merge branch 'master' into develop
Mar 21, 2020
7960447
React UI: Better exception handling (#1297)
bsekachev Mar 23, 2020
56f58b6
Fixed context menu on ubuntu
ActiveChooN Mar 23, 2020
8aaa4d2
Fixed deleting of the latest point
bsekachev Mar 23, 2020
56c6f11
Merge pull request #1304 from opencv/bs/delete_points_fix
ActiveChooN Mar 23, 2020
c11cc64
fixes
ActiveChooN Mar 23, 2020
4f20f46
Fix attributes with spaces in names (#1305)
zhiltsov-max Mar 24, 2020
3c128b2
fixed PR
ActiveChooN Mar 24, 2020
03817f0
[Datumaro] Fix image merging (#1301)
zhiltsov-max Mar 24, 2020
57e8083
Merge pull request #1292 from opencv/dk/point-deletion
ActiveChooN Mar 24, 2020
4eeb94d
Validation for frame input value
bsekachev Mar 24, 2020
e55deb7
Fixed UI fail when write characters in auto save interval input
bsekachev Mar 24, 2020
b12ae34
Fixed input numbers in player settings
bsekachev Mar 24, 2020
d789087
Fixed ui failing in propagate confirmation
bsekachev Mar 24, 2020
eeee914
Fixed latest input numbers, removed extra code, fixed typings
bsekachev Mar 24, 2020
ef11ca4
Fix navigation
bsekachev Mar 24, 2020
472d317
Added undopoint in editing
bsekachev Mar 24, 2020
b700719
Fixed: Could not receive frame (after merge on the latest frame)
bsekachev Mar 24, 2020
71d0bb5
Removed extra action dispatching
bsekachev Mar 24, 2020
1806c99
Which -> button property
bsekachev Mar 25, 2020
3f4d6fc
Merge pull request #1314 from opencv/bs/batch_of_fixes
ActiveChooN Mar 25, 2020
62cd4ec
Fixed: Inconsistent labels between UI and CLI/API
bsekachev Mar 25, 2020
73a7a7f
Fixed resize on right mouse button
bsekachev Mar 25, 2020
5e2f2ec
Fixed create object URL after first save, fixed URL itself
bsekachev Mar 25, 2020
c55cbde
Undo/redo returns frame where was a change (as it was done in previou…
bsekachev Mar 25, 2020
e478637
Fixed unit tests
bsekachev Mar 25, 2020
6a4ccde
[Datumaro] Extract common extractor functionality (#1319)
zhiltsov-max Mar 26, 2020
76d0c6b
Merge pull request #1318 from opencv/bs/batch_of_fixes
ActiveChooN Mar 26, 2020
ecad023
Fix AWS deployment (#1316)
nmanovic Mar 26, 2020
90974aa
Merge remote-tracking branch 'origin/develop' into origin/az/data_chu…
Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cvat-ui/src/actions/annotation-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,7 @@ export function getJobAsync(
const colors = [...cvat.enums.colors];

loadJobEvent.close(await jobInfoGenerator(job));

dispatch({
type: AnnotationActionTypes.GET_JOB_SUCCESS,
payload: {
Expand Down