Commit Graph
703 Commits
Author SHA1 Message Date
孙华伟 dfdb2f629e Fix bug #19247. 2022-02-15 11:22:31 +08:00
tianshujie bd99d3def9 * Realize the partial refresh function of the story card. 2022-01-20 17:35:49 +08:00
tianshujie 0f26e7d982 * Fix bug #18643. 2022-01-18 13:38:46 +08:00
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
liumengyi 00f85a4ee8 * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. 2022-01-17 16:13:45 +08:00
孙广明 54ec9e1429 Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug of execution kanban.

See merge request easycorp/zentaopms!1442
2022-01-17 07:30:36 +00:00
liumengyi 9cea290feb * Fix bug of execution kanban. 2022-01-17 15:26:19 +08:00
孙广明 b0f8dabcca Merge branch 'sprint/182_tianshujie_18496' into 'master'
* Filter out cards from other swimlanes when updating cards.

See merge request easycorp/zentaopms!1434
2022-01-17 07:23:01 +00:00
tianshujie 9b5fa61141 * Modify the code logic. 2022-01-17 15:20:17 +08:00
chaideqing 250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +08:00
liumengyi a36a74eb7d * Fix bug of RD kanban creation and associating story. 2022-01-17 14:35:15 +08:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
mayue 15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
Hao Sun 1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
zenggang 8e4cfa8744 * Finish task#46549 2021-12-29 02:29:19 +00:00
liyuchun dc46e684fe * Fix bug #18023. 2021-12-28 14:10:59 +08:00
孙广明 6736f26abc Merge branch 'sprint/178_songchenxuan_17848' into 'master'
*Fix bug #17848.

See merge request easycorp/zentaopms!1092
2021-12-23 03:25:24 +00:00
孙广明 7bdb0499e9 Merge branch 'master' into 'sprint/178_songchenxuan_46100'
# Conflicts:
#   module/productplan/view/batchedit.html.php
#   module/productplan/view/browse.html.php
2021-12-23 02:46:03 +00:00
songchenxuan 171b3d0c56 *Fix bug #17848. 2021-12-23 10:15:47 +08:00
songchenxuan a7258e471b *Finish task #46100. 2021-12-22 14:28:28 +08:00
songchenxuan 1c8df7822a *Finish task #46100. 2021-12-22 10:48:55 +08:00
songchenxuan 35a4af824f *Finish task #46100. 2021-12-22 08:50:10 +08:00
hufangzhou 9743ebbb92 * Finish task #46388. 2021-12-21 22:26:07 +08:00
songchenxuan 116b1a717d *Fix bug #17584. 2021-12-21 11:54:54 +08:00
songchenxuan d81ccdff30 *Fix bug #17584. 2021-12-20 16:09:18 +08:00
songchenxuan fe8d8166e9 *Finish task #45545. 2021-12-09 11:19:25 +08:00
songchenxuan 8b874bfbbc *Finish task #45545. 2021-12-09 09:20:45 +08:00
xieqiyu 3755502cf5 * Fix bug : Unit test product drop-down error. 2021-12-02 09:12:50 +08:00
xieqiyu d0afac5593 * Fix bug for batch edit story and bug in project. 2021-11-30 17:10:12 +08:00
李玉春 dbc186a0c4 Merge branch 'master' into 'sprint/174_xieqiyu_45080'
# Conflicts:
#   module/story/control.php
#   module/story/view/header.html.php
#   module/testcase/control.php
2021-11-30 07:44:47 +00:00
xieqiyu 70d8039750 * Add comment. 2021-11-30 15:31:10 +08:00
xieqiyu 888fbfe73b * Code for task#45080. 2021-11-30 15:05:16 +08:00
李玉春 a4426db6f0 Merge branch 'sprint/174_tianshujie_45081' into 'master'
* Fix bug #16939 and modify the scope of the plan when editing bugs.

See merge request easycorp/zentaopms!672
2021-11-30 06:45:48 +00:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie 508d7d78bf * Fix bug #16939 and modify the scope of the plan when editing bugs. 2021-11-30 14:14:14 +08:00
songchenxuan 9efa9b1759 * Finish task #45018. 2021-11-30 10:49:38 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
tianshujie 8bf6c34acd * Modify the logic of planning related stories and bugs. 2021-11-26 13:37:15 +08:00
mayue f92ba845a3 * Fix bug #16605. 2021-11-25 14:35:33 +08:00
mayue 1cf28e1120 * Fix bug #16605. 2021-11-25 13:20:54 +08:00
tianshujie 4f4a1f990b * Modify the logic of changing branches in stories. 2021-11-25 11:28:50 +08:00
tianshujie 1d93fa0cd9 * Modify the scope of the linked plan when creating and editing stories. 2021-11-25 10:30:22 +08:00
hufangzhou 4e2cda3a82 * Fix an error for edit story. 2021-11-24 11:26:43 +08:00
hufangzhou cb78fa20e1 * Modify the nav in edit story. 2021-11-24 10:51:54 +08:00
hufangzhou 7d50d0bb9a Merge branch 'sprint/170_package_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/170_package_bug 2021-11-24 10:04:55 +08:00