Commits · eaefb5c669bce925062c6fa65bbf96250e0984fa · ops / jumpserver

09 Jul, 2018 2 commits
- Revert "资产授权页面增加分页" · eaefb5c6
  ycfuck authored Jul 09, 2018
```
This reverts commit 0ddb9476.
```
  eaefb5c6
- 资产授权页面增加分页 · 0ddb9476
  林峰任1049851 authored Jul 09, 2018
```
资产授权页面增加分页
```
  0ddb9476
11 Jun, 2018 2 commits
- Merge pull request #1417 from jumpserver/dev · e7a731fa
  老广 authored Jun 11, 2018
```
Dev
```
  e7a731fa
- [Update] 修改版本号 · 73f9f546
  ibuler authored Jun 11, 2018
  
  73f9f546
08 Jun, 2018 9 commits
- [Bugfix] 修复小错误 · dbc471c1
  ibuler authored Jun 08, 2018
  
  dbc471c1
- Merge remote-tracking branch 'github/dev' into dev · 4c8eb4a9
  ibuler authored Jun 08, 2018
  
  4c8eb4a9
- Merge pull request #1409 from jokimina/dev_for_pr2 · 9946c461
  老广 authored Jun 08, 2018
```
[Update]删除示例配置中未使用的BROKER_URL配置
```
  9946c461
- Merge pull request #1407 from jokimina/dev_for_pr · 8a5e1b82
  老广 authored Jun 08, 2018
```
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
```
  8a5e1b82
- Merge pull request #1408 from jumpserver/bugfix_user_date_expired · 06ce098e
  老广 authored Jun 08, 2018
```
[Bugfix] 修复用户失效日期截止后还可登录问题
```
  06ce098e
- [Update] 修复测试网关连接known_host问题 · 5579d3f0
  ibuler authored Jun 08, 2018
  
  5579d3f0
- [Update]删除示例配置中未使用的BROKER_URL配置 · 1ef582e9
  xiaodong authored Jun 08, 2018
  
  1ef582e9
- [Bugfix] 修复用户失效日期截止后还可登录问题 · 221fae58
  BaiJiangJie authored Jun 08, 2018
  
  221fae58
- [Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新 · f4084c80
  xiaodong authored Jun 08, 2018
  
  f4084c80
07 Jun, 2018 3 commits
- Merge pull request #1397 from jumpserver/feature_security_setting · 5464ac81
  老广 authored Jun 07, 2018
```
[Feature] 增加功能，安全设置（全局MFA设置，密码强度校验）
```
  5464ac81
- [Update] 删除多余代码 · c6a89673
  BaiJiangJie authored Jun 07, 2018
  
  c6a89673
- [Update] 重置公钥，添加成功信息(user-pubkey-update)/自动跳转下一步(first-login) · 5f2c31e4
  BaiJiangJie authored Jun 07, 2018
  
  5f2c31e4
06 Jun, 2018 12 commits
- [Update] 添加用户来源 db/ldap · 64db02c3
  BaiJiangJie authored Jun 06, 2018
  
  64db02c3
- Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev · 84284112
  BaiJiangJie authored Jun 06, 2018
  
  84284112
- [Update] 修改判断MFA是否全局启用的逻辑，放到User.otp_force_enabled中 · b026e867
  BaiJiangJie authored Jun 06, 2018
  
  b026e867
- Merge pull request #1403 from jumpserver/dev · 283b1c1d
  老广 authored Jun 06, 2018
```
[Update] 修改清理用户组脚本
```
  283b1c1d
- [Update] 修改清理用户组脚本 · c8c0479c
  ibuler authored Jun 06, 2018
  
  c8c0479c
- Merge pull request #1401 from jumpserver/dev · 2a30204c
  老广 authored Jun 06, 2018
```
Dev
```
  2a30204c
- Merge remote-tracking branch 'github/dev' into dev · 30afcecf
  ibuler authored Jun 06, 2018
  
  30afcecf
- [Update] 删除user group继承的抽象类 · 80d11bba
  ibuler authored Jun 06, 2018
  
  80d11bba
- [Bugfix] 暂时还不能删除Tree这个类 · 58e36b5f
  ibuler authored Jun 06, 2018
  
  58e36b5f
- [Bugfix] 修复权限查看引起的bug · 2c413e8d
  ibuler authored Jun 06, 2018
  
  2c413e8d
- Merge pull request #1400 from jokimina/dev_for_pr · 17de014e
  老广 authored Jun 06, 2018
```
remove useless image
```
  17de014e
- remove useless image · 6b2a38c7
  xiaodong authored Jun 04, 2018
  
  6b2a38c7
05 Jun, 2018 4 commits
- [Update] 增加密码校验规则中密码最小长度限制6位 · fcd17460
  BaiJiangJie authored Jun 05, 2018
  
  fcd17460
- [Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev · 4c443066
  BaiJiangJie authored Jun 05, 2018
  
  4c443066
- [Feature] 增加功能，安全设置（全局MFA设置，密码强度校验） · ee35ca36
  BaiJiangJie authored Jun 05, 2018
  
  ee35ca36
- Merge pull request #1395 from jumpserver/dev · 99c4875d
  老广 authored Jun 05, 2018
```
Dev
```
  99c4875d
01 Jun, 2018 4 commits
- [Update] 修改permisstion util · 482d1bb2
  ibuler authored Jun 01, 2018
  
  482d1bb2
- Merge branch 'dev' into perm_tree · e7c7c3a7
  ibuler authored Jun 01, 2018
  
  e7c7c3a7
- Merge remote-tracking branch 'github/dev' into dev · 54efc887
  ibuler authored Jun 01, 2018
  
  54efc887
- [Update] 修改一些方法 · a9d15381
  ibuler authored Jun 01, 2018
  
  a9d15381
31 May, 2018 3 commits
- [Update] 更新api和model方法 · f8ff223f
  ibuler authored May 31, 2018
  
  f8ff223f
- Merge pull request #1371 from jumpserver/fix_asset_count · a3f1622a
  老广 authored May 31, 2018
```
[Update] 修改资产树节点(数量)总显示此节点以及子孙节点下的所有资产总数
```
  a3f1622a
- Merge pull request #1377 from wojiushixiaobai/dev · 0021f2e5
  老广 authored May 31, 2018
```
[Update]更新自动升级脚本
```
  0021f2e5
30 May, 2018 1 commit
- 更新升级文档 · dbcad472
  wojiushixiaobai authored May 30, 2018
  
  dbcad472