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(form): add merge form functionality #4495

Merged
merged 24 commits into from
Sep 25, 2024
Merged

feat(form): add merge form functionality #4495

merged 24 commits into from
Sep 25, 2024

Commits on Sep 6, 2024

  1. feat: captcha example

    @Squall2017
    Squall2017 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    4b460d4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from vbenjs/main 

    同步
    @Squall2017
    Squall2017 authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    1689c27 View commit details
    Browse the repository at this point in the history

  3. fix: fix lint errors

    @Squall2017
    Squall2017 committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    d973765 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. chore: event handling and methods

    @Squall2017
    Squall2017 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    a2e56d8 View commit details
    Browse the repository at this point in the history

  2. chore: add accessibility features ARIA labels and roles

    @Squall2017
    Squall2017 committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    185c623 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into main

    @vince292007
    vince292007 authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    f6d4351 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Merge branch 'main' of github.com:vbenjs/vue-vben-admin into vbenjs-main

    @Squall2017
    Squall2017 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    04cde6a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'vbenjs-main'

    @Squall2017
    Squall2017 committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    2d44bd8 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge pull request #3 from vbenjs/main 

    同步
    @Squall2017
    Squall2017 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    18ee871 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from vbenjs/main 

    chore(deps): bump tailwindcss in the non-breaking-changes group (vbenjs#4369)
    @Squall2017
    Squall2017 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b06b57a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. refactor: refactor code structure and improve captcha demo page

    @Squall2017
    Squall2017 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    d95633a View commit details
    Browse the repository at this point in the history

  2. feat: add captcha internationalization

    @Squall2017
    Squall2017 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    c55375d View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. chore: 适配时间戳国际化展示

    @Squall2017
    Squall2017 committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    fe2080d View commit details
    Browse the repository at this point in the history

  2. fix: 1. 添加点击位置边界校验，防止点击外部导致x,y误差。2. 演示页面宽度过长添加滚动条。3. 添加hooks

    @Squall2017
    Squall2017 committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    c202641 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:vbenjs/vue-vben-admin

    @Squall2017
    Squall2017 committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    0ceabbe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into main

    @vince292007
    vince292007 authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    54e3d70 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Merge branch 'main' of github.com:vbenjs/vue-vben-admin into vbenjs-main

    @Squall2017
    Squall2017 committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    a490762 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'vbenjs-main'

    @Squall2017
    Squall2017 committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    f956412 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge branch 'vbenjs:main' into main

    @Squall2017
    Squall2017 authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    b281534 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'vbenjs:main' into main

    @Squall2017
    Squall2017 authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e5e5a10 View commit details
    Browse the repository at this point in the history

  3. feat: sync test

    @Squall2017
    Squall2017 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    14b12f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. feat: 代码合并

    @Squall2017
    Squall2017 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5c63056 View commit details
    Browse the repository at this point in the history

  2. feat: 添加合并表单功能

    @Squall2017
    Squall2017 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    344eb5f View commit details
    Browse the repository at this point in the history

  3. fix: 修复上一步不展示问题

    @Squall2017
    Squall2017 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    87eeb79 View commit details
    Browse the repository at this point in the history