Commit Graph

3890 Commits (9f9f22548fde6fa2bd3cc3f699c4ddea20e80c35)
 

Author SHA1 Message Date
BaiJiangJie 9f9f22548f [Update] Merge branch master to local dev
6 years ago
八千流 69b91df96b [Update]优化资产设置节点的问题 (#2786)
6 years ago
ibuler 3e86c07411 [Update] 修改授权节点显示
6 years ago
BaiJiangJie eafef9fc7f
Dev (#2785)
6 years ago
老广 44d33f70e4 [Update] 修改授权树显示策略 (#2784)
6 years ago
BaiJiangJie 0574b43971 [Update] 优化前端高度显示css (#2749)
6 years ago
八千流 03d9570895 [Update] 优化用户API,创建用户添加组织关系 (#2776)
6 years ago
八千流 c300f0b549 [Update]优化用户页面的资产标签过滤功能 (#2781)
6 years ago
BaiJiangJie e5185ebd57
Merge pull request #2770 from jumpserver/dev
6 years ago
ibuler 1ba9351957 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 505b801423 [Update] 当授权规则发生改变时刷新所有缓存
6 years ago
BaiJiangJie 35a0b42bea
Merge pull request #2769 from jumpserver/dev
6 years ago
BaiJiangJie 4f289963d1 [Update] 修改录像回放判断逻辑 (#2768)
6 years ago
BaiJiangJie 1631c32868
Merge pull request #2767 from jumpserver/dev
6 years ago
ibuler 9721b805f3 [Update] 解决csv导入导出的问题
6 years ago
BaiJiangJie d2b1b19404
Merge pull request #2765 from jumpserver/dev
6 years ago
ibuler 49632241b6 [Update] 导入解析csv coding
6 years ago
ibuler b4f23f9731 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 1cdcc66dba [Update] 修改excel打开乱码
6 years ago
zbhlove100 0a1a260a22
Update README.md
6 years ago
BaiJiangJie 0e377cd0e9
Merge pull request #2762 from jumpserver/dev
6 years ago
BaiJiangJie 3f3cc6359a
[Bugfix] 修复RemoteApp用户列表显示Bug (#2761)
6 years ago
BaiJiangJie eb0a6f00b5
Merge pull request #2758 from jumpserver/dev
6 years ago
BaiJiangJie a87610a8d8
Merge pull request #2757 from jumpserver/dev_bai
6 years ago
BaiJiangJie e3630a9961 [Update] 修改依赖版本号
6 years ago
BaiJiangJie 6ba78e2cf3
Merge pull request #2756 from jumpserver/dev
6 years ago
BaiJiangJie 63a06b5dd8
Merge pull request #2755 from jumpserver/dev_bai
6 years ago
BaiJiangJie ec60697912 [Update] 修改细节
6 years ago
BaiJiangJie d6a8c04d45 [Update] 修改获取资产信息时返回org_id字段值
6 years ago
BaiJiangJie d46f5858f8
Merge pull request #2737 from jumpserver/dev
6 years ago
BaiJiangJie a8491eafea
Merge pull request #2747 from jumpserver/dev_bai
6 years ago
BaiJiangJie 0d046d8356 [Update] 修改版本号
6 years ago
八千流 9c55450a9e [Bugfix] 修复资源表可以选择多页的资源数据 (#2744)
6 years ago
BaiJiangJie 00e986a64e [Update] 优化LDAP用户导入功能,可导入跨页选取的所有用户 (#2745)
6 years ago
BaiJiangJie dc4bf669b0 [Update] 修改RemoteApp迁移文件 (#2742)
6 years ago
BaiJiangJie 059a8de44a [Bufix] 修复用户更新时password_strategy字段不能为空的bug (#2741)
6 years ago
ibuler aa25b7745c Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 1097b11115 [Update] 修改ldap支持ssl
6 years ago
BaiJiangJie 9f67daeb1e [Update] 优化AssetPermissionUtil动态设置系统用户actions属性逻辑 (#2739)
6 years ago
ibuler 2065692199 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 33e342f03f [Update] 修改菜单
6 years ago
八千流 7a6027f35a [Update] csv翻译 (#2736)
6 years ago
BaiJiangJie e46a6f1d12 [Update] 添加应用下载器地址;添加系统设置中字段的最大、最小值限制 (#2735)
6 years ago
ibuler 0f3996369b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 0847539e02 [Update] 修改导出的csv名称
6 years ago
八千流 f576f2eda2 [Bugfix]修复解析器顺序bug,csv解析器需在file解析器前 (#2734)
6 years ago
BaiJiangJie 21ac3eaf8b [Update] 用户创建添加密码设置策略 (#2731)
6 years ago
ibuler b237cbb20f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 9b5b48dd1a [Update] 修改settings conf配置
6 years ago
八千流 b7eac837f7 [Update] 创建用户自定义邮件内容 (#2703)
6 years ago