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

Implement merging of placeholders #1031

Merged
merged 20 commits into from
Mar 3, 2023
Merged

Implement merging of placeholders #1031

merged 20 commits into from
Mar 3, 2023

Commits on Feb 17, 2023

  1. Implement insertOrUpdate function on PlaceholderManager.kt

    @planarvoid
    planarvoid committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    9598ede View commit details
    Browse the repository at this point in the history

  2. Add shouldMergeItem parameter to insertOrUpdateItem method

    @planarvoid
    planarvoid committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    cdc744b View commit details
    Browse the repository at this point in the history

  3. Improve behaviour of removeImage

    @planarvoid
    planarvoid committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    f571866 View commit details
    Browse the repository at this point in the history

  4. Delete followin blank line when removing a media item

    @planarvoid
    planarvoid committed Feb 17, 2023
    Configuration menu
    Copy the full SHA
    a2a7d0e View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Fix removeMedia method and add tests

    @planarvoid
    planarvoid committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    e74881f View commit details
    Browse the repository at this point in the history

  2. Remove unused imports

    @planarvoid
    planarvoid committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    6919dd3 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Merge branch 'trunk' into feature/implement-merging-of-placeholders

    @planarvoid
    planarvoid committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    2f7e982 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Trigger media delete callback when media removed

    @planarvoid
    planarvoid committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    5c3dc57 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Make sure access to positionToId is thread safe

    @planarvoid
    planarvoid committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    9cf35b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Fix issues with placeholders and blocked thread

    @planarvoid
    planarvoid committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    d6837e8 View commit details
    Browse the repository at this point in the history

  2. Remove unused logs

    @planarvoid
    planarvoid committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    62a0f48 View commit details
    Browse the repository at this point in the history

  3. Fix placeholders in empty body

    @planarvoid
    planarvoid committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    9716bde View commit details
    Browse the repository at this point in the history

  4. Merge branch 'trunk' into feature/implement-merging-of-placeholders

    @planarvoid
    planarvoid committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    a9bbb9a View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Improve behaviour of history when updating placeholders

    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    797868e View commit details
    Browse the repository at this point in the history

  2. Implement adding to a gallery when inserting an item before

    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    16332cb View commit details
    Browse the repository at this point in the history

  3. Fix lint issues

    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    37d0eb7 View commit details
    Browse the repository at this point in the history

  4. Add a parameter to update method to handle media inserted before the … 

    …placeholder
    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    a0f4367 View commit details
    Browse the repository at this point in the history

  5. Fix ImageWithCaptionAdapter.kt

    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    29673ed View commit details
    Browse the repository at this point in the history

  6. Make sure we're checking only within text limit

    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    d96c527 View commit details
    Browse the repository at this point in the history

  7. Clear all placeholder views before HTML is processed

    @planarvoid
    planarvoid committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    91d45dc View commit details
    Browse the repository at this point in the history