Commit Graph

233 Commits (7a6ed91f629c04c0bbed5bf3fbf0761abbd009d6)

Author SHA1 Message Date
xinwen 70a8db895d fix(migrations): 生成一下遗漏的 migrations
4 years ago
ibuler 7f53a80855 fix: 修改textfield 不再限制长度
4 years ago
xinwen f8bbca38e3 fix(orgs): 修复组织添加用户bug
4 years ago
ibuler 52f1dcf662 fix(users): 修复邀请用户的bug
4 years ago
xinwen 2432b9a553 fix(orgs): 组织添加成员bug
4 years ago
ibuler 66e45f1c80 perf(orgs): 优化组织用户添加
4 years ago
xinwen 5dd1dfc59e fix(orgs): 用户修改组织角色报错
4 years ago
fit2bot 2209a2c8d2
feat(orgs): 修改OrgMemberRelationAPI,支持通过查询参数控制是否忽略已存在的数据 (#4720)
4 years ago
xinwen 28da819735 perf(assets): 优化节点树
4 years ago
xinwen 09bfac34f1 fix(orgs): 修复 org-memeber-relation POST 报错
4 years ago
xinwen a28334b6d8 fix(orgs): 完善组织与用户变化时的信号
4 years ago
xinwen 15992ad5b3 fix(tickets): 修复工单comment
4 years ago
fit2bot 9cb5985947
fix(orgs): 创建组织用户不必填 (#4515)
4 years ago
xinwen fcd8356e90 fix(users): 组织管理员,移除组织成员报错500 #231
4 years ago
xinwen 64d093e677 fix(users): 用户接口添加`org_roles`字段
4 years ago
xinwen ffde306a04 fix(assets): 修复批量删除资产失败问题
4 years ago
xinwen a14f121fad fix(orgs): 组织成员关系接口添加`role_display`字段
4 years ago
xinwen c3c5801d2e refactor(orgs): 重构组织与用户关系接口
4 years ago
xinwen f8e248f0af feat(ticket): 调整申请资产工单
4 years ago
xinwen b331730422 fix(users): 替换旧有角色常量
4 years ago
xinwen de3865fa1d refactor(orgs): 重构组织表结构
4 years ago
Bai 0f70f5eccf fix(orgs): 删除组织失败时返回对应错误信息
4 years ago
Bai caf312c5be feat(Cloud): 组织管理ViewSet添加搜索字段
4 years ago
ibuler 7e1a379e47 feat: 修改org返回的数据结构
5 years ago
ibuler 4d4a107101 feat: 修改oid获取顺序,添加从cookie中获取
5 years ago
ibuler 9c6f118dbd feat: 添加批量命令的relation
5 years ago
ibuler 8efc0331de feat: 删掉所有view, templates, forms
5 years ago
xinwen 7dde15cb04
[Feature] 权限管理-> 远程应用 添加 api (#4040)
5 years ago
xinwen 492b1c4311 [Update] org retrieve api
5 years ago
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id`
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
5 years ago
xinwen ac902501ec [Add] ftp-logs api
5 years ago
Bai aec78dc3c7 [Update] 添加组织详情->组织用户tab页,解决组织详情页面加载超时问题
5 years ago
ibuler b6f5b335bd Merge branch 'api_perf' into lina
5 years ago
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler efb5d4135a [Update] 优化api字段显示
5 years ago
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题2 (#3919)
5 years ago
ibuler 0d2b4d7ca3 [Update] 添加ids filter
5 years ago
ibuler dffd05cd20 [Update] 修改组织获取优先级
5 years ago
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
老广 98bb6c63f5
[Update] 修改切换组织后页面跳转 (#3715)
5 years ago
BaiJiangJie bf922459ff
[Update] 修改创建按钮样式;Open 数据库应用;取消资产/系统用户/组织等名称对于特殊字符的限制; (#3594)
5 years ago
老广 4944ac8e75 Config (#3502)
5 years ago
BaiJiangJie 330c078597 [Update] Merge dev
5 years ago
jym503558564 cc9554cdb4 [Update] 修改用户详情页中添加用户组标签的显示条件是:当前组织的普通用户或组管理员
5 years ago
ibuler bf40aa8df0 [Update] 修改user list api
5 years ago
ibuler d544f7f936 Merge branch 'dev' into 1.5.5
5 years ago
BaiJiangJie a57df0e05f [Update] 修改主机名/系统用户名称/组织名称的特殊字符限制(修改为特殊字符黑名单)[/ \]
5 years ago
ibuler 673ebbec1b [Update] Merge with dev
5 years ago
BaiJiangJie f3dc9b886b Asset favor (#3352)
5 years ago
ibuler 237d51cff9 [Update] 拆分filter org
5 years ago
BaiJiangJie 70713af95a [Update] 限制组织名称中使用的特殊字符
5 years ago
ibuler 9e12f3cd17 [Update] 表单中用户使用异步
5 years ago
老广 f87db2f4fc
Bugfix (#3284)
5 years ago
BaiJiangJie df429d56d5
V52 (#3158) (#3261)
5 years ago
ibuler b7021b5ecb [Update] 支持收集资产上的用户
5 years ago
ibuler 5464c884db [Update] 修改swagger
5 years ago
BaiJiangJie 354c3c563b [Update] 修改perms迁移文件之间的依赖关系,添加迁移文件
5 years ago
八千流 a2376d3afd 超级管理员可创建超级审计员并可设置审计员为组织审计员 (#3141)
5 years ago
ibuler 8ddda8e5af [Update] 修复页面bug和popover的问题
5 years ago
BaiJiangJie 1eb2038ec4 [Bugfix] 解决批量创建系统用户等资源时,initial_data.get() 失败的问题
5 years ago
老广 8cd8f41cb0
Dev beta (#3167)
5 years ago
老广 1fe18e8073
Bugfix (#3153)
5 years ago
老广 164f48e131
Dev beta (#3048)
5 years ago
BaiJiangJie 48826a9ad9
[Update] 优化切换组织时重定向页面逻辑 (#3133)
5 years ago
ibuler 12b2f2f499 [Update] 刷新session有效期
5 years ago
ibuler 447c3f3146 [Update] 修改一个bug
5 years ago
ibuler 1472f0437f [update] 修改一些性能问题
5 years ago
ibuler 2d07eeb16b [Update] 修改去掉一些print
5 years ago
ibuler 1448d23ca6 [Update] 准备优化 asset user
5 years ago
ibuler c3a54a8927 [Update] 修改session
5 years ago
ibuler b9f82fd0ac [Update] 优化命令记录列表
5 years ago
ibuler 8e9b3f134b [Update] 修改permission actions
6 years ago
ibuler 1a0ff422fe [Update] 优化树结构
6 years ago
ibuler 6d96b5dbaf [Update] 修改org mixin
6 years ago
ibuler e8ebc94191 [Update] 修改assets users api
6 years ago
ibuler 0f8d4f5b32 [Update] 统一可连接性,添加sql debug
6 years ago
BaiJiangJie ed8ae300ae
[Update] 修改org.middleware自动切换组织的bug (#2829)
6 years ago
ibuler 2cd092af42 [Update] 修改资产创建格式
6 years ago
老广 10616b8d9e
[Update] serializer mixin继承 (#2810)
6 years ago
八千流 8adaf629b4 [Update] 增加审计员权限控制 (#2792)
6 years ago
老广 ddafd7ba26 Dev ansible windows 2 (#2783)
6 years ago
BaiJiangJie ec60697912 [Update] 修改细节
6 years ago
BaiJiangJie d6a8c04d45 [Update] 修改获取资产信息时返回org_id字段值
6 years ago
八千流 22f362aab3 Dev csv (#2640)
6 years ago
BaiJiangJie caa5060ecd [Update] 控制组织管理员不允许更新、删除超级用户;修复ViewSet API批量更新的bug (#2629)
6 years ago
ibuler c82044f6bc [Update] 修改一些bug
6 years ago
老广 311538dcf8
Bugfix (#2513)
6 years ago
老广 b45b33380c
Monitor (#2485)
6 years ago
ibuler 34040fcd59 [Update] 移动model
6 years ago
老广 176052e8e9
[Update] 权限页面增加过滤规则 (#2349)
6 years ago
老广 d026b31c9f
Bugfix (#2346)
6 years ago
老广 b3079a4a9b
[Update] Add index (#2208)
6 years ago
老广 9499a16a8b
[Update] 默认中可以看到所有用户 (#2102)
6 years ago
ibuler d50ad66b78 [Update] 维护统一的migrations
6 years ago
BaiJiangJie 1e5387ef47 [Update] 更新组织管理api (#1986)
6 years ago
ibuler 2c18a27e3a [Update] 修改节点创建规则
6 years ago
ibuler 44bf01d4ed [Update] 支持命令过滤
6 years ago
ibuler 5457118fb6 [Update] 修改css
6 years ago
ibuler 0eda8865e6 [Bugfix] 修复首页显示问题
6 years ago
老广 fe45d839fb
Dev2 (#1766)
6 years ago
ibuler 7eeca511f1 [Bugfix] 修复打印日志的bug
6 years ago
ibuler 670c8a6d0b [Bugfix] 修复唯一认证
6 years ago
ibuler 2ac5786ba1 [Bugfix] 修复Hostname可能不唯一引起的任务执行失败
6 years ago
ibuler 5b93a1a0a5 [Bugfix] 修复单页面bug
6 years ago
ibuler 1877511acf [Update] 更改组织同事更改节点名称
6 years ago
ibuler 1c5ce61ed0 [Update] 修改Org刷新cache
6 years ago
ibuler 75e67410cf [Bugfix] 修复批量更新资产和用户的bug
6 years ago
ibuler c9d137bc20 [Update] 修改Mixin,允许org_id不填写
6 years ago
ibuler ccc292d9a9 [Update] 去掉debug信息
6 years ago
ibuler 7c814080b2 [Update] 优化一些api
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 8afd5ef90a [Merge] 修改一下bug
6 years ago
ibuler b29a541aa6 [Update] Add init
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
ibuler 2abb9efe96 [Update] Org功能修改
6 years ago
老广 36f1165d1b
Tmp org (#1583)
6 years ago
BaiJiangJie e7c530d8e6 [Update] 添加授权规则org (#1580)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
老广 2208d6d51e
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571)
6 years ago
ibuler e3aa18ff2d [Update] 修改get_current_org 为 proxy对象 current_org
6 years ago
ibuler b5f6f80ae6 [Update] 修改Node
6 years ago
ibuler bbe4080008 [Update] 删掉Premiddleware
6 years ago
ibuler b6523da603 [Update] 修改外键为org_id
6 years ago
ibuler c24f1a0517 [Update] 修改约束
6 years ago
ibuler fd5f562cbf [Update] stash it
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
ibuler 3e17e94245 [Update] 修改资产
6 years ago
ibuler 5648dcd7e7 [Update] 修改用户view
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
ibuler d6ec92d82d [Update] 修改url
6 years ago
ibuler ad3214641d [Update] 添加org
6 years ago