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: watermark with radios and inputs (DEV-3313) #1506

Merged
merged 9 commits into from
Mar 7, 2024
Merged

feat: watermark with radios and inputs (DEV-3313) #1506

merged 9 commits into from
Mar 7, 2024

Commits on Mar 5, 2024

  1. feat: watermark with radios and inputs

    @irmastnt
    irmastnt committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    07e1759 View commit details
    Browse the repository at this point in the history

  2. fix: linting

    @irmastnt
    irmastnt committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    b48f1a5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feature/dev-3313-only-watermark-or-resolutio… 

    …n-size-in-or-absolute
    @irmastnt
    irmastnt committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    a53134e View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. fix: changed input masking library to imaskjs

    @irmastnt
    irmastnt committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    4307eff View commit details
    Browse the repository at this point in the history

  2. fix: linting

    @irmastnt
    irmastnt committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    98b46e0 View commit details
    Browse the repository at this point in the history

  3. PR fix

    @irmastnt
    irmastnt committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    afa4b6d View commit details
    Browse the repository at this point in the history

  4. fix: updated generated API schema, image settings

    @irmastnt
    irmastnt committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    60e5410 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feature/dev-3313-only-watermark-or-resolutio… 

    …n-size-in-or-absolute

* main:
  fix: resource class item autocomplete refresh and loading (DEV-3371) (#1504)
  feat: watermark with radios and inputs (DEV-3313) (#1502)

# Conflicts:
#	apps/dsp-app/src/app/project/image-settings/image-settings.component.html
#	apps/dsp-app/src/app/project/image-settings/image-settings.component.ts
    @irmastnt
    irmastnt committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    de9849b View commit details
    Browse the repository at this point in the history

  6. fix: linting

    @irmastnt
    irmastnt committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    bcb96cb View commit details
    Browse the repository at this point in the history