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 next into master #136

Merged
merged 29 commits into from
Sep 23, 2024
Merged

Merge next into master #136

merged 29 commits into from
Sep 23, 2024

Commits on Jun 25, 2024

  1. feat : variants implementation

    @reeshika-h
    reeshika-h committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    965e822 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Chore : indentation and dummy ids added

    @reeshika-h
    reeshika-h committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    db12655 View commit details
    Browse the repository at this point in the history

  2. Chore : Indentation done

    @reeshika-h
    reeshika-h committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    fb50972 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Merge pull request #123 from contentstack/next 

    Next
    @cs-raj
    cs-raj authored Jul 23, 2024
    Configuration menu
    Copy the full SHA
    c3b8707 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. fix: removed credentials and resolved semgrep integrity issue

    @reeshika-h
    reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e45af0c View commit details
    Browse the repository at this point in the history

  2. feat: added where method in AssetLibrary class

    @reeshika-h
    reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c2c28df View commit details
    Browse the repository at this point in the history

  3. change: removed unused libraries

    @reeshika-h
    reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e53391f View commit details
    Browse the repository at this point in the history

  4. Version bump

    @reeshika-h
    reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    99b672b View commit details
    Browse the repository at this point in the history

  5. sca-scan.yml

    @aravindbuilt @reeshika-h
    aravindbuilt authored and reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    28fb591 View commit details
    Browse the repository at this point in the history

  6. jira.yml

    @aravindbuilt @reeshika-h
    aravindbuilt authored and reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    b6dca03 View commit details
    Browse the repository at this point in the history

  7. sast-scan.yml

    @aravindbuilt @reeshika-h
    aravindbuilt authored and reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    dd22993 View commit details
    Browse the repository at this point in the history

  8. codeql-analysis.yml

    @aravindbuilt @reeshika-h
    aravindbuilt authored and reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    5a89663 View commit details
    Browse the repository at this point in the history

  9. chore: Version bump

    @reeshika-h
    reeshika-h committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    6808f37 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'next' into feat/DX-744-Variants-method

    @reeshika-h
    reeshika-h authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c70a787 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Merge branch 'master' into feat/DX-744-Variants-method

    @sunil-lakshman
    sunil-lakshman committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    78bbaec View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge pull request #130 from contentstack/feat/DX-744-Variants-method 

    Feat/dx 744 variants method
    @cs-raj
    cs-raj authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    7c245e6 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. feat : Live preview 2.0 implementation

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    5989d7c View commit details
    Browse the repository at this point in the history

  2. test: testcases for live preview

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    6ad0725 View commit details
    Browse the repository at this point in the history

  3. chore: updated testcases assertions

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    b66df0d View commit details
    Browse the repository at this point in the history

  4. chore: version bump

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ab30eb3 View commit details
    Browse the repository at this point in the history

  5. chore: removed print statements

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ec99677 View commit details
    Browse the repository at this point in the history

  6. chore: removed print statements

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    da9072b View commit details
    Browse the repository at this point in the history

  7. feat : variants implementation

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    7681f4d View commit details
    Browse the repository at this point in the history

  8. Chore : indentation and dummy ids added

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    733be8f View commit details
    Browse the repository at this point in the history

  9. Chore : Indentation done

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    517ba43 View commit details
    Browse the repository at this point in the history

  10. feat: added where method in AssetLibrary class

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    7f7dea4 View commit details
    Browse the repository at this point in the history

  11. change: removed unused libraries

    @reeshika-h
    reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ee38778 View commit details
    Browse the repository at this point in the history

  12. codeql-analysis.yml

    @aravindbuilt @reeshika-h
    aravindbuilt authored and reeshika-h committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    12ea59a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'next' into merge-next-into-master 

    Merge branch 'next' into 'merge-next-into-master'

Resolved conflicts and completed back-merge of the 'next' branch into 'merge-next-into-master'.
    @reeshika-h
    reeshika-h committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    b3d9d34 View commit details
    Browse the repository at this point in the history