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

Merge annotations and dataset_manager apps #1352

Merged
merged 88 commits into from
May 13, 2020
Merged

Merge annotations and dataset_manager apps #1352

merged 88 commits into from
May 13, 2020

Commits on Apr 14, 2020

  1. Move annotations to dm

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    9c87cdc View commit details
    Browse the repository at this point in the history

  2. Refactor dm

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    06d6217 View commit details
    Browse the repository at this point in the history

  3. Rename data manager

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    40375f0 View commit details
    Browse the repository at this point in the history

  4. Move anno dump and upload functions

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    8c64a9a View commit details
    Browse the repository at this point in the history

  5. Join server host and port in cvat cli

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    ce9c0a8 View commit details
    Browse the repository at this point in the history

  6. Move export templates dir

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    cf181ae View commit details
    Browse the repository at this point in the history

  7. add dm project exporter

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    76c48c7 View commit details
    Browse the repository at this point in the history

  8. update mask format support

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    a2f00f5 View commit details
    Browse the repository at this point in the history

  9. Use decorators for formats definition

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    37a4a03 View commit details
    Browse the repository at this point in the history

  10. Update formats

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    7736039 View commit details
    Browse the repository at this point in the history

  11. Update format implementations

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    ba75d7c View commit details
    Browse the repository at this point in the history

  12. remove parameter

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    8b0173a View commit details
    Browse the repository at this point in the history

  13. Add dm views

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    5c770b4 View commit details
    Browse the repository at this point in the history

  14. Move annotation components to dm

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    527123b View commit details
    Browse the repository at this point in the history

  15. restore extension for export formats

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    a758550 View commit details
    Browse the repository at this point in the history

  16. update rest api

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    81404b1 View commit details
    Browse the repository at this point in the history

  17. use serializers, update views

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    92b1bba View commit details
    Browse the repository at this point in the history

  18. merge develop

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    ae7974e View commit details
    Browse the repository at this point in the history

  19. Update format names

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    f8e2663 View commit details
    Browse the repository at this point in the history

  20. Update docs

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    927ca56 View commit details
    Browse the repository at this point in the history

  21. Update tests

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    cc04df1 View commit details
    Browse the repository at this point in the history

  22. move test

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    2d2ca2d View commit details
    Browse the repository at this point in the history

  23. fix import

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    0263a0e View commit details
    Browse the repository at this point in the history

  24. Extend format tests

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    ec52ecd View commit details
    Browse the repository at this point in the history

  25. django compatibility for directory access

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    76f496e View commit details
    Browse the repository at this point in the history

  26. move tests

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    1f4612c View commit details
    Browse the repository at this point in the history

  27. update module links

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    e139e98 View commit details
    Browse the repository at this point in the history

  28. fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    acf79ca View commit details
    Browse the repository at this point in the history

  29. fix git application

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    c3d8ed1 View commit details
    Browse the repository at this point in the history

  30. fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    5567e54 View commit details
    Browse the repository at this point in the history

  31. add extension recommentation

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    c46769f View commit details
    Browse the repository at this point in the history

  32. fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    8ef19aa View commit details
    Browse the repository at this point in the history

  33. api

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    1c42d41 View commit details
    Browse the repository at this point in the history

  34. join api methods

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    780e108 View commit details
    Browse the repository at this point in the history

  35. Add trim whitespace to workspace config

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    951bcb4 View commit details
    Browse the repository at this point in the history

  36. update tests

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    3c5caae View commit details
    Browse the repository at this point in the history

  37. fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    fce56ca View commit details
    Browse the repository at this point in the history

  38. Update format docs

    @zhiltsov-max
    zhiltsov-max committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    c87ece3 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. join format queries

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    1e5f992 View commit details
    Browse the repository at this point in the history

  2. fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    73edf83 View commit details
    Browse the repository at this point in the history

  3. update new ui

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    1915bb7 View commit details
    Browse the repository at this point in the history

  4. ui tests

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d7ff4de View commit details
    Browse the repository at this point in the history

  5. old ui

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    01e176d View commit details
    Browse the repository at this point in the history

  6. update js bundles

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    f14571f View commit details
    Browse the repository at this point in the history

  7. linter fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    fb1c177 View commit details
    Browse the repository at this point in the history

  8. add image with loader tests

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    7b1e758 View commit details
    Browse the repository at this point in the history

  9. fix linter

    @zhiltsov-max
    zhiltsov-max committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    5111148 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. fix frame step and frame access

    @zhiltsov-max
    zhiltsov-max committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    a94cc5e View commit details
    Browse the repository at this point in the history

  2. use server file name for annotations export

    @zhiltsov-max
    zhiltsov-max committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    fa0ac2a View commit details
    Browse the repository at this point in the history

  3. update cvat core

    @zhiltsov-max
    zhiltsov-max committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    daea029 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. add import hack for rest api tests

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    9fa1957 View commit details
    Browse the repository at this point in the history

  2. move cli tests

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    ff07d8c View commit details
    Browse the repository at this point in the history

  3. fix cvat format converter args parsing

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1edd1ab View commit details
    Browse the repository at this point in the history

  4. remove folder on extract error

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    d7bc832 View commit details
    Browse the repository at this point in the history

  5. print error message on incorrect xpath expression

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    4f88440 View commit details
    Browse the repository at this point in the history

  6. use own categories when no others exist

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1ace725 View commit details
    Browse the repository at this point in the history

  7. update changelog

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    ca2384a View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into zm/merge-anno-and-dm-2

    @zhiltsov-max
    zhiltsov-max authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    6a244cf View commit details
    Browse the repository at this point in the history

  9. really add text to changelog

    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    51581b7 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'zm/merge-anno-and-dm-2' of https://github.com/opencv/cvat… 

    … into zm/merge-anno-and-dm-2
    @zhiltsov-max
    zhiltsov-max committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    c87bf6b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Fix annotation window menu

    @zhiltsov-max
    zhiltsov-max committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    d991f11 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. fix ui

    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    7595119 View commit details
    Browse the repository at this point in the history

  2. fix replace

    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    6b29167 View commit details
    Browse the repository at this point in the history

  3. update extra apps

    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    5cbdb3e View commit details
    Browse the repository at this point in the history

  4. format readme

    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    d69c0a4 View commit details
    Browse the repository at this point in the history

  5. readme

    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    5ad4b09 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop' into zm/merge-anno-and-… 

    …dm-2
    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    0d36cc3 View commit details
    Browse the repository at this point in the history

  7. linter

    @zhiltsov-max
    zhiltsov-max committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    cdb26c1 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Merge branch 'develop' into zm/merge-anno-and-dm-2

    @zhiltsov-max
    zhiltsov-max committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    0ca795e View commit details
    Browse the repository at this point in the history

  2. Fix old ui

    @zhiltsov-max
    zhiltsov-max committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    3ad5e25 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @nmanovic
    nmanovic authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    10a00e9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into zm/merge-anno-and-dm-2

    @zhiltsov-max
    zhiltsov-max authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    61b7740 View commit details
    Browse the repository at this point in the history

  5. update user guide

    @zhiltsov-max
    zhiltsov-max committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    6bf194b View commit details
    Browse the repository at this point in the history

  6. linter

    @zhiltsov-max
    zhiltsov-max committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    fd41e1d View commit details
    Browse the repository at this point in the history

  7. more linter fixes

    @zhiltsov-max
    zhiltsov-max committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    28d3e52 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Merge branch 'develop' into zm/merge-anno-and-dm-2

    @zhiltsov-max
    zhiltsov-max committed May 6, 2020
    Configuration menu
    Copy the full SHA
    d1db65f View commit details
    Browse the repository at this point in the history

  2. Update changelog

    @zhiltsov-max
    zhiltsov-max committed May 6, 2020
    Configuration menu
    Copy the full SHA
    95c7068 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into zm/merge-anno-and-… 

    …dm-2
    @zhiltsov-max
    zhiltsov-max committed May 6, 2020
    Configuration menu
    Copy the full SHA
    4b8016a View commit details
    Browse the repository at this point in the history

  4. fix merge

    @zhiltsov-max
    zhiltsov-max committed May 6, 2020
    Configuration menu
    Copy the full SHA
    1d4cb1f View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. Merge branch 'develop' into zm/merge-anno-and-dm-2

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    95180eb View commit details
    Browse the repository at this point in the history

  2. remove duplicating lines from changelog

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    8d3b0ae View commit details
    Browse the repository at this point in the history

  3. fix ci tests

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    13ea752 View commit details
    Browse the repository at this point in the history

  4. revert unnecessary changes in user_guide

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    c9dfff4 View commit details
    Browse the repository at this point in the history

  5. revert changes in js libraries

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    5728cfd View commit details
    Browse the repository at this point in the history

  6. rebuild cvat-core

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    80e04c6 View commit details
    Browse the repository at this point in the history

  7. fix uploading in old ui

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    9d32c57 View commit details
    Browse the repository at this point in the history

  8. fix cvat xml uploading

    @zhiltsov-max
    zhiltsov-max committed May 7, 2020
    Configuration menu
    Copy the full SHA
    79e7e9f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Bump cvat-core and cvat-ui versions

    @zhiltsov-max
    zhiltsov-max committed May 8, 2020
    Configuration menu
    Copy the full SHA
    ae7c237 View commit details
    Browse the repository at this point in the history