From 6a92bef5e36dd6c7100517cfa516ca9c8603d950 Mon Sep 17 00:00:00 2001
From: dailidong <dailidong66@gmail.com>
Date: Wed, 6 May 2020 18:38:19 +0800
Subject: [PATCH 1/2] add development state config (#2609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

* combine logback config of master/worker/alert/api server to one logback.xml

* remove tomcat runtime jar

* add UT

* add license

* remove jasper-runtime jar, not need anymore

* sovle jar conflict， remove servlet-api 2.5 jar

* remove servlet 2.5

* add embedded database h2 and update embedded zookeeper

* delete logs

* add license

* change log level to INFO

* simplify and optimize config

* add development state

Co-authored-by: lidongdai <escheduler@outlook.com>
Co-authored-by: dailidong <dolphinschedule@gmail.com>
---
 dolphinscheduler-common/src/main/resources/common.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dolphinscheduler-common/src/main/resources/common.properties b/dolphinscheduler-common/src/main/resources/common.properties
index db3b241ca9..d066f7b6b7 100644
--- a/dolphinscheduler-common/src/main/resources/common.properties
+++ b/dolphinscheduler-common/src/main/resources/common.properties
@@ -62,5 +62,5 @@ yarn.application.status.address=http://ark1:8088/ws/v1/cluster/apps/%s
 
 # system env path
 #dolphinscheduler.env.path=env/dolphinscheduler_env.sh
-
+development.state=false
 kerberos.expire.time=7
\ No newline at end of file

From fadfb28187f48648230094e05f946d2b41e8f67a Mon Sep 17 00:00:00 2001
From: zixi0825 <649790970@qq.com>
Date: Wed, 6 May 2020 21:33:08 +0800
Subject: [PATCH 2/2] fix copy workflow tip (#2612)

Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
---
 .../pages/projects/pages/definition/pages/list/_source/list.vue | 2 +-
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js          | 1 +
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index efb7ea31ce..181383cbe1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -92,7 +92,7 @@
             <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Timing')" @click="_timing(item)" :disabled="item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"  icon="ans-icon-timer"><!--{{$t('定时')}}--></x-button>
             <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('online')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'"  icon="ans-icon-upward"><!--{{$t('下线')}}--></x-button>
             <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('offline')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'"  icon="ans-icon-downward"><!--{{$t('上线')}}--></x-button>
-            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Copy')" @click="_copyProcess(item)" :disabled="item.releaseState === 'ONLINE'"  icon="ans-icon-copy"><!--{{$t('复制')}}--></x-button>
+            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Copy Workflow')" @click="_copyProcess(item)" :disabled="item.releaseState === 'ONLINE'"  icon="ans-icon-copy"><!--{{$t('复制')}}--></x-button>
             <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Manage')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'"  icon="ans-icon-datetime"><!--{{$t('定时管理')}}--></x-button>
             <x-poptip
               :ref="'poptip-delete-' + $index"
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 0e83689149..95b1f79ca2 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -69,6 +69,7 @@ export default {
   'Project Manage': 'Project',
   'Create Project': 'Create Project',
   'Cron Manage': 'Cron Manage',
+  'Copy Workflow': 'Copy Workflow',
   'Tenant Manage': 'Tenant Manage',
   'Create Tenant': 'Create Tenant',
   'User Manage': 'User Manage',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 134ca84a58..1a9b7126c8 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -69,6 +69,7 @@ export default {
   'Project Manage': '项目管理',
   'Create Project': '创建项目',
   'Cron Manage': '定时管理',
+  'Copy Workflow': '复制工作流',
   'Tenant Manage': '租户管理',
   'Create Tenant': '创建租户',
   'User Manage': '用户管理',