From 314b1290052ec6a8c305863f3afede97a4a63efb Mon Sep 17 00:00:00 2001 From: daskyrk Date: Fri, 2 Jul 2021 15:26:06 +0800 Subject: [PATCH 1/6] docs: update README --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a6cfd6f61..a0462f8c98 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ For a detailed introduction, please check the [official website](https://www.erd Modern browsers | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Edge](http://godban.github.io/browsers-support-badges/)
Edge | -| --- | --- | --- | --- | -| last 2 versions | last 2 versions | last 2 versions | last 2 versions | +| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| last 2 versions | last 2 versions | last 2 versions | last 2 versions | ## πŸš€ Quick Start @@ -112,6 +112,10 @@ architecture of development mode - [User Docs](https://docs.erda.cloud) - [Backend project](https://github.com/erda-project/erda) +<<<<<<< HEAD +======= +To start using Erda, please see the documentation. +>>>>>>> docs: update README ## 🀝 Contributing [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) From 4f4f2f039a418a5ba62cd784d299ce10629da9df Mon Sep 17 00:00:00 2001 From: daskyrk Date: Fri, 2 Jul 2021 15:30:08 +0800 Subject: [PATCH 2/6] docs: fix format --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index a0462f8c98..b8c9474de4 100644 --- a/README.md +++ b/README.md @@ -112,11 +112,6 @@ architecture of development mode - [User Docs](https://docs.erda.cloud) - [Backend project](https://github.com/erda-project/erda) -<<<<<<< HEAD -======= -To start using Erda, please see the documentation. ->>>>>>> docs: update README - ## 🀝 Contributing [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) We welcome all contributions. Please read our [CONTRIBUTING.md](https://github.com/erda-project/erda-ui/blob/master/.github/CONTRIBUTING.md) first. You can submit any ideas as [pull requests](https://github.com/erda-project/erda-ui/pulls) or as [GitHub issues](https://github.com/erda-project/erda-ui/issues?template=bug-template). If you'd like to improve code, check out the [Development Instructions](https://github.com/erda-project/erda-ui/wiki/Development) and have a good time! :) From 54373db79ec94cfc2290bbd459db8a42a18cb2e4 Mon Sep 17 00:00:00 2001 From: daskyrk Date: Fri, 2 Jul 2021 15:32:43 +0800 Subject: [PATCH 3/6] fix: auto format content by prettier --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b8c9474de4..2a6cfd6f61 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ For a detailed introduction, please check the [official website](https://www.erd Modern browsers | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Edge](http://godban.github.io/browsers-support-badges/)
Edge | -| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| last 2 versions | last 2 versions | last 2 versions | last 2 versions | +| --- | --- | --- | --- | +| last 2 versions | last 2 versions | last 2 versions | last 2 versions | ## πŸš€ Quick Start @@ -112,6 +112,7 @@ architecture of development mode - [User Docs](https://docs.erda.cloud) - [Backend project](https://github.com/erda-project/erda) + ## 🀝 Contributing [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) We welcome all contributions. Please read our [CONTRIBUTING.md](https://github.com/erda-project/erda-ui/blob/master/.github/CONTRIBUTING.md) first. You can submit any ideas as [pull requests](https://github.com/erda-project/erda-ui/pulls) or as [GitHub issues](https://github.com/erda-project/erda-ui/issues?template=bug-template). If you'd like to improve code, check out the [Development Instructions](https://github.com/erda-project/erda-ui/wiki/Development) and have a good time! :) From ca8ea950213989553433cdfd2b491b4ababf877b Mon Sep 17 00:00:00 2001 From: daskyrk Date: Thu, 22 Jul 2021 16:32:28 +0800 Subject: [PATCH 4/6] chore: add changeLog section in pr template --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 67ee73ba4b..1d39394e00 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -20,6 +20,17 @@ Describe the specific changes from the user's perspective, as well as possible B | πŸ‡¨πŸ‡³ δΈ­ζ–‡ | | +## ChangeLog + + +| Language | Changelog | +| --------- | ------------ | +| πŸ‡ΊπŸ‡Έ English | | +| πŸ‡¨πŸ‡³ δΈ­ζ–‡ | | + + ## Which versions should be patched? From 6c16cea75cd35531633cdb3983d4e4cccfb7e49f Mon Sep 17 00:00:00 2001 From: daskyrk Date: Tue, 27 Jul 2021 10:42:06 +0800 Subject: [PATCH 5/6] chore: remove duplicate pr template section --- .github/PULL_REQUEST_TEMPLATE.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1d39394e00..67ee73ba4b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -20,17 +20,6 @@ Describe the specific changes from the user's perspective, as well as possible B | πŸ‡¨πŸ‡³ δΈ­ζ–‡ | | -## ChangeLog - - -| Language | Changelog | -| --------- | ------------ | -| πŸ‡ΊπŸ‡Έ English | | -| πŸ‡¨πŸ‡³ δΈ­ζ–‡ | | - - ## Which versions should be patched? From cfc814790131317fe73783fa040f91b12f515244 Mon Sep 17 00:00:00 2001 From: daskyrk Date: Thu, 29 Jul 2021 11:08:13 +0800 Subject: [PATCH 6/6] fix: circular jump when location is /- --- shell/app/org-home/stores/org.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/app/org-home/stores/org.tsx b/shell/app/org-home/stores/org.tsx index bbb06d55f0..09aa84dd86 100644 --- a/shell/app/org-home/stores/org.tsx +++ b/shell/app/org-home/stores/org.tsx @@ -103,7 +103,7 @@ const org = createStore({ } } if (currentOrg.name !== orgName) { - location.href = location.href.replace(`/${orgName}/`, `/${currentOrg.name}/`); + location.href = location.href.replace(`/${orgName}`, `/${currentOrg.name}`); // just replace the first match, which is org name return; } if (orgId) {