xiaodong
|
f4084c800a
|
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
|
2018-06-08 16:20:28 +08:00 |
老广
|
5464ac8167
|
Merge pull request #1397 from jumpserver/feature_security_setting
[Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
|
2018-06-06 23:57:48 -05: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 |
老广
|
283b1c1d64
|
Merge pull request #1403 from jumpserver/dev
[Update] 修改清理用户组脚本
|
2018-06-06 02:25:10 -05:00 |
ibuler
|
c8c0479ce5
|
[Update] 修改清理用户组脚本
|
2018-06-06 15:18:23 +08:00 |
老广
|
2a30204c4e
|
Merge pull request #1401 from jumpserver/dev
Dev
|
2018-06-06 01:57:41 -05: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 |
老广
|
17de014ee9
|
Merge pull request #1400 from jokimina/dev_for_pr
remove useless image
|
2018-06-05 21:19:08 -05: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 |
老广
|
99c4875dd7
|
Merge pull request #1395 from jumpserver/dev
Dev
|
2018-06-04 22:06:58 -05: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 |
老广
|
a3f1622a50
|
Merge pull request #1371 from jumpserver/fix_asset_count
[Update] 修改资产树节点(数量)总显示此节点以及子孙节点下的所有资产总数
|
2018-05-31 12:31:44 +08:00 |
老广
|
0021f2e5e1
|
Merge pull request #1377 from wojiushixiaobai/dev
[Update]更新自动升级脚本
|
2018-05-31 12:29:21 +08:00 |
wojiushixiaobai
|
dbcad47214
|
更新升级文档
|
2018-05-30 11:23:54 +08:00 |
wojiushixiaobai
|
6c384b49fe
|
修改脚本
|
2018-05-30 11:19:37 +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 |
老广
|
d9d82cea5e
|
Merge pull request #1370 from jumpserver/fix_asset_count
[Update] 修改资产树和资产列表数量显示(游离资产)
|
2018-05-29 11:26:23 +08:00 |
老广
|
4f521e5a94
|
Merge pull request #1369 from gengkeye/master
录像回放API BUG: SessionReplayViewSet
|
2018-05-29 11:20:23 +08:00 |
BaiJiangJie
|
3a2973023c
|
[Update] 修改资产树和资产列表数量显示(游离资产)
|
2018-05-29 11:17:09 +08:00 |
oldseven
|
4f28f85410
|
#1368
|
2018-05-29 09:51:55 +08:00 |
oldseven
|
a1905ecfdb
|
Merge branch 'master' of https://github.com/jumpserver/jumpserver
Conflicts:
apps/terminal/api.py
|
2018-05-29 09:39:30 +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 |
老广
|
f2216274c5
|
Merge pull request #1366 from jumpserver/dev
Dev
|
2018-05-28 13:26:04 +08:00 |
ibuler
|
ffabef0040
|
Merge branch 'large' into dev
|
2018-05-28 13:20:58 +08:00 |
ibuler
|
0b4df78393
|
[Update] 修改permistion utils优化返回的属性
|
2018-05-28 13:20:26 +08:00 |
BaiJiangJie
|
2fab69ca61
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-28 11:15:48 +08:00 |
老广
|
7987056b12
|
Merge pull request #1365 from jumpserver/dev
Dev修复
|
2018-05-28 11:05:11 +08:00 |
BaiJiangJie
|
f9ab0abc37
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-28 10:58:47 +08:00 |
ibuler
|
0bc86543b5
|
[Update] 修改用户组详情显示授权资产的bug
|
2018-05-26 21:53:50 +08:00 |