Merge pull request #1919 from pagezhou/V3.5.5_official

版本升级到 V3.5.5

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.5.4
+version: 3.5.5
 category: 运维工具
 language_support: 中文
 desktop:

config/default.py

@@ -129,7 +129,7 @@
 # Django模板中：<script src="/a.js?v="></script>
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
-STATIC_VERSION = '3.5.4'
+STATIC_VERSION = '3.5.5'
 
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'static')
@@ -351,5 +351,6 @@
 
 # version log config
 VERSION_LOG = {
-    'PAGE_STYLE': 'gitbook'
+    'PAGE_STYLE': 'gitbook',
+    'MD_FILES_DIR': 'version_log/version_logs_md'
 }

locale/en/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-04-10 16:30+0800\n"
+"POT-Creation-Date: 2020-04-13 12:07+0800\n"
 "PO-Revision-Date: 2017-11-17 11:28+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -2906,52 +2906,3 @@ msgstr "City"
 #: weixin/core/models.py:68 weixin/core/models.py:69
 msgid "微信用户"
 msgstr "Wechat User"
-
-#~ msgid "模板不存在，错误信息：%s"
-#~ msgstr "Template not exist, error message: %s"
-
-#~ msgid " login_ip为空或输入格式错误"
-#~ msgstr "login_ip is empty or format error"
-
-#~ msgid "data_ip 为空或输入格式错误"
-#~ msgstr "data_ip is empty or format error"
-
-#~ msgid "cascade_ip 为空或输入格式错误"
-#~ msgstr "cascade_ip is empty or format error"
-
-#~ msgid "提交的任务的job_id"
-#~ msgstr "task's job_id"
-
-#~ msgid "您没有权限进行此操作"
-#~ msgstr "You have no permissions to make such operation"
-
-#~ msgid "当前调度所处的循环计数"
-#~ msgstr "Current Cycle Count"
-
-#~ msgid "本次循环计数"
-#~ msgstr "Cycle Count"
-
-#~ msgid "执行状态"
-#~ msgstr "Status"
-
-#~ msgid "本次循环次数"
-#~ msgstr "Planning Cycle Count"
-
-#~ msgid "实际循环次数"
-#~ msgstr "Real Cycle Count"
-
-#~ msgid "所需循环次数"
-#~ msgstr "Cycle Count Required"
-
-#~ msgid "调用{system}接口{api_name}无权限: <a href='{url}' target='_blank'>申请权限</a>。"
-#~ msgstr "{system} API {api_name} returned no permission: <a href='{url}' target='_blank'> Apply for permission </a>. "
-
-#~ msgid "通用流程模板ID"
-#~ msgstr "Common Template ID"
-
-#~ msgid "公共流程模板权限 CommonTmplPerm"
-#~ msgstr "Common Template Permission"
-
-#~ msgid "变量类型，字符串(1) IP(2)"
-#~ msgstr "Variable type, string(1) or IP(2)"
-