ibuler
|
01afcf701c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-07-03 13:24:07 +08:00 |
|
ibuler
|
4002289974
|
[Bugfix] 修复详情中删除时的bug
|
2018-07-03 13:23:21 +08:00 |
|
ibuler
|
ef9e03c7ed
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-07-02 12:11:45 +08:00 |
|
BaiJiangJie
|
3993797527
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-06-29 15:00:15 +08:00 |
|
BaiJiangJie
|
f1f06491d6
|
[Feature] 添加功能, 支持 telnet server.
|
2018-06-29 14:59:43 +08:00 |
|
ibuler
|
eb95a0a912
|
[Bugfix] 修改下载录像没有目录的bug
|
2018-06-27 10:34:16 +08:00 |
|
ibuler
|
0a2ff83ca1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-06-26 22:14:21 +08:00 |
|
ibuler
|
7276bd0b2a
|
[Update] 更新获取session log的方法，以后统一到media/replay中
|
2018-06-26 22:13:39 +08:00 |
|
老广
|
86404db6c7
|
Merge pull request #1414 from leostudio/dev
[fixed #1404]新增Redis DB配置
|
2018-06-13 21:51:53 -05:00 |
|
BaiJiangJie
|
2e6d238c76
|
[Bugfix] 修复系统用户选择手动登录，ssh命令行连接获取不到login_mode字段值
|
2018-06-11 19:09:24 +08:00 |
|
BaiJiangJie
|
f5a4370b80
|
[Update] 系统用户选择手动登录，取消自动推送
|
2018-06-11 17:56:20 +08:00 |
|
BaiJiangJie
|
db2273ef27
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-06-11 16:28:10 +08:00 |
|
BaiJiangJie
|
dd07fa678f
|
[Update] 添加功能，系统用户选择登录模式(自动/手动登录)
|
2018-06-11 16:27:40 +08:00 |
|
ibuler
|
73f9f54620
|
[Update] 修改版本号
|
2018-06-11 11:23:32 +08:00 |
|
梁志艳
|
a2f23e9681
|
新增Redis DB配置
|
2018-06-09 00:19:57 +08:00 |
|
ibuler
|
dbc471c195
|
[Bugfix] 修复小错误
|
2018-06-08 18:40:31 +08:00 |
|
ibuler
|
4c8eb4a94b
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-06-08 18:34:03 +08:00 |
|
老广
|
8a5e1b8223
|
Merge pull request #1407 from jokimina/dev_for_pr
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
|
2018-06-08 05:31:05 -05:00 |
|
ibuler
|
5579d3f0de
|
[Update] 修复测试网关连接known_host问题
|
2018-06-08 18:28:15 +08:00 |
|
BaiJiangJie
|
221fae5875
|
[Bugfix] 修复用户失效日期截止后还可登录问题
|
2018-06-08 16:34:15 +08:00 |
|
xiaodong
|
f4084c800a
|
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
|
2018-06-08 16:20:28 +08:00 |
|
BaiJiangJie
|
c6a8967376
|
[Update] 删除多余代码
|
2018-06-07 12:52:40 +08:00 |
|
BaiJiangJie
|
5f2c31e42c
|
[Update] 重置公钥，添加成功信息(user-pubkey-update)/自动跳转下一步(first-login)
|
2018-06-07 12:29:55 +08:00 |
|
BaiJiangJie
|
64db02c3f8
|
[Update] 添加用户来源 db/ldap
|
2018-06-06 16:59:32 +08:00 |
|
BaiJiangJie
|
842841128f
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-06-06 15:35:40 +08:00 |
|
BaiJiangJie
|
b026e86741
|
[Update] 修改判断MFA是否全局启用的逻辑，放到User.otp_force_enabled中
|
2018-06-06 15:35:26 +08:00 |
|
ibuler
|
30afcecf59
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-06-06 14:43:11 +08:00 |
|
ibuler
|
80d11bbaab
|
[Update] 删除user group继承的抽象类
|
2018-06-06 14:42:06 +08:00 |
|
ibuler
|
58e36b5f63
|
[Bugfix] 暂时还不能删除Tree这个类
|
2018-06-06 11:13:13 +08:00 |
|
ibuler
|
2c413e8d51
|
[Bugfix] 修复权限查看引起的bug
|
2018-06-06 10:49:16 +08:00 |
|
xiaodong
|
6b2a38c78d
|
remove useless image
|
2018-06-06 08:17:45 +08:00 |
|
BaiJiangJie
|
fcd17460d7
|
[Update] 增加密码校验规则中密码最小长度限制6位
|
2018-06-05 17:56:58 +08:00 |
|
BaiJiangJie
|
4c4430661b
|
[Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev
|
2018-06-05 17:31:55 +08:00 |
|
BaiJiangJie
|
ee35ca3643
|
[Feature] 增加功能，安全设置（全局MFA设置，密码强度校验）
|
2018-06-05 17:26:31 +08:00 |
|
ibuler
|
482d1bb27f
|
[Update] 修改permisstion util
|
2018-06-01 16:22:52 +08:00 |
|
ibuler
|
e7c7c3a7a8
|
Merge branch 'dev' into perm_tree
|
2018-06-01 15:41:50 +08:00 |
|
ibuler
|
54efc88799
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-06-01 15:39:43 +08:00 |
|
ibuler
|
a9d1538135
|
[Update] 修改一些方法
|
2018-06-01 15:34:08 +08:00 |
|
ibuler
|
f8ff223f90
|
[Update] 更新api和model方法
|
2018-05-31 19:47:57 +08:00 |
|
BaiJiangJie
|
526943a041
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-29 19:26:19 +08:00 |
|
BaiJiangJie
|
e9d0104a69
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev
|
2018-05-29 19:20:03 +08:00 |
|
BaiJiangJie
|
7c694c6885
|
[Update] 合并Node的parent.setter方法，修改node_fake的parent逻辑
|
2018-05-29 19:19:35 +08:00 |
|
ibuler
|
69e5ab438a
|
[Bugfix] 解决发送邮件重启的问题
|
2018-05-29 18:58:56 +08:00 |
|
ibuler
|
757a31a52f
|
[Update] 优化asset api, 获取时增加prefetch
|
2018-05-29 13:19:58 +08:00 |
|
BaiJiangJie
|
5b53cfb4dd
|
[Update] 修改资产树节点(数量)总显示此节点下的资产总数
|
2018-05-29 11:50:09 +08:00 |
|
ibuler
|
b0710c42b0
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-05-29 11:27:56 +08:00 |
|
BaiJiangJie
|
3a2973023c
|
[Update] 修改资产树和资产列表数量显示(游离资产)
|
2018-05-29 11:17:09 +08:00 |
|
ibuler
|
47397d2308
|
[Bugfix] 修复网关测试连接需要ssh信任key的问题
|
2018-05-28 16:44:00 +08:00 |
|
ibuler
|
7b57d24dc9
|
[Update] 优化代码
|
2018-05-28 15:00:06 +08:00 |
|
ibuler
|
ffabef0040
|
Merge branch 'large' into dev
|
2018-05-28 13:20:58 +08:00 |