Commits · 1.5.0 · ops / jumpserver

03 Jun, 2019 5 commits
- Merge pull request #2770 from jumpserver/dev · e5185ebd
  BaiJiangJie authored Jun 03, 2019
```
Dev
```
  e5185ebd
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · 1ba93519
  ibuler authored Jun 03, 2019
  
  1ba93519
- [Update] 当授权规则发生改变时刷新所有缓存 · 505b8014
  ibuler authored Jun 03, 2019
  
  505b8014
- Merge pull request #2769 from jumpserver/dev · 35a0b42b
  BaiJiangJie authored Jun 03, 2019
```
[Update] 修改录像回放判断逻辑 (#2768)
```
  35a0b42b
- [Update] 修改录像回放判断逻辑 (#2768) · 4f289963
  BaiJiangJie authored Jun 03, 2019
  
  4f289963
31 May, 2019 9 commits
- Merge pull request #2767 from jumpserver/dev · 1631c328
  BaiJiangJie authored May 31, 2019
```
[Update] 解决csv导入导出的问题
```
  1631c328
- [Update] 解决csv导入导出的问题 · 9721b805
  ibuler authored May 31, 2019
  
  9721b805
- Merge pull request #2765 from jumpserver/dev · d2b1b194
  BaiJiangJie authored May 31, 2019
```
Dev
```
  d2b1b194
- [Update] 导入解析csv coding · 49632241
  ibuler authored May 31, 2019
  
  49632241
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · b4f23f97
  ibuler authored May 31, 2019
  
  b4f23f97
- [Update] 修改excel打开乱码 · 1cdcc66d
  ibuler authored May 31, 2019
  
  1cdcc66d
- Update README.md · 0a1a260a
  zbhlove100 authored May 31, 2019
  
  0a1a260a
- Merge pull request #2762 from jumpserver/dev · 0e377cd0
  BaiJiangJie authored May 31, 2019
```
[Bugfix] 修复RemoteApp用户列表显示Bug (#2761)
```
  0e377cd0
- [Bugfix] 修复RemoteApp用户列表显示Bug (#2761) · 3f3cc635
  BaiJiangJie authored May 31, 2019
  
  3f3cc635
30 May, 2019 7 commits
- Merge pull request #2758 from jumpserver/dev · eb0a6f00
  BaiJiangJie authored May 30, 2019
```
Dev
```
  eb0a6f00
- Merge pull request #2757 from jumpserver/dev_bai · a87610a8
  BaiJiangJie authored May 30, 2019
```
[Update] 修改依赖版本号
```
  a87610a8
- [Update] 修改依赖版本号 · e3630a99
  BaiJiangJie authored May 30, 2019
  
  e3630a99
- Merge pull request #2756 from jumpserver/dev · 6ba78e2c
  BaiJiangJie authored May 30, 2019
```
Dev
```
  6ba78e2c
- Merge pull request #2755 from jumpserver/dev_bai · 63a06b5d
  BaiJiangJie authored May 30, 2019
```
[Update] 修改获取资产信息时返回org_id字段值
```
  63a06b5d
- [Update] 修改细节 · ec606979
  BaiJiangJie authored May 30, 2019
  
  ec606979
- [Update] 修改获取资产信息时返回org_id字段值 · d6a8c04d
  BaiJiangJie authored May 30, 2019
  
  d6a8c04d
29 May, 2019 5 commits
- Merge pull request #2737 from jumpserver/dev · d46f5858
  BaiJiangJie authored May 29, 2019
```
Dev
```
  d46f5858
- Merge pull request #2747 from jumpserver/dev_bai · a8491eaf
  BaiJiangJie authored May 29, 2019
```
[Update] 修改版本号
```
  a8491eaf
- [Update] 修改版本号 · 0d046d83
  BaiJiangJie authored May 29, 2019
  
  0d046d83
- [Bugfix] 修复资源表可以选择多页的资源数据 (#2744) · 9c55450a
  八千流 authored May 29, 2019
```
* [Bugfix] 修复资源表可以选择多页的资源数据

* [Bugfix]修改小问题
```
  9c55450a
- [Update] 优化LDAP用户导入功能，可导入跨页选取的所有用户 (#2745) · 00e986a6
  BaiJiangJie authored May 29, 2019
  
  00e986a6
28 May, 2019 4 commits
- [Update] 修改RemoteApp迁移文件 (#2742) · dc4bf669
  BaiJiangJie authored May 28, 2019
  
  dc4bf669
- [Bufix] 修复用户更新时password_strategy字段不能为空的bug (#2741) · 059a8de4
  BaiJiangJie authored May 28, 2019
  
  059a8de4
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · aa25b774
  ibuler authored May 28, 2019
  
  aa25b774
- [Update] 修改ldap支持ssl · 1097b111
  ibuler authored May 28, 2019
  
  1097b111
27 May, 2019 8 commits
- [Update] 优化AssetPermissionUtil动态设置系统用户actions属性逻辑 (#2739) · 9f67daeb
  BaiJiangJie authored May 27, 2019
```
* [Update] 优化AssetPermissionUtil动态设置系统用户actions属性逻辑

* [Bugfix] 修复can't pickle dict_keys objects的bug
```
  9f67daeb
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · 20656921
  ibuler authored May 27, 2019
  
  20656921
- [Update] 修改菜单 · 33e342f0
  ibuler authored May 27, 2019
  
  33e342f0
- [Update] csv翻译 (#2736) · 7a6027f3
  八千流 authored May 27, 2019
  
  7a6027f3
- [Update] 添加应用下载器地址；添加系统设置中字段的最大、最小值限制 (#2735) · e46a6f1d
  BaiJiangJie authored May 27, 2019
```
* [Update] 添加应用下载器地址

* [Update] 系统设置中的Form, 添加最大、最小值限制

* [Update] 更新翻译
```
  e46a6f1d
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · 0f399636
  ibuler authored May 27, 2019
  
  0f399636
- [Update] 修改导出的csv名称 · 0847539e
  ibuler authored May 27, 2019
  
  0847539e
- [Bugfix]修复解析器顺序bug,csv解析器需在file解析器前 (#2734) · f576f2ed
  八千流 authored May 27, 2019
  
  f576f2ed
24 May, 2019 2 commits

[Update] 用户创建添加密码设置策略 (#2731) · 21ac3eaf

BaiJiangJie authored May 24, 2019

* [Update] 优化创建用户的密码策略功能

* [Update] 优化用户初始密码设置以及清除初始密码

* [Update] 优化创建用户的密码策略功能

* [Update]统一变量名前缀

* [Update] 用户密码策略去掉自定义策略

* [Update] 修改小问题

* [Update] 优化创建用户密码策略

* [Update] 翻译

* [Update] 优化mfa按钮排布和间距

* [Update] 优化mfa按钮样式由前端控制

* [Update] 优化前端密码策略按钮的显示与隐藏

* [Update] 用户创建设置密码添加密码校验弹窗

21ac3eaf

Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · b237cbb2
ibuler authored May 24, 2019

b237cbb2