Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge 1.0 to develop #219

Merged
merged 49 commits into from
May 20, 2021
Merged

merge 1.0 to develop #219

merged 49 commits into from
May 20, 2021

Conversation

laojun
Copy link
Contributor

@laojun laojun commented May 20, 2021 •
edited
Loading

What type of PR is this?

  • Feature
  • Bugfix
  • Test
  • Documentation
  • Refactor
  • Style
  • Chore

What this PR does / why we need it:

merge 1.0 to develop

Which issue(s) this PR fixes:

Fixes #

Does this PR introduce a user interface change?

  • Yes(screenshot is required)
  • No

Special notes for your reviewer:

hujiahao-hjh and others added 30 commits May 12, 2021 11:29
@hujiahao-hjh
label regex fourth change (erda-project#137)
0dbf040
@laojun
fix: delete useless nginx config (erda-project#139)
d2a094c
@sherotree @McDaddy
fix: show test set after first adding it (erda-project#136)
4eaf98e 
* fix: show test set after first adding it

* refactor: add a semicolon to the end of the statement

* refactor: fix exhaustive-deps

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
@sherotree @laojun
fix: modify the propertyType of import source to Select (erda-project…
e3ee1c1 
…#140)

Co-authored-by: zxj <782803291@qq.com>
@michael8512
update the sidebar and menu-head icons with the primary color (erda-p…
dd4c8a4 
…roject#141)

* fix: change color of menu icon to primary color

* WIP: replace the project icon and menu head icon

* WIP: replace the sysAdmin icon
@daskyrk @laojun
fix: incorrect repo type image path (erda-project#142)
515c10e 
* chore: update dc version

* fix: modify readonly service list in store state

* style: code format

* chore: fix audit warnings

* fix: remove import statement in d.ts file

* fix: remove import statement in d.ts file

* fix: repo type img path incorrect

* fix: repo type img path incorrect

Co-authored-by: zxj <782803291@qq.com>
@licao404 @daskyrk
fix: can not fetch error counts during initialization (erda-project#143)
7a5042c 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@michael8512
fix the sidebar icon problem in addon page (erda-project#145)
cb96b71 
* fix: fix the sidebar icon problem in addon page

* WIP: add copyright to new file of sidebar-menu.tsx
@sherotree @daskyrk
Feature: go to workbench when the user view the public organization b…
431c545 
…ut didn't joined it (erda-project#147)

* feat: go to workbench when the user view the public organization but didn't joined it

* refactor: refactor code

* refactor: refactor code

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@sherotree @daskyrk @McDaddy
fix: clear state of layout before initializing it, to fix sider menu …
c369c1e 
…is incorrect when switch organization (erda-project#146)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>
@daskyrk
fix: error handler called twice & my publisher menu permission (erda-…
0314a61 
…project#148)

* fix: prevent all agent plugins register twice

* fix: all roles except guest can see my publisher menu
@michael8512
feat: replace menu-head icon with iconfont (erda-project#149)
b598341
@sherotree
fix: modify the params of runtimeDetailRoot from applicationId to app…
c0ace11 
…Id (erda-project#150)
@laojun @daskyrk
fix: fix test case export api with org (erda-project#152)
fe83954 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@daskyrk @laojun
feat: add commit action 'update' (erda-project#153)
9823d72 
Co-authored-by: zxj <782803291@qq.com>
@hujiahao-hjh
get git address from server (erda-project#155)
8462c8a
@laojun @daskyrk
fix: update org after set block network (erda-project#154)
d5334ad 
* fix: fix update current org after set block network

* fix: fix based on comments

* fix: fix based on comments

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@daskyrk
add prefix to pk-table overwrite style (erda-project#157)
a1bb827 
* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: agent use logic error
@laojun
fix sidebar menus error case by initLayout excute twice (erda-project…
197c9ad 
…#158)

* fix: add log

* fix: fix get org init finish

* fix: fix clear initlayout when switch org
@laojun @daskyrk
fix: revert api section in test case (erda-project#159)
a9fc2be 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@licao404 @daskyrk
fix: adjust style (erda-project#160)
09c6ea8 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@laojun
fix: set edit mode when click edit pipeline (erda-project#164)
841e6a5
@sherotree @laojun
Hotfix: display test set after adding it in first time (erda-project#163
f8dd51b 
)

* fix: display test set at first adding it

* refactor: add comment

Co-authored-by: zxj <782803291@qq.com>
@sherotree
Hotfix: add relationID to queryParam, in order to batch export test c…
53d7c36 
…ase when not all selected (erda-project#165)

* fix: modify all export to batch export when not all selected

* refactor: correct arrayFormat from undefined to none
@laojun @daskyrk
feat: add check detail in pipeline log (erda-project#166)
cb75a86 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@laojun @daskyrk
fix: fix rds database name regExp rule (erda-project#169)
dc9e82f 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@sherotree @daskyrk
fix: fix batch copy test cases (erda-project#167)
5064c8e 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@sherotree @daskyrk
feat: keep showing the border of selector which switch issue type (er…
827539a 
…da-project#168)

* feat: keep showing the border of selector which switch issue type

* style: update border-color

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@laojun @daskyrk
fix: fix test set menu error (erda-project#170)
6345ba9 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@licao404 @McDaddy
fix some upload problems (erda-project#173)
f58ea26 
* fix: md editor upload image error

* fix: optimize import test instances modal

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
laojun and others added 19 commits May 17, 2021 20:05
@laojun @daskyrk
fix env list error in test case (erda-project#172)
822642d 
* fix: fix env list

* fix: delete useless

* fix: add projectEnvList state in testEnv store

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@laojun
fix: fix pipeline record list active key (erda-project#175)
f0f6458
@hujiahao-hjh @daskyrk
fix task status change bug (erda-project#174)
096d69b 
* fix: task status change bug

* fix: task status change bug add comments

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@daskyrk @laojun
fix: prevent import case modal data affected by outer search (erda-pr…
c636883 
…oject#176)

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: agent use logic error

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent import case modal data affected by outer search

* fix: hide nusi form label without data

* style: code format

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent import case modal data affected by outer search

* fix: hide nusi form label without data

* style: code format

Co-authored-by: zxj <782803291@qq.com>
@sherotree @daskyrk
fix: jump to public organization which user doesn't join (erda-projec…
b281f53 
…t#178)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@michael8512 @McDaddy
@Zero-Rock @laojun
add working state to workflow of bug (erda-project#180)
6479c8a 
* format the build option of erda-ui/modules/* and update modules in yarn (erda-project#138)

* feat: optimize build of modules/*

* WIP: use erda/config to start and set output path

* convert all cli js to ts (erda-project#128)

* convert all cli js to ts

* add skipLibCheck to avoid unnecessary lib check

* change epxort path variable to function, due to command could run in enterprise project

* typo

* log typo

* missing when resolve conflect

* test: add unit test for common components (erda-project#144)

* test: unit test

test: add test case

feat: add licenses

* test: add test case

* optimized automatic positioning of form check in issue detail  (erda-project#151)

* feat: optimized issue detail save check

* fix: fix fixed select with ref

* fix: fix based on comments

* fix: code shorthand (erda-project#156)

* fix: add working state to workflow of bug

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: Zero <mobius_pan@yeah.net>
Co-authored-by: zxj <782803291@qq.com>
@sherotree @daskyrk
fix: update auth which from entryWorkBench to workBench) (erda-projec…
f6a7597 
…t#182)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@licao404 @laojun
fix: update dc (erda-project#185)
a42d00d 
Co-authored-by: zxj <782803291@qq.com>
@Zero-Rock @laojun
feat: fix error when estimateTime empty (erda-project#184)
8ec419a 
Co-authored-by: zxj <782803291@qq.com>
@Zero-Rock @laojun
no label add important (erda-project#186)
31d8bfe 
* feat: fix error when estimateTime empty

* feat: add important

Co-authored-by: zxj <782803291@qq.com>
@daskyrk
fix: register module which have router data first (erda-project#187)
6744890
@michael8512 @McDaddy
@Zero-Rock @laojun @daskyrk
lock the page auth of role EdgeOps (erda-project#188)
9dbdc66 
* format the build option of erda-ui/modules/* and update modules in yarn (erda-project#138)

* feat: optimize build of modules/*

* WIP: use erda/config to start and set output path

* convert all cli js to ts (erda-project#128)

* convert all cli js to ts

* add skipLibCheck to avoid unnecessary lib check

* change epxort path variable to function, due to command could run in enterprise project

* typo

* log typo

* missing when resolve conflect

* test: add unit test for common components (erda-project#144)

* test: unit test

test: add test case

feat: add licenses

* test: add test case

* optimized automatic positioning of form check in issue detail  (erda-project#151)

* feat: optimized issue detail save check

* fix: fix fixed select with ref

* fix: fix based on comments

* fix: code shorthand (erda-project#156)

* fix: lock the page auth of role EdgeOps

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: Zero <mobius_pan@yeah.net>
Co-authored-by: zxj <782803291@qq.com>
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@daskyrk @McDaddy
fix: emit route subscriptions after update store (erda-project#190)
2a4bc62 
* fix: register module which have router data first

* fix: emit route subscriptions after update store

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
@sherotree @daskyrk
fix: display inviteToOrg page (erda-project#189)
9e5f429 
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@sherotree @daskyrk
fix: jump to personal home page after leaving the organization (erda-…
72d2de3 
…project#191)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@laojun @daskyrk
route init error (erda-project#193)
b890e13 
* fix: add route log

* fix: add log

* fix: delete useless

* fix: delete useless

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
@sherotree @daskyrk @McDaddy
Feature: add executor field in execution record (erda-project#192)
9778f0e 
* feat: add executor field in execution record

* style: update style in execute record popover

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>
@laojun @licao404
@McDaddy @sherotree @daskyrk @Zero-Rock
merge hotfix/release1.0 to release 1.0 (erda-project#217)
67d54c1 
* fix: delete oss storage count (erda-project#195)

* fix: some chart page loop error (erda-project#197)

* fix: redirect to orgRoot when auth check failed (erda-project#200)

* fix publish announcement not update immediately and api gateway problem (erda-project#196)

* fix(ms): fix limit type doesn't popup when editing api gateway

* fix(org): update published announcement list immediately after pub/stop

* fix: get org info before registerModule (erda-project#201)

* fix: jump to personal home page after joining it (erda-project#203)

* feat: comment unused mobile artifact bgImage and preview image (erda-project#202)

* feat: add copy in test pipeline result (erda-project#205)

* Hotfix/fix release (erda-project#204)

* fix: some chart page loop error

* fix: update dc

* fix: set remainingTime defautl value 0 (erda-project#206)

* fix: synchronize url query to test case search (erda-project#207)

* fix websocket not work (erda-project#209)

* fix: fix websocket not work

* fix: delete useless ws

* feat: cluster overview display coloring percentage (erda-project#211)

* Hotfix: fix loadmore in list component (erda-project#210)

* fix: fix loadMore in protocol component of list

* refactor: refactor code

* refactor: refactor code

* refactor: refactor code

* refactor: remove isLoadMore that is out of props

* refactor: remove redundant isLoadMore

* refactor: remove redundant code

Co-authored-by: Lang LEE <liangyuqin1212@gmail.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: sherotree <wytreeshero@163.com>
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: Zero <mobius_pan@yeah.net>
@laojun
feat: merge release 1.0 to develop
3105c19
@laojun laojun changed the title merge develop to 1.0 merge 1.0 to develop May 20, 2021
@codecov
Copy link

codecov bot commented May 20, 2021

Codecov Report

Merging #219 (1816998) into develop (65f215a) will increase coverage by 0.08%.
The diff coverage is 88.88%.

❗ Current head 1816998 differs from pull request most recent head 3105c19. Consider uploading reports for the commit 3105c19 to get more accurate results
Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #219      +/-   ##
===========================================
+ Coverage    32.77%   32.86%   +0.08%     
===========================================
  Files          117      116       -1     
  Lines         6315     6286      -29     
  Branches      1542     1540       -2     
===========================================
- Hits          2070     2066       -4     
+ Misses        4239     4214      -25     
  Partials         6        6
Impacted Files Coverage Δ
shell/app/common/utils/go-to.tsx 95.04% <0.00%> (ø)
...l/app/common/components/markdown-editor/editor.tsx 100.00% <100.00%> (ø)
shell/app/common/utils/query-string.tsx 100.00% <100.00%> (ø)

@daskyrk daskyrk merged commit 3197edf into erda-project:develop May 20, 2021
michael8512 added a commit to michael8512/erda-ui that referenced this pull request Jun 1, 2021
@laojun @hujiahao-hjh
@sherotree @McDaddy @michael8512 @daskyrk @licao404 @Zero-Rock
merge 1.0 to develop (erda-project#219)
00f0a36 
* label regex fourth change (erda-project#137)

* fix: delete useless nginx config (erda-project#139)

* fix: show test set after first adding it (erda-project#136)

* fix: show test set after first adding it

* refactor: add a semicolon to the end of the statement

* refactor: fix exhaustive-deps

Co-authored-by: 戣蓦 <mcdaddychen@126.com>

* fix: modify the propertyType of import source to Select (erda-project#140)

Co-authored-by: zxj <782803291@qq.com>

* update the sidebar and menu-head icons with the primary color (erda-project#141)

* fix: change color of menu icon to primary color

* WIP: replace the project icon and menu head icon

* WIP: replace the sysAdmin icon

* fix: incorrect repo type image path (erda-project#142)

* chore: update dc version

* fix: modify readonly service list in store state

* style: code format

* chore: fix audit warnings

* fix: remove import statement in d.ts file

* fix: remove import statement in d.ts file

* fix: repo type img path incorrect

* fix: repo type img path incorrect

Co-authored-by: zxj <782803291@qq.com>

* fix: can not fetch error counts during initialization (erda-project#143)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix the sidebar icon problem in addon page (erda-project#145)

* fix: fix the sidebar icon problem in addon page

* WIP: add copyright to new file of sidebar-menu.tsx

* Feature: go to workbench when the user view the public organization but didn't joined it (erda-project#147)

* feat: go to workbench when the user view the public organization but didn't joined it

* refactor: refactor code

* refactor: refactor code

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: clear state of  layout before initializing it, to fix sider menu is incorrect when switch organization (erda-project#146)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>

* fix: error handler called twice & my publisher menu permission (erda-project#148)

* fix: prevent all agent plugins register twice

* fix: all roles except guest can see my publisher menu

* feat: replace menu-head icon with iconfont (erda-project#149)

* fix: modify the params of runtimeDetailRoot from applicationId to appId (erda-project#150)

* fix: fix test case export api with org (erda-project#152)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* feat: add commit action 'update' (erda-project#153)

Co-authored-by: zxj <782803291@qq.com>

* get git address from server (erda-project#155)

* fix: update org after set block network (erda-project#154)

* fix: fix update current org after set block network

* fix: fix based on comments

* fix: fix based on comments

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* add prefix to pk-table overwrite style (erda-project#157)

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: agent use logic error

* fix sidebar menus error case by initLayout excute twice (erda-project#158)

* fix: add log

* fix: fix get org init finish

* fix: fix clear initlayout when switch org

* fix: revert api section in test case (erda-project#159)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: adjust style (erda-project#160)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: set edit mode when click edit pipeline (erda-project#164)

* Hotfix: display test set after adding it in first time (erda-project#163)

* fix: display test set at first adding it

* refactor: add comment

Co-authored-by: zxj <782803291@qq.com>

* Hotfix: add relationID to queryParam, in order to batch export test case when not all selected (erda-project#165)

* fix: modify all export to batch export when not all selected

* refactor: correct arrayFormat from undefined to none

* feat: add check detail in pipeline log (erda-project#166)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: fix rds database name regExp rule (erda-project#169)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: fix batch copy test cases (erda-project#167)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* feat: keep showing the border of selector which switch issue type (erda-project#168)

* feat: keep showing the border of selector which switch issue type

* style: update border-color

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: fix test set menu error (erda-project#170)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix some upload problems (erda-project#173)

* fix: md editor upload image error

* fix: optimize import test instances modal

Co-authored-by: 戣蓦 <mcdaddychen@126.com>

* fix env list error in test case (erda-project#172)

* fix: fix env list

* fix: delete useless

* fix: add projectEnvList state in testEnv store

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: fix pipeline record list active key (erda-project#175)

* fix task status change bug (erda-project#174)

* fix: task status change bug

* fix: task status change bug add comments

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: prevent import case modal data affected by outer search (erda-project#176)

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: agent use logic error

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent import case modal data affected by outer search

* fix: hide nusi form label without data

* style: code format

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent overwrite extension style accidentally

* fix: just add prefix to pk-table

* fix: prevent import case modal data affected by outer search

* fix: hide nusi form label without data

* style: code format

Co-authored-by: zxj <782803291@qq.com>

* fix: jump to public organization which user doesn't  join (erda-project#178)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* add working state to workflow of bug (erda-project#180)

* format the build option of erda-ui/modules/* and update modules in yarn (erda-project#138)

* feat: optimize build of modules/*

* WIP: use erda/config to start and set output path

* convert all cli js to ts (erda-project#128)

* convert all cli js to ts

* add skipLibCheck to avoid unnecessary lib check

* change epxort path variable to function, due to command could run in enterprise project

* typo

* log typo

* missing when resolve conflect

* test: add unit test for common components (erda-project#144)

* test: unit test

test: add test case

feat: add licenses

* test: add test case

* optimized automatic positioning of form check in issue detail  (erda-project#151)

* feat: optimized issue detail save check

* fix: fix fixed select with ref

* fix: fix based on comments

* fix: code shorthand (erda-project#156)

* fix: add working state to workflow of bug

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: Zero <mobius_pan@yeah.net>
Co-authored-by: zxj <782803291@qq.com>

* fix: update auth which from entryWorkBench to workBench) (erda-project#182)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: update dc (erda-project#185)

Co-authored-by: zxj <782803291@qq.com>

* feat: fix error when estimateTime empty (erda-project#184)

Co-authored-by: zxj <782803291@qq.com>

* no  label add important (erda-project#186)

* feat: fix error when estimateTime empty

* feat: add important

Co-authored-by: zxj <782803291@qq.com>

* fix: register module which have router data first (erda-project#187)

* lock the page auth of role EdgeOps (erda-project#188)

* format the build option of erda-ui/modules/* and update modules in yarn (erda-project#138)

* feat: optimize build of modules/*

* WIP: use erda/config to start and set output path

* convert all cli js to ts (erda-project#128)

* convert all cli js to ts

* add skipLibCheck to avoid unnecessary lib check

* change epxort path variable to function, due to command could run in enterprise project

* typo

* log typo

* missing when resolve conflect

* test: add unit test for common components (erda-project#144)

* test: unit test

test: add test case

feat: add licenses

* test: add test case

* optimized automatic positioning of form check in issue detail  (erda-project#151)

* feat: optimized issue detail save check

* fix: fix fixed select with ref

* fix: fix based on comments

* fix: code shorthand (erda-project#156)

* fix: lock the page auth of role EdgeOps

Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: Zero <mobius_pan@yeah.net>
Co-authored-by: zxj <782803291@qq.com>
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: emit route subscriptions after update store (erda-project#190)

* fix: register module which have router data first

* fix: emit route subscriptions after update store

Co-authored-by: 戣蓦 <mcdaddychen@126.com>

* fix: display inviteToOrg page (erda-project#189)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* fix: jump to personal home page after leaving the organization (erda-project#191)

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* route init error (erda-project#193)

* fix: add route log

* fix: add log

* fix: delete useless

* fix: delete useless

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>

* Feature: add executor field in execution record (erda-project#192)

* feat: add executor field in execution record

* style: update style in execute record popover

Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>

* merge hotfix/release1.0 to release 1.0 (erda-project#217)

* fix: delete oss storage count (erda-project#195)

* fix: some chart page loop error (erda-project#197)

* fix: redirect to orgRoot when auth check failed (erda-project#200)

* fix publish announcement not update immediately and api gateway problem (erda-project#196)

* fix(ms): fix limit type doesn't popup when editing api gateway

* fix(org): update published announcement list immediately after pub/stop

* fix: get org info before registerModule (erda-project#201)

* fix: jump to personal home page after joining it (erda-project#203)

* feat: comment unused mobile artifact bgImage and preview image (erda-project#202)

* feat: add copy in test pipeline result (erda-project#205)

* Hotfix/fix release (erda-project#204)

* fix: some chart page loop error

* fix: update dc

* fix: set remainingTime defautl value 0 (erda-project#206)

* fix: synchronize url query to test case search (erda-project#207)

* fix websocket not work (erda-project#209)

* fix: fix websocket not work

* fix: delete useless ws

* feat: cluster overview display coloring percentage (erda-project#211)

* Hotfix: fix loadmore in list component (erda-project#210)

* fix: fix loadMore in protocol component of list

* refactor: refactor code

* refactor: refactor code

* refactor: refactor code

* refactor: remove isLoadMore that is out of props

* refactor: remove redundant isLoadMore

* refactor: remove redundant code

Co-authored-by: Lang LEE <liangyuqin1212@gmail.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: sherotree <wytreeshero@163.com>
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: Zero <mobius_pan@yeah.net>

Co-authored-by: hujiahao-hjh <82502479+hujiahao-hjh@users.noreply.github.com>
Co-authored-by: sherotree <wytreeshero@163.com>
Co-authored-by: 戣蓦 <mcdaddychen@126.com>
Co-authored-by: lsh <30284157+michael8512@users.noreply.github.com>
Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
Co-authored-by: Lang LEE <liangyuqin1212@gmail.com>
Co-authored-by: Zero <mobius_pan@yeah.net>
@laojun laojun deleted the feature/merge-release-1.0 branch June 9, 2021 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daskyrk daskyrk daskyrk approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@laojun @daskyrk @hujiahao-hjh @sherotree @michael8512 @licao404 @Zero-Rock