You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/01/26 02:34:52 UTC
[incubator-dolphinscheduler] branch json_split updated (648bc41 ->
1d72a43)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 648bc41 [Feature][JsonSplit] add task and relation save code (#4546)
add d504fc4 [Improvement-3878]Tenant list delete user name
add efc6b85 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add b8eaa68 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 6e7d3eb [Improvement-3878][ui]Fix the list style
add 789d6b6 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 342bd83 [Improvement][ui] List vacancy optimization and icon icon repair
add 02857c5 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add d9fdabb Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 91c2bb7 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 0f2684c Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add d1b8077 Add font-awesome license and delete ans-ui license
add 67f50ef Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 4b9acec Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 1e3af6e Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 4ef04c6 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add e138679 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add bd6b9c9 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add ef2baa7 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 49cb11c Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 1df3c4b Introduce remixicon
add e73f091 fix
add 967fd70 fix
add 1e2105b Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add c35aef0 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 45e3084 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 5f6b3ea Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add e94e323 Plug-in front-end function
add 7d34617 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 4e2f27d Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add e977f16 fix
add b3dd9f7 add
add c6efe50 fix
add 27d7e91 fix
add 495cd7c Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 574ffa5 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 90a9024 optimization
add c202b57 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 394c5f2 fix
add b1db5dc Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add ea3c29a Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 6dbc2fc Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 78278f1 fix
add 140ff37 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add b7d0e4f fix
add 4950549 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add a7f0f31 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 5c662f0 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add f85d41e [Improvement]Optimize the popover box title, create and edit instances are not cleared
add ecacc43 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add c9df981 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 2289ba4 [Improvement-4550][ui]Fix the problem of Uncaught (in promise) NavigationDuplicated: Avoided redundant navigation when clicking on the same route
add a5f31b7 [Improvement-4506][LICENSE] upgrade the version of the commons-beanutils (#4525)
add 5a8987f fix ui user authorization dialog.
add 5861fb5 Merge pull request #4552 from zhuangchong/dev-fix-ui-user-auth-dialog
add 0e668d1 fix ui process-instance delete funcation disabled condition.
add 8587230 Merge pull request #4545 from zhuangchong/dev-fix-ui-instance-delete-disabled
add 90626d4 [Improvement][alert-plugin] Refactor alert-plugin module to fix code smell (#4548)
add 3ff0e59 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add d203cba fix ui createToken submit error.
add be61e25 remove setTimeout function.
add 281e1be remove setTimeout function.
add 6b8cf1e Merge pull request #4554 from zhuangchong/dev-fix-ui-token-spinnerLoading
add d8e87d8 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev
add 69445e3 Merge pull request #4551 from break60/dev
add 3e467df [Improvement-4556][ui]Repair the workflow instance, click the browser to return to the previous page, always start the query from the first page
add 8be894c Merge pull request #4557 from break60/dev
add 891df6d fix schema 1.4.0 (#4564)
new 1d72a43 Merge remote-tracking branch 'upstream/dev' into spilit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../alert/dingtalk/DingTalkParamsConstants.java | 2 +-
.../plugin/alert/dingtalk/DingTalkSender.java | 2 +-
.../plugin/alert/email/EmailConstants.java | 4 +
.../plugin/alert/email/ExcelUtils.java | 15 ++-
.../plugin/alert/email/MailParamsConstants.java | 2 +-
.../plugin/alert/email/MailSender.java | 74 +++++---------
.../alert/email/exception/AlertEmailException.java | 26 ++---
.../alert/email/template/DefaultHTMLTemplate.java | 11 +-
.../plugin/alert/script/OSUtils.java | 2 +-
.../plugin/alert/script/ScriptParamsConstants.java | 2 +-
.../plugin/alert/script/StreamGobbler.java | 4 +-
.../plugin/alert/wechat/WeChatAlertConstants.java | 4 +
.../alert/wechat/WeChatAlertParamsConstants.java | 3 +
.../plugin/alert/wechat/WeChatSender.java | 47 ++++-----
.../wechat/exception/WeChatAlertException.java | 17 ++--
.../common/utils/CollectionUtils.java | 6 +-
dolphinscheduler-dist/release-docs/LICENSE | 2 +-
.../dolphinscheduler/spi/utils/JSONUtils.java | 12 +--
.../pages/definition/pages/list/_source/list.vue | 1 -
.../pages/instance/pages/list/_source/list.vue | 3 +-
.../projects/pages/instance/pages/list/index.vue | 1 +
.../security/pages/queue/_source/createQueue.vue | 4 +-
.../pages/tenement/_source/createTenement.vue | 4 +-
.../security/pages/users/_source/createUser.vue | 4 +-
.../pages/security/pages/users/_source/list.vue | 3 +
.../pages/user/pages/token/_source/createToken.vue | 8 +-
.../src/js/conf/home/router/index.js | 5 +
.../src/js/module/util/routerUtil.js | 8 +-
pom.xml | 2 +-
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 111 ++++++++++++++++++---
.../postgresql/dolphinscheduler_ddl.sql | 96 +++++++++++++++---
tools/dependencies/known-dependencies.txt | 2 +-
32 files changed, 306 insertions(+), 181 deletions(-)
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java => dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.java (64%)
copy dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/future/InvokeCallback.java => dolphinscheduler-alert-plugin/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/exception/WeChatAlertException.java (75%)
[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch
'upstream/dev' into spilit
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 1d72a43680f9e87e42c571e108232e9f8d0b4895
Merge: 648bc41 891df6d
Author: lenboo <ba...@gmail.com>
AuthorDate: Tue Jan 26 10:34:27 2021 +0800
Merge remote-tracking branch 'upstream/dev' into spilit
.../alert/dingtalk/DingTalkParamsConstants.java | 2 +-
.../plugin/alert/dingtalk/DingTalkSender.java | 2 +-
.../plugin/alert/email/EmailConstants.java | 4 +
.../plugin/alert/email/ExcelUtils.java | 15 ++-
.../plugin/alert/email/MailParamsConstants.java | 2 +-
.../plugin/alert/email/MailSender.java | 74 +++++---------
.../email/exception/AlertEmailException.java} | 26 +++--
.../alert/email/template/DefaultHTMLTemplate.java | 11 +-
.../plugin/alert/script/OSUtils.java | 2 +-
.../plugin/alert/script/ScriptParamsConstants.java | 2 +-
.../plugin/alert/script/StreamGobbler.java | 4 +-
.../plugin/alert/wechat/WeChatAlertConstants.java | 4 +
.../alert/wechat/WeChatAlertParamsConstants.java | 3 +
.../plugin/alert/wechat/WeChatSender.java | 47 ++++-----
.../wechat/exception/WeChatAlertException.java} | 20 ++--
.../common/utils/CollectionUtils.java | 6 +-
dolphinscheduler-dist/release-docs/LICENSE | 2 +-
.../dolphinscheduler/spi/utils/JSONUtils.java | 12 +--
.../pages/definition/pages/list/_source/list.vue | 1 -
.../pages/instance/pages/list/_source/list.vue | 3 +-
.../projects/pages/instance/pages/list/index.vue | 1 +
.../security/pages/queue/_source/createQueue.vue | 4 +-
.../pages/tenement/_source/createTenement.vue | 4 +-
.../security/pages/users/_source/createUser.vue | 4 +-
.../pages/security/pages/users/_source/list.vue | 3 +
.../pages/user/pages/token/_source/createToken.vue | 8 +-
.../src/js/conf/home/router/index.js | 5 +
.../src/js/module/util/routerUtil.js | 8 +-
pom.xml | 2 +-
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 111 ++++++++++++++++++---
.../postgresql/dolphinscheduler_ddl.sql | 96 +++++++++++++++---
tools/dependencies/known-dependencies.txt | 2 +-
32 files changed, 311 insertions(+), 179 deletions(-)