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

V2.5 dev 合并到release #1066

Merged
merged 75 commits into from
Jul 25, 2022
Merged

V2.5 dev 合并到release #1066

merged 75 commits into from
Jul 25, 2022

Commits on Jun 24, 2022

  1. feat: 🎸 恢复租户列表操作

    @guancyxx
    guancyxx committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    417b573 View commit details
    Browse the repository at this point in the history

  2. feat: 🎸 租户列表页面去掉增删改操作,切换租户页面添加创建按钮

    @guancyxx
    guancyxx committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    14fde4f View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. Update README.md

    @welylongguikeji
    welylongguikeji committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    5aec59c View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Create LICENSE

    @welylongguikeji
    welylongguikeji committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    a6e2b12 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #997 from longguikeji/v2.5-dev 

    V2.5 dev 准备发版
    @notevery
    notevery committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    3194606 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #998 from longguikeji/v2.5-dev 

    ci: release action
    @notevery
    notevery committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    3ca3e75 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. ci: 2.0 自动更新 demo环境

    @notevery
    notevery committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    e05e46b View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. feat: 🎸 权限列表更新

    @jinji-hanbin
    jinji-hanbin committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    9bb9e20 View commit details
    Browse the repository at this point in the history

  2. feat: 🎸 更新内容

    @jinji-hanbin
    jinji-hanbin committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    b3b1107 View commit details
    Browse the repository at this point in the history

  3. feat: 🎸 update permission_group local_actions

    @longgui-penglei
    longgui-penglei committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    0ed650f View commit details
    Browse the repository at this point in the history

  4. feat: 🎸 更新权限列表

    @jinji-hanbin
    jinji-hanbin committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    f858e51 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1040 from longguikeji/release-2.5.1-beta 

    Release 2.5.1 beta
    @notevery
    notevery committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    8c1f002 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1041 from longguikeji/feature-402 

    Feature 402
    @hanbinloop
    hanbinloop committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    52db983 View commit details
    Browse the repository at this point in the history

  7. feat: 🎸 修改审批系统注册前端页面和路由逻辑

    @fanhe-lg
    fanhe-lg committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    6901069 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2022

  1. fix: 🐛 更改审批系统注册页面方式

    @fanhe-lg
    fanhe-lg committed Jul 16, 2022
    Configuration menu
    Copy the full SHA
    119f8f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2022

  1. feat: 🎸 更改AUTHRULE_CHECK_AUTH_DATA AUTHRULE_FIX_LOGIN_PAGE监听 

    改由authfactor基类监听
    @guancyxx
    guancyxx committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    02960e1 View commit details
    Browse the repository at this point in the history

  2. feat: 🎸 修改文档

    @guancyxx
    guancyxx committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    683e71f View commit details
    Browse the repository at this point in the history

  3. feat: 🎸 添加默认认证规则

    @guancyxx
    guancyxx committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    6f7b7d8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1042 from longguikeji/feature-491 

    认证规则修改
    @guancyxx
    guancyxx committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    4f68d6f View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2022

  1. fix: 🐛 'dict' object has no attribute 'dict' 

    ERROR: 'dict' object has no attribute 'dict'

BREAKING CHANGE: 🧨 Traceback (most recent call last):

✅ Closes:   File "/mnt/d/workspace/longgui/arkid/arkid/core/api.py", line 147, in
func
    @guancyxx
    guancyxx committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    7897961 View commit details
    Browse the repository at this point in the history

  2. feat: 🎸 恢复商店机制代码

    @guancyxx
    guancyxx committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    e9e406c View commit details
    Browse the repository at this point in the history

  3. feat: 🎸 审批系统插件逻辑修改

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    f5feb2c View commit details
    Browse the repository at this point in the history

  4. feat: 🎸 更新应用顺序

    @jinji-hanbin
    jinji-hanbin committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    542636c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1043 from longguikeji/feature-402 

    feat: 🎸 更新应用顺序
    @hanbinloop
    hanbinloop committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    4cb41e6 View commit details
    Browse the repository at this point in the history

  6. feat: 🎸 清理了无用的sqlite

    @jinji-hanbin
    jinji-hanbin committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    51f5267 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1044 from longguikeji/feature-402 

    feat: 🎸 清理了无用的sqlite
    @hanbinloop
    hanbinloop committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    c7e59a9 View commit details
    Browse the repository at this point in the history

  8. feat: 🎸 更改忽略事件

    @jinji-hanbin
    jinji-hanbin committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    3df1f8e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1045 from longguikeji/feature-402 

    feat: 🎸 更改忽略事件
    @hanbinloop
    hanbinloop committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    0cdc07a View commit details
    Browse the repository at this point in the history

  10. fix: 🐛 修改审批动作选择path方式

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    d015996 View commit details
    Browse the repository at this point in the history

  11. fix: 🐛 修复path_list接口

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    3dae958 View commit details
    Browse the repository at this point in the history

  12. feat: 🎸 更新celery

    @jinji-hanbin
    jinji-hanbin committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    f1db2e1 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1046 from longguikeji/feature-402 

    feat: 🎸 更新celery
    @hanbinloop
    hanbinloop committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    7f26182 View commit details
    Browse the repository at this point in the history

  14. fix: 🐛 审批动作列表和详情接口可以看到tenant=None的数据

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    2b39699 View commit details
    Browse the repository at this point in the history

  15. feat: 🎸 修改个人管理中的审批请求过滤条件

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    d72795e View commit details
    Browse the repository at this point in the history

  16. fix: 🐛 修复创建和更新审批动作接口

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    11b42a1 View commit details
    Browse the repository at this point in the history

  17. feat: 🎸 修复审批系统报错

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    b1539ae View commit details
    Browse the repository at this point in the history

  18. fix: 🐛 修复生命周期创建更新

    @fanhe-lg
    fanhe-lg committed Jul 18, 2022
    Configuration menu
    Copy the full SHA
    9f08efe View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Merge branch 'v2.5-dev' into feature-409

    @fanhe-lg
    fanhe-lg committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    8d24676 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1047 from longguikeji/feature-409 

    Feature 409
    @fanhe-lg
    fanhe-lg committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    adbe22c View commit details
    Browse the repository at this point in the history

  3. fix: 🐛 认证规则创建默认规则失败

    @guancyxx
    guancyxx committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    a3a1507 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1048 from longguikeji/feature-528 

    fix: 🐛 认证规则创建默认规则失败
    @guancyxx
    guancyxx committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    4b47019 View commit details
    Browse the repository at this point in the history

  5. fix: 🐛 second_auth_factor取值错误

    @guancyxx
    guancyxx committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    05966a4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1049 from longguikeji/feature-528 

    fix: 🐛 second_auth_factor取值错误
    @guancyxx
    guancyxx committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    de5f81f View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2022

  1. feat: 🎸 更新了一些测试代码优化了授权逻辑

    @jinji-hanbin
    jinji-hanbin committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    003f4de View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1050 from longguikeji/feature-402 

    feat: 🎸 更新了一些测试代码优化了授权逻辑
    @hanbinloop
    hanbinloop committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    c192644 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v2.5-dev' into feature-408

    @guancyxx
    guancyxx committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    d9ff9a3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1051 from longguikeji/feature-408 

    租户页面创建按钮
    @guancyxx
    guancyxx committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    947f1f9 View commit details
    Browse the repository at this point in the history

  5. feat: 🎸 修改切换租户时的接口处理

    @guancyxx
    guancyxx committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    f94c912 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1052 from longguikeji/feature-533 

    feat: 🎸 修改切换租户时的接口处理
    @guancyxx
    guancyxx committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    77bd872 View commit details
    Browse the repository at this point in the history

  7. feat: 🎸 发现代码逻辑错误进行修补

    @jinji-hanbin
    jinji-hanbin committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    ef4191b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1053 from longguikeji/feature-402 

    feat: 🎸 发现代码逻辑错误进行修补
    @hanbinloop
    hanbinloop committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    8486b77 View commit details
    Browse the repository at this point in the history

  9. feat: 🎸 disable oidc and oauth2 at central arkid

    @luolu-lg
    luolu-lg committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    f8a350d View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1054 from longguikeji/feature-disable-oidc-central 

    feat: 🎸 disable oidc and oauth2 at central arkid
    @luolu-lg
    luolu-lg committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    cb5d2b9 View commit details
    Browse the repository at this point in the history

  11. feat: 🎸 完成文档的改写

    @jinji-hanbin
    jinji-hanbin committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    46bb3bf View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1055 from longguikeji/feature-402 

    feat: 🎸 完成文档的改写
    @hanbinloop
    hanbinloop committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    629ceb1 View commit details
    Browse the repository at this point in the history

  13. ci: 文档优化

    @notevery
    notevery committed Jul 20, 2022
    Configuration menu
    Copy the full SHA
    0fb9b80 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. feat: 🎸 对于授权规则的实现方法做了新的定义,

    @jinji-hanbin
    jinji-hanbin committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    6fa6b63 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1057 from longguikeji/feature-402 

    feat: 🎸 对于授权规则的实现方法做了新的定义
    @hanbinloop
    hanbinloop committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    5d69e01 View commit details
    Browse the repository at this point in the history

  3. fix: 🐛 extension settings out

    @luolu-lg
    luolu-lg committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    34e44f0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1058 from longguikeji/feature-fix-ext-settings 

    fix: 🐛 extension settings out
    @luolu-lg
    luolu-lg committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    d844a35 View commit details
    Browse the repository at this point in the history

  5. feat: 🎸 在一次更新了文档

    @jinji-hanbin
    jinji-hanbin committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    fba6a23 View commit details
    Browse the repository at this point in the history

  6. feat: 🎸 授权代码进一步优化

    @jinji-hanbin
    jinji-hanbin committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    d14d6f3 View commit details
    Browse the repository at this point in the history

  7. feat: 🎸 权限处理结束

    @jinji-hanbin
    jinji-hanbin committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    4979480 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1059 from longguikeji/feature-402 

    Feature 402
    @hanbinloop
    hanbinloop committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    0a25d52 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. Merge pull request #1060 from longguikeji/feature-521 

    认证规则监听机制修改
    @guancyxx
    guancyxx committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    3fdcaf8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1061 from longguikeji/main 

    合并main上的更改
    @welylongguikeji
    welylongguikeji committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    27e0c32 View commit details
    Browse the repository at this point in the history

  3. feat: 🎸 更新django_celery_beat到最新版本

    @fanhe-lg
    fanhe-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    353497e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1062 from longguikeji/feature-542 

    feat: 🎸 更新django_celery_beat到最新版本
    @fanhe-lg
    fanhe-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    802582b View commit details
    Browse the repository at this point in the history

  5. fix: 🐛 extension config and settings

    @luolu-lg
    luolu-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    07c9f95 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1063 from longguikeji/feature-fix-settings 

    fix: 🐛 extension config and settings
    @luolu-lg
    luolu-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    0594625 View commit details
    Browse the repository at this point in the history

  7. fix toggle extension state

    @luolu-lg
    luolu-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    0841564 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1064 from longguikeji/feature-fix-extension-activate 

    fix toggle extension state
    @luolu-lg
    luolu-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    fc15498 View commit details
    Browse the repository at this point in the history

  9. fix: 🐛 修复pipenv lock -r > requirements.txt 导出文件注释问题

    @fanhe-lg
    fanhe-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    87337a0 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1065 from longguikeji/feature-542 

    fix: 🐛 修复pipenv lock -r > requirements.txt 导出文件注释问题
    @fanhe-lg
    fanhe-lg committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    63934ea View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2022

  1. Update Dockerfile

    @notevery
    notevery committed Jul 24, 2022
    Configuration menu
    Copy the full SHA
    02b4dde View commit details
    Browse the repository at this point in the history