diff --git a/app.yml b/app.yml index 2a47f868a6..f701d19afd 100644 --- a/app.yml +++ b/app.yml @@ -6,7 +6,7 @@ is_use_celery: True author: 蓝鲸智云 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process. -version: 3.6.6 +version: 3.6.7 category: 运维工具 language_support: 中文 desktop: diff --git a/config/default.py b/config/default.py index e2b0036d65..f34169fc5b 100644 --- a/config/default.py +++ b/config/default.py @@ -146,7 +146,7 @@ # Django模板中： # mako模板中： # 如果静态资源修改了以后，上线前改这个版本号即可 -STATIC_VERSION = "3.6.6" +STATIC_VERSION = "3.6.7" STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")] diff --git a/dev_log/dev/fannluo_202008281612.yaml b/dev_log/3.6.7/fannluo_202008281612.yaml similarity index 100% rename from dev_log/dev/fannluo_202008281612.yaml rename to dev_log/3.6.7/fannluo_202008281612.yaml diff --git a/dev_log/dev/fannluo_202008311739.yaml b/dev_log/3.6.7/fannluo_202008311739.yaml similarity index 100% rename from dev_log/dev/fannluo_202008311739.yaml rename to dev_log/3.6.7/fannluo_202008311739.yaml diff --git a/dev_log/dev/fannluo_202008312024.yaml b/dev_log/3.6.7/fannluo_202008312024.yaml similarity index 100% rename from dev_log/dev/fannluo_202008312024.yaml rename to dev_log/3.6.7/fannluo_202008312024.yaml diff --git a/dev_log/dev/fannluo_202009011958.yaml b/dev_log/3.6.7/fannluo_202009011958.yaml similarity index 100% rename from dev_log/dev/fannluo_202009011958.yaml rename to dev_log/3.6.7/fannluo_202009011958.yaml diff --git a/dev_log/dev/fannluo_202009012136.yaml b/dev_log/3.6.7/fannluo_202009012136.yaml similarity index 100% rename from dev_log/dev/fannluo_202009012136.yaml rename to dev_log/3.6.7/fannluo_202009012136.yaml diff --git a/dev_log/dev/fannluo_202009022024.yaml b/dev_log/3.6.7/fannluo_202009022024.yaml similarity index 100% rename from dev_log/dev/fannluo_202009022024.yaml rename to dev_log/3.6.7/fannluo_202009022024.yaml diff --git a/dev_log/dev/fannluo_202009022056.yaml b/dev_log/3.6.7/fannluo_202009022056.yaml similarity index 100% rename from dev_log/dev/fannluo_202009022056.yaml rename to dev_log/3.6.7/fannluo_202009022056.yaml diff --git a/docs/release.md b/docs/release.md index fe41c66d93..f684a6261a 100644 --- a/docs/release.md +++ b/docs/release.md @@ -1,5 +1,17 @@ # Release +## 3.6.7 + +- bugfix + - tag组件与magicbox内部zIndex层级管理问题修复 + - 子流程模板变量类型更新后勾选的输入参数取值不正确修复 + - 申请公共流程相关权限时报错修复 + - 管理员视图周期任务执行历史跳转链接不正确修复 + - 节点配置输入、输出参数勾选状态可能未被清空的问题修复 + - IP选择器保存筛选、排除条件后，编辑状态下不显示问题修复 +- improvement + - 模板编辑名称错误时提示方式优化 + ## 3.6.6 - feature diff --git a/readme.md b/readme.md index 4f38ef9f5b..778bad53e1 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ ![](docs/resource/img/logo_zh.png) --- [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/Tencent/bk-sops/blob/master/LICENSE) -[![Release](https://img.shields.io/badge/release-3.6.6-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases) +[![Release](https://img.shields.io/badge/release-3.6.7-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases) [![travis-ci](https://travis-ci.com/Tencent/bk-sops.svg?branch=master)](https://travis-ci.com/Tencent/bk-sops) [![Coverage Status](https://codecov.io/gh/Tencent/bk-sops/branch/master/graph/badge.svg)](https://codecov.io/gh/Tencent/bk-sops) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-sops/pulls) diff --git a/readme_en.md b/readme_en.md index fe210fd4c6..59aac441d9 100644 --- a/readme_en.md +++ b/readme_en.md @@ -1,7 +1,7 @@ ![](docs/resource/img/logo_en.png) --- [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/Tencent/bk-sops/blob/master/LICENSE) -[![Release](https://img.shields.io/badge/release-3.6.6-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases) +[![Release](https://img.shields.io/badge/release-3.6.7-brightgreen.svg)](https://github.com/Tencent/bk-sops/releases) [![travis-ci](https://travis-ci.com/Tencent/bk-sops.svg?branch=master)](https://travis-ci.com/Tencent/bk-sops) [![Coverage Status](https://codecov.io/gh/Tencent/bk-sops/branch/master/graph/badge.svg)](https://codecov.io/gh/Tencent/bk-sops) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/bk-sops/pulls) diff --git a/version_log/version_logs_md/V3.6.7_2020-09-03.md b/version_log/version_logs_md/V3.6.7_2020-09-03.md new file mode 100644 index 0000000000..0db291c3de --- /dev/null +++ b/version_log/version_logs_md/V3.6.7_2020-09-03.md @@ -0,0 +1,10 @@ + +## bugfix + - tag组件与magicbox内部zIndex层级管理问题修复 + - 子流程模板变量类型更新后勾选的输入参数取值不正确修复 + - 申请公共流程相关权限时报错修复 + - 管理员视图周期任务执行历史跳转链接不正确修复 + - 节点配置输入、输出参数勾选状态可能未被清空的问题修复 + - IP选择器保存筛选、排除条件后，编辑状态下不显示问题修复 +## improvement + - 模板编辑名称错误时提示方式优化 \ No newline at end of file