-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
CVAT-3D milestone6 #3234
Merged
Merged
CVAT-3D milestone6 #3234
Changes from 1 commit
Commits
Show all changes
130 commits
Select commit
Hold shift + click to select a range
1bc71d9
CVAT 3D Milestone-5 changes
592d71c
Fixed Lint errors
4739662
test
jayraj-solanki 0b67a1a
Fixed review comments
jayraj-solanki 7e58b65
Fixed Lint errors
jayraj-solanki 9a7af78
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
jayraj-solanki 48dd77e
M5 Box operations
jayraj-solanki cd8d4c5
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
jayraj-solanki 6735ba6
M5- Bounding Box Operations
jayraj-solanki e94e39e
M5 Fixes
b6ea901
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
45f76ef
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
65e1233
Cypress test added wait time
8551ed2
Changed the scene color to white
129393c
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
67a46a3
Fixed year in header
d290c51
CameraAction naming convention changes
32148a8
M5-Fixes
81c23d5
Fixed test fail issue
913a162
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
96f33e7
M5- Major fixes
01fe8dc
Trigger notification
b7f78c4
Minor Fixes M5
d31a8d3
Merge branch 'cvat-3D-M5' of https://github.com/manasars/cvat into cv…
50d9a19
M5 - Other open items
d3dad7b
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
fc762f7
Trigger notification
642ead3
Error fix
fd0c88c
Merge branch 'cvat-3D-M5' of https://github.com/manasars/cvat into cv…
593308f
Trigger notification
604add3
Merge branch 'cvat-3D-M5' of https://github.com/manasars/cvat into cv…
ab7e801
Unit Test fail fix
9e52864
Merge branch 'cvat-3D-M5' of https://github.com/manasars/cvat into cv…
74c73fd
Unit Test fail fix
4a94dd1
Trigger notification
48bab75
CVAT-3D M5 Review Fixes -1
b4b0983
Review Fixes -2
2c84808
Review Fixes -3
5ff610b
Merge changes
4dbb2d9
Merged develop changes for preview image
68178f3
Added wait time in cypress
7627f64
CVAT 3D Milestone-6 , Export annotations, Dump annotations , Upload a…
d17d9ba
To fetch from datumaro local repository
dd2b44c
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
cb1e257
Updated latest develop code
23297c1
Merge branch 'openvinotoolkit:develop' into cvat-3D-Milestone6
manasars c450f48
Sync with develop branch
ef183bd
Develop code Sync issue fixed
55be05a
Sync develop changes
dc28a7d
Changes compatible with datumaro
8424d4a
Resolve Lint errors
d3705bb
Resolve datumaro issue
0472376
Cypress tests. CVAT-3D-M6.
dvkruchinin a6da68b
Update context.
dvkruchinin 59b697e
Remove screenshots.
dvkruchinin 14eb3f6
Added uploading an annotation to a task.
dvkruchinin fe21241
Cypress test. Export as a dataset.
dvkruchinin c312237
Added server test for 3D annotations.
msmirn1x af1dab0
Add export dataset test.
msmirn1x 5d2ecf0
Add export dataset test.
msmirn1x 31b6d27
Shortcut changes & testcases fixed
jayraj-solanki 3f5f116
Trigger notification
2ce8e1a
Resolved conflicts
1f460d3
Resolved conflicts
9c3e31d
Resolved conflicts
256c487
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
dvkruchinin bdf1af0
Fix the name of test
dvkruchinin d59654e
Remove unnecessary code
dvkruchinin b7385b0
Add dump check.
msmirn1x 27c8a05
Code review.
msmirn1x c2cc1bb
Added test for task with attributes.
msmirn1x 6d45a2a
Added test for task with attributes.
msmirn1x eb00bb7
Added more attributes.
msmirn1x e52a279
Fixed review comments
jayraj-solanki 868c32f
Resolved merge conflicts
f5abf34
Fixed Lint issues
9f4f16b
Check if instance issue is resolved
189b58e
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
dvkruchinin 7bc62cc
Fixed lint issues
2165f10
FIxed Lint issue
39232cc
FIxed Lint issue
b3d96c1
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
dvkruchinin f326ffe
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
msmirn1x a3b7cd4
Put points values with two decimal places.
msmirn1x a87bd14
Fixed Lag issue, shortcuts, play issue, copy paste control issue
jayraj-solanki e222dfc
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
0478e2a
Fixed Cypress Test 1
jayraj-solanki e234ed1
Fixed Cypress Test 2
jayraj-solanki 564b883
Fixed Cypress Test 2
jayraj-solanki ce6e390
Fixed Cypress Test 4
jayraj-solanki f15bd0c
Trigger notification
2a6c45a
Trigger notification
b4e26fb
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
dvkruchinin 19d210e
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
msmirn1x 80f10a1
Added some test for check scenarious
dvkruchinin 4480ca5
Rework uncaught:exception
dvkruchinin b8c3adb
Fix typo
dvkruchinin 6dc727e
Added necessary deepcopy for annotation.
msmirn1x d57c12e
Added test to check cpy/paste with holding ctrl
dvkruchinin acf6ffc
Apply check uncaught:exception from develop
dvkruchinin d1b161b
Resolved eslint error
dvkruchinin 626fb39
Temporary skiping the test with ctrl holding.
dvkruchinin b3d3523
Apply changes of index.js from develop
dvkruchinin 056a505
Added a scenario with changing a frame during copying a cuboid
dvkruchinin 990d619
Review Fixes
jayraj-solanki 4fb96cf
Revert case 80 to develop
dvkruchinin 4dd69ec
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
dvkruchinin 6237036
Trigger notification
fdc5f0f
Trigger notification
3c02c90
Fix for error
f574de1
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
jayraj-solanki 25839d3
Fix for error 2
jayraj-solanki 391a016
Fix for error 3
jayraj-solanki 9ee5e48
Trigger notification
7814454
Trigger notification
jayraj-solanki 337c0c4
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
jayraj-solanki caa4191
Merge branch 'cvat-3D-Milestone6' of https://github.com/manasars/cvat…
dvkruchinin 158d975
Test fix
dvkruchinin 108d022
Datomaru specific changes
jayraj-solanki bbff753
Fix for errors
jayraj-solanki 60f32e6
Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…
jayraj-solanki bd10464
Fix for Errors 2
jayraj-solanki 4375c6d
Merge remote-tracking branch 'MashaSS/cvat/ms/server_test_3D_M6' into…
d70da56
Merge remote-tracking branch 'dvkruchinin/cvat/dkru/cypress-tests-cva…
f470e67
Resolved existing error
0598294
Naming convention change as per latest
1712b45
Cypress test fixes
jayraj-solanki ac7e949
Resolved merge conflicts
jayraj-solanki 0fef2fe
Reverted base.txt
jayraj-solanki 0dab825
Review Fixes
jayraj-solanki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Resolved merge conflicts
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
You are viewing a condensed version of this merge commit. You can view the full changes here.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code related with tab height was removed in develop
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed