Commits · 458bee9a19d5299f048e3c5b2e205d57708216bb · ops / jumpserver

25 Oct, 2019 12 commits
- Merge branch 'dev' into 1.5.5 · 458bee9a
  ibuler authored Oct 25, 2019
  
  458bee9a
- [Update] 修改js · d22f6036
  ibuler authored Oct 25, 2019
  
  d22f6036
- [Update] 修改js · 90321ab6
  ibuler authored Oct 25, 2019
  
  90321ab6
- [Update] 修改js · a5814c81
  ibuler authored Oct 25, 2019
  
  a5814c81
- [Update] 修改model · 87fd342b
  ibuler authored Oct 25, 2019
  
  87fd342b
- Merge branch 'dev' into 1.5.5 · d544f7f9
  ibuler authored Oct 25, 2019
  
  d544f7f9
- Merge branch 'dev' of github.com:jumpserver/jumpserver into dev · fbe4f4c1
  ibuler authored Oct 25, 2019
  
  fbe4f4c1
- [Update] 去掉debug信息 · 4d53b6f0
  ibuler authored Oct 25, 2019
  
  4d53b6f0
- [Update] 修改table过滤 · d2c65dd7
  ibuler authored Oct 25, 2019
  
  d2c65dd7
- [Update] 修改支持工单 · 0c1463bc
  ibuler authored Oct 25, 2019
  
  0c1463bc
- Merge pull request #3385 from jumpserver/dev_char · 39b41458
  BaiJiangJie authored Oct 25, 2019
```
[Update] 修改主机名/系统用户名称/组织名称的特殊字符限制（修改为特殊字符黑名单）[/ \]
```
  39b41458
- [Update] 修改主机名/系统用户名称/组织名称的特殊字符限制（修改为特殊字符黑名单）[/ \] · a57df0e0
  BaiJiangJie authored Oct 25, 2019
  
  a57df0e0
24 Oct, 2019 7 commits
- [Update] 资产授权 Action 添加 Help text (#3383) · 36d98a23
  BaiJiangJie authored Oct 24, 2019
```
* [Update] 资产授权 Action 添加 Help text

* [Update] 资产授权 Action 添加 Help text（修改翻译）
```
  36d98a23
- [Update] 修改user group relations api · cf719f49
  ibuler authored Oct 24, 2019
  
  cf719f49
- Merge pull request #3380 from jumpserver/dev_req · d3cf2afb
  BaiJiangJie authored Oct 24, 2019
```
[Update] 更新依赖版本号
```
  d3cf2afb
- [Update] 更新依赖版本号 · 3c5ebeeb
  BaiJiangJie authored Oct 24, 2019
  
  3c5ebeeb
- Merge pull request #3378 from jumpserver/dev_req · 8fd65a37
  BaiJiangJie authored Oct 24, 2019
```
[Update] 更新依赖包版本
```
  8fd65a37
- [Update] 更新依赖包版本 · f8f1aee9
  BaiJiangJie authored Oct 24, 2019
  
  f8f1aee9
- [Update] 更改命令执行超时提示 · 9bb7c1ad
  ibuler authored Oct 24, 2019
  
  9bb7c1ad
23 Oct, 2019 6 commits
- [Update] Merge with dev · d5cb0a2e
  ibuler authored Oct 23, 2019
  
  d5cb0a2e
- Merge pull request #3376 from jumpserver/dev_v · 4c1821e4
  BaiJiangJie authored Oct 23, 2019
```
[Update] 修改版本号（1.5.4）
```
  4c1821e4
- [Update] 修改版本号（1.5.4） · f31ed0af
  BaiJiangJie authored Oct 23, 2019
  
  f31ed0af
- [Update] Add debug message · f802fb64
  ibuler authored Oct 23, 2019
  
  f802fb64
- Merge pull request #3373 from jumpserver/bugfix · 0b405fde
  老广 authored Oct 23, 2019
```
Bugfix
```
  0b405fde
- [Update] 修改ws read celery log file · c995050e
  ibuler authored Oct 23, 2019
  
  c995050e
22 Oct, 2019 15 commits
- [Update] 修改websocket读取日志 · 0dbf2ab2
  ibuler authored Oct 22, 2019
  
  0dbf2ab2
- Merge pull request #3370 from jumpserver/bugfix · 22cc8ffb
  老广 authored Oct 22, 2019
```
Bugfix
```
  22cc8ffb
- [Update] 修改terminal字体 · 6b8b0f4a
  ibuler authored Oct 22, 2019
  
  6b8b0f4a
- [Update] 修改terminal字体 · b3502a92
  ibuler authored Oct 22, 2019
  
  b3502a92
- Merge pull request #3368 from jumpserver/dev_icon · c3f02dba
  BaiJiangJie authored Oct 22, 2019
```
[Update] 修改icon图片
```
  c3f02dba
- [Update] 修改icon图片 · 214c4d2f
  jym503558564 authored Oct 22, 2019
  
  214c4d2f
- Merge pull request #3365 from jumpserver/login_log_bugfix · 11ae5a4a
  BaiJiangJie authored Oct 22, 2019
```
[Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00，到结束时间的23:59:59
```
  11ae5a4a
- [Update] 优化登录日志时间范围 2 · 5f358327
  BaiJiangJie authored Oct 22, 2019
  
  5f358327
- [Update] 优化登录日志时间范围 · 950358f5
  BaiJiangJie authored Oct 22, 2019
  
  950358f5
- Merge pull request #3366 from jumpserver/bugfix · 84b3e29d
  BaiJiangJie authored Oct 22, 2019
```
Bugfix
```
  84b3e29d
- [Update] 修改返回asset tree带上组织 · a33d5cc5
  ibuler authored Oct 22, 2019
  
  a33d5cc5
- [Update] 修改小问题 · 3c7fa1b6
  jym503558564 authored Oct 22, 2019
  
  3c7fa1b6
- [Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00，到结束时间的23:59:59 · f4fc7573
  jym503558564 authored Oct 22, 2019
  
  f4fc7573
- [Update] 修改jms启动脚本，stop时增加超时检测 · 7cf617c3
  ibuler authored Oct 22, 2019
  
  7cf617c3
- [Update] 修改command 批量执行左侧选择系统用户 · 87deb187
  ibuler authored Oct 22, 2019
  
  87deb187