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.

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

YSHOP2-1137-v2 : Rich text editor with froala #236

Merged
merged 32 commits into from
Feb 1, 2024
Merged

Commits on Jan 14, 2024

  1. Created rich text editor with froala

    Ghita Nekt authored and Ghita Nekt committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    eb0c92e View commit details
    Browse the repository at this point in the history
  2. Removed tiptap based rich text editor

    Ghita Nekt authored and Ghita Nekt committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    7c8ba24 View commit details
    Browse the repository at this point in the history
  3. Added custom types for component props

    Ghita Nekt authored and Ghita Nekt committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    364d3de View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Added configuration for custom icons

    Ghita Nekt authored and Ghita Nekt committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    56e3cbf View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into YSHOP2-1137-v2

    -m "Merged main to resolve conflicts"
    Ghita Nekt authored and Ghita Nekt committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    f326c5b View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. minor improvements

    eihabkhan1 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    7f5ddf9 View commit details
    Browse the repository at this point in the history
  2. Renamed custom class

    Ghita Nekt authored and Ghita Nekt committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    dde565f View commit details
    Browse the repository at this point in the history
  3. Setting default font

    Ghita Nekt authored and Ghita Nekt committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    f01f807 View commit details
    Browse the repository at this point in the history
  4. Remove duplicated code

    Ghita Nekt authored and Ghita Nekt committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    2d903e4 View commit details
    Browse the repository at this point in the history
  5. Changed font size

    Ghita Nekt authored and Ghita Nekt committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    ece2cdb View commit details
    Browse the repository at this point in the history
  6. Changed fullscreen exit icon

    Ghita Nekt authored and Ghita Nekt committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    59c239c View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'main' into YSHOP2-1137-v2

    -m "Merged main to update branch"
    Ghita Nekt authored and Ghita Nekt committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6a9781d View commit details
    Browse the repository at this point in the history
  2. Updated toolbar icons

    Ghita Nekt authored and Ghita Nekt committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7688793 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'main' into YSHOP2-1137-v2

    -m "Merged main to update branch"
    Ghita Nekt authored and Ghita Nekt committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3d4b06b View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Added error prop and editable toolbar

    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    e28eb23 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into YSHOP2-1137-v2

    -m "Merged main to resolve conflicts"
    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    4aeb5aa View commit details
    Browse the repository at this point in the history
  3. Removed tiptap

    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    d4f2fe8 View commit details
    Browse the repository at this point in the history
  4. Updated pnpm-lock file

    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    2991df7 View commit details
    Browse the repository at this point in the history
  5. Resolving pnpm conflict

    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    e058108 View commit details
    Browse the repository at this point in the history
  6. Updated pnpm-lock file

    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    cc434c5 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'main' into YSHOP2-1137-v2

    -m "Resolved conflicts"
    Ghita Nekt authored and Ghita Nekt committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    b156708 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. updated pnpm file

    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    61d4745 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into YSHOP2-1137-v2

    -m "resolved pnpm file conflicts"
    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    51d5414 View commit details
    Browse the repository at this point in the history
  3. minor improvments

    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    39e80db View commit details
    Browse the repository at this point in the history
  4. Merge branch 'main' into YSHOP2-1137-v2

    -m "merged main to resolve conflicts"
    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    cf4e3a5 View commit details
    Browse the repository at this point in the history
  5. Fixed app.vue

    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    ccff987 View commit details
    Browse the repository at this point in the history
  6. Added quick insert feature

    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    3509fdc View commit details
    Browse the repository at this point in the history
  7. removed tiptap

    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    2aa745f View commit details
    Browse the repository at this point in the history
  8. fixed editor width

    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    ce93f6c View commit details
    Browse the repository at this point in the history
  9. Merge branch 'main' into YSHOP2-1137-v2

    -m "Merged main to resolve conflict"
    Ghita Nekt authored and Ghita Nekt committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    f97ffaa View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Editor improvments

    Ghita Nekt authored and Ghita Nekt committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    d13c01a View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Merge branch 'main' into YSHOP2-1137-v2

    -m "Merged main branch to resolve conflicts"
    Ghita Nekt authored and Ghita Nekt committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    4a4ced4 View commit details
    Browse the repository at this point in the history