You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2021/04/07 09:19:47 UTC
[apisix-dashboard] 01/01: Merge branch 'master' into chore-route
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch chore-route
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
commit 2346af3d149800d1a8f0886f5565c7c60d6bab54
Merge: e60b60b 2c158a1
Author: juzhiyuan <ju...@apache.org>
AuthorDate: Wed Apr 7 17:19:23 2021 +0800
Merge branch 'master' into chore-route
web/cypress/fixtures/export-route-dataset.json | 3 +
.../rawDataEditor/test-rawDataEditor.spec.js | 3 +-
.../upstream/create_and_delete_upstream.spec.js | 4 +-
web/src/components/Plugin/PluginDetail.tsx | 25 ++--
web/src/components/Plugin/typing.d.ts | 2 +-
web/src/components/RawDataEditor/RawDataEditor.tsx | 25 ++--
web/src/components/RawDataEditor/locales/en-US.ts | 1 -
web/src/components/RawDataEditor/locales/zh-CN.ts | 1 -
web/src/components/Upstream/UpstreamForm.tsx | 145 +++++++++++----------
web/src/components/Upstream/constant.ts | 40 +++++-
web/src/locales/en-US/component.ts | 5 +-
web/src/locales/zh-CN/component.ts | 5 +-
web/src/pages/Consumer/List.tsx | 2 +-
web/src/pages/Route/locales/zh-CN.ts | 2 +-
web/src/pages/Service/List.tsx | 2 +-
web/src/pages/Upstream/Create.tsx | 14 +-
web/src/pages/Upstream/List.tsx | 7 +-
web/src/pages/Upstream/components/Step1.tsx | 3 +-
web/src/pages/Upstream/locales/en-US.ts | 83 +++++++-----
web/src/pages/Upstream/locales/zh-CN.ts | 71 ++++++----
20 files changed, 271 insertions(+), 172 deletions(-)