BaiJiangJie
|
637fc91413
|
[Update] 密码过期邮件发送(密码未过期用户&有效用户)
|
5 years ago |
BaiJiangJie
|
b5aa69db61
|
Merge pull request #3045 from jumpserver/dev_bai
[Update] 修改翻译(Cloud)
|
5 years ago |
BaiJiangJie
|
89a98be6ce
|
[Update] 修改翻译(Cloud)
|
5 years ago |
老广
|
c6ec00e84d
|
[Update] 修改collect static file机制 (#3044)
|
5 years ago |
AnJia
|
99ce688a70
|
added Vagrantfile to support windows dev (#3036)
|
5 years ago |
BaiJiangJie
|
3cdabaf883
|
[Update] 系统用户资产管理页面获取相关的所有资产 (#3038)
* [Update] 系统用户资产管理页面获取相关的所有资产
* [Update] 系统用户资产管理页面获取相关的所有资产2
|
5 years ago |
BaiJiangJie
|
be59bff3d0
|
Merge pull request #3035 from jumpserver/dev
Dev
|
5 years ago |
BaiJiangJie
|
28f0302e4d
|
Merge pull request #3034 from jumpserver/dev_bai
[Update] 是否允许用户更改/使用密钥登录,根据settings配置进行控制
|
5 years ago |
BaiJiangJie
|
947f16e371
|
[Update] 是否允许用户更改/使用密钥登录,根据settings配置进行控制
|
5 years ago |
BaiJiangJie
|
7e8f734301
|
Merge pull request #3033 from jumpserver/dev
Dev
|
5 years ago |
BaiJiangJie
|
69841a4198
|
[Feature] 资产授权规则页面添加刷新授权缓存按钮 (#3032)
* [Feature] 资产授权规则页面添加刷新授权缓存按钮
* [Feature] 添加注释
|
5 years ago |
BaiJiangJie
|
4f7daa96a7
|
Merge pull request #3026 from jumpserver/dev_bai
[Update] 授权资产变动过期所有缓存(cache_key和cache_meta_key)
|
5 years ago |
BaiJiangJie
|
31c220605e
|
[Update] 授权资产变动过期所有缓存(cache_key和cache_meta_key)
|
5 years ago |
BaiJiangJie
|
2f439fd417
|
Merge pull request #3024 from jumpserver/dev_bai
[Bugfix] 解决用户登录日志记录错误的问题(coco端登录记录类型为Web)
|
5 years ago |
BaiJiangJie
|
f4c835d47a
|
[Bugfix] 解决用户登录日志记录错误的问题(coco端登录记录类型为Web)
|
5 years ago |
BaiJiangJie
|
c929c1a87e
|
[Bugfix] 解决下载导入模版时KeyError的问题(数据为空时) (#3017)
* [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时)
* [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时)2
* [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时)3
* [Update] 解决LDAP用户禁用后,终端还可以登录成功一次的问题
* [Update] 解决LDAP用户禁用后,终端还可以登录成功一次的问题2
* [Update] LDAP AD Server可以通过UserAccountControl映射is_active字段
* [Update] 限制只有local用户可以更新ssh key
* [Update] 限制只有local用户可以更新ssh key 2
|
5 years ago |
老广
|
b7915ccdeb
|
Merge pull request #3015 from jumpserver/dev
Bugfix (#3014)
|
5 years ago |
老广
|
421e98696c
|
Bugfix (#3014)
* [Bugfix] 修复英文时间时期的bug
* [bugfix] 修复session时间日期的问题
* [Bugfix] 修改时间日志格式化错误
* [Update] 修改函数名称
* [Update] 修改函数顺序
* [Bugfix] 修复节点刷新菜单一直append的bug
|
5 years ago |
老广
|
00e1bf6cff
|
Merge pull request #3013 from jumpserver/dev
Dev
|
5 years ago |
老广
|
9454854f6c
|
Merge pull request #2684 from yubinhong/master
add gcc libc-dev linux-headers make autoconf
|
5 years ago |
BaiJiangJie
|
74ae8636a8
|
Merge pull request #3011 from jumpserver/dev_bai
[Bugfix] 解决邮件设置不成功的问题(提交前点击测试按钮)
|
5 years ago |
BaiJiangJie
|
d93305f6a4
|
[Bugfix] 解决邮件设置不成功的问题(提交前点击测试按钮)
|
5 years ago |
老广
|
332d75b62a
|
Merge pull request #3009 from jumpserver/dev
Bugfix (#3007)
|
5 years ago |
老广
|
5db704f793
|
Bugfix (#3007)
* [Bugfix] 修复英文时间时期的bug
* [bugfix] 修复session时间日期的问题
* [Bugfix] 修改时间日志格式化错误
* [Update] 修改函数名称
* [Update] 修改函数顺序
* [Update] 注释部分迁移文件内容
|
5 years ago |
老广
|
37be53f334
|
Merge pull request #3004 from jumpserver/dev
修改显示节点下的所有资产
|
5 years ago |
老广
|
5f59c729b7
|
Perm for assets (#3003)
* [Update] 授权显示节点下所有的资产
* [Update] 修改返回资产的comment
* [Update] 修改节点返回字段
|
5 years ago |
老广
|
a8af4e8804
|
Perm for assets (#3002)
* [Update] 授权显示节点下所有的资产
* [Update] 修改返回资产的comment
|
5 years ago |
老广
|
8f5e91bc34
|
[Update] 授权显示节点下所有的资产 (#3001)
|
5 years ago |
BaiJiangJie
|
277bbc0798
|
Merge pull request #2996 from jumpserver/dev
Dev
|
5 years ago |
BaiJiangJie
|
d97654b851
|
Merge pull request #2995 from jumpserver/bugfix
Bugfix
|
5 years ago |
BaiJiangJie
|
7ec82cbc60
|
[Update] 修改列表日期2
|
5 years ago |
BaiJiangJie
|
63c2343d2c
|
[Update] 修改列表日期
|
5 years ago |
ibuler
|
d93fe11373
|
[Bugfix] 修复date format错误
|
5 years ago |
BaiJiangJie
|
fedfbba30c
|
Merge pull request #2991 from jumpserver/dev
Dev
|
5 years ago |
ibuler
|
49ccba85a2
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
5 years ago |
ibuler
|
9903adf71b
|
[Update] 修改cache policy 开关
|
5 years ago |
BaiJiangJie
|
48cfc4d4ce
|
Merge pull request #2990 from jumpserver/dev
Dev
|
5 years ago |
BaiJiangJie
|
1f5cc1eef1
|
Merge pull request #2989 from jumpserver/dev_bai
[Update] 解决授权资产页面资产重复的问题
|
5 years ago |
BaiJiangJie
|
ce1bb66f23
|
[Update] 解决授权资产页面资产重复的问题
|
5 years ago |
BaiJiangJie
|
6f9528d78d
|
Merge pull request #2987 from jumpserver/dev
Dev
|
5 years ago |
BaiJiangJie
|
fc01b952b3
|
Merge pull request #2986 from jumpserver/dev_trans
[Update] 修改翻译
|
5 years ago |
BaiJiangJie
|
51f4c1cde0
|
[Update] 修改翻译
|
5 years ago |
ibuler
|
8bb82d168b
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
5 years ago |
ibuler
|
1ef16d55ef
|
[Update] 优化详情页获取nodes
|
5 years ago |
BaiJiangJie
|
a242bdd3b1
|
Merge pull request #2983 from jumpserver/dev
Dev
|
5 years ago |
BaiJiangJie
|
97bc3d5e7c
|
Merge pull request #2984 from jumpserver/gateway_conn_bug
[Bugfix] 修复网关测试连接失败未捕获导致报500的bug
|
5 years ago |
jym503558564
|
dbb27a7771
|
[Bugfix] 修复网关测试连接失败未捕获导致报500的bug
|
5 years ago |
八千流
|
ea11aa4abb
|
[Bugfix] 修改排序,去掉标签 (#2982)
* [Update] 修改排序,去掉标签
* [Bugfix] 修改排序
* [Bugfix] 修改小问题
* [Bugfix] 修改小问题
|
5 years ago |
ibuler
|
1af40b6ca0
|
[Update] 支持etag
|
5 years ago |
老广
|
1b220326bf
|
Merge pull request #2981 from jumpserver/dev
Bugfix (#2980)
|
5 years ago |