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

feat(edit-page-2): Allow drag and drop functionality for images in dotcms #28249

Merged
merged 56 commits into from
Apr 29, 2024
Merged

feat(edit-page-2): Allow drag and drop functionality for images in dotcms #28249

merged 56 commits into from
Apr 29, 2024

Commits on Apr 16, 2024

  1. wip

    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    fc0cbd9 View commit details
    Browse the repository at this point in the history

  2. move drag item to the store

    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c1589e6 View commit details
    Browse the repository at this point in the history

  3. Update edit-ema-editor.component.ts

    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a82a5a2 View commit details
    Browse the repository at this point in the history

  4. unify drag and drop

    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    21aa7a5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    fcc7489 View commit details
    Browse the repository at this point in the history

  6. now we can drop images

    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    d9175a7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    d0605f5 View commit details
    Browse the repository at this point in the history

  8. Merge branch '28039-edit-page-v2-allow-drag-and-drop-functionality-fo… 

    …r-images-in-dotcms' of https://github.com/dotCMS/core into 28039-edit-page-v2-allow-drag-and-drop-functionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    77c0656 View commit details
    Browse the repository at this point in the history

  9. code cleaning

    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    6583f45 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    c056eba View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    2de732c View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a85580c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    90494ed View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    65cede0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    0cb96e4 View commit details
    Browse the repository at this point in the history

  3. merge conflicts

    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    41d6e64 View commit details
    Browse the repository at this point in the history

  4. merge

    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    1ff5902 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    f621fd7 View commit details
    Browse the repository at this point in the history

  6. handle drop on the editor and handle file dropping

    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    71897b6 View commit details
    Browse the repository at this point in the history

  7. fix dropzone bug

    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    d99dfd7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    002ce28 View commit details
    Browse the repository at this point in the history

  9. partial fix of a bug

    @zJaaal
    zJaaal committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e49c7c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. potential fix for the out of bounds bug

    @zJaaal
    zJaaal committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    b16faa7 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    0dc3a55 View commit details
    Browse the repository at this point in the history

  2. Merge branch '28039-edit-page-v2-allow-drag-and-drop-functionality-fo… 

    …r-images-in-dotcms' of https://github.com/dotCMS/core into 28039-edit-page-v2-allow-drag-and-drop-functionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    6c1b47a View commit details
    Browse the repository at this point in the history

  3. clean state on mouse over and no dragItem

    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    61edb39 View commit details
    Browse the repository at this point in the history

  4. was not the fix

    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    3956b5f View commit details
    Browse the repository at this point in the history

  5. error handling

    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    d3628bd View commit details
    Browse the repository at this point in the history

  6. fix dropzone tests

    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    dc216fa View commit details
    Browse the repository at this point in the history

  7. fix palette and tools tests

    @zJaaal
    zJaaal committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    f0a343d View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    3eff7bb View commit details
    Browse the repository at this point in the history

  2. add test cases first part

    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6db9826 View commit details
    Browse the repository at this point in the history

  3. fix broken test

    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    c8b131a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    9c083ac View commit details
    Browse the repository at this point in the history

  5. add test cases part 2

    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1ffb1bd View commit details
    Browse the repository at this point in the history

  6. add rest of test cases

    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    2a5d8ae View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    b40ffdc View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    049dff1 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    284fe07 View commit details
    Browse the repository at this point in the history

  2. small refactor to avoid double calculations

    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    bc1f289 View commit details
    Browse the repository at this point in the history

  3. optimize ngFor

    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    09099d5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a9eda11 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    86450ad View commit details
    Browse the repository at this point in the history

  6. feedback

    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    0179f11 View commit details
    Browse the repository at this point in the history

  7. feedback

    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a9e591e View commit details
    Browse the repository at this point in the history

  8. fix sonarqube

    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    98fc245 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    fc82c6b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    96177da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    864c5ff View commit details
    Browse the repository at this point in the history

  3. feedback

    @zJaaal
    zJaaal committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d6e8f7c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d70e7bf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d238ee2 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ba43b8d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    81629f4 View commit details
    Browse the repository at this point in the history

  3. fix after merge

    @zJaaal
    zJaaal committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    d860721 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'master' into 28039-edit-page-v2-allow-drag-and-drop-fun… 

    …ctionality-for-images-in-dotcms
    @zJaaal
    zJaaal committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f7d6c90 View commit details
    Browse the repository at this point in the history