Commit Graph
52696 Commits
Author SHA1 Message Date
hufangzhou daf34ee3a3 * Finish task #89134. 2023-03-27 17:02:14 +08:00
王怡栋 56772f1035 Merge branch 'dev/gfl_add_icon' into 'master'
* Adjust code for add icon: icon-add-directory.

See merge request easycorp/zentaopms!7267
2023-03-27 08:42:36 +00:00
guofeilong 5806e9a91d * Adjust code for add icon: icon-add-directory. 2023-03-27 16:30:49 +08:00
王怡栋 182ebc71a2 Merge branch 'tsj_fixbug' into 'master'
* Fixed projectCommon language item errors.

See merge request easycorp/zentaopms!7265
2023-03-27 06:13:59 +00:00
王怡栋 7752aa6ab3 Merge branch 'zentaopms_300' into 'master'
Zentaopms 300

See merge request easycorp/zentaopms!7266
2023-03-27 06:13:47 +00:00
hufangzhou 032c5f22cc Merge branch 'master' into zentaopms_300 2023-03-27 14:10:08 +08:00
wangyidong c87ea9131a * fix for sonar. 2023-03-27 11:34:22 +08:00
tianshujie 31518d5758 * Fixed projectCommon language item errors. 2023-03-27 11:18:27 +08:00
王怡栋 e59c7e0999 Merge branch 'bugfix/32643_lmy' into 'master'
* Finish task #86286.

See merge request easycorp/zentaopms!7264
2023-03-27 03:17:30 +00:00
liumengyi 4c3e92742d * Finish task #87811. 2023-03-24 13:51:42 +08:00
liumengyi fe9b67d09d * Finish task #87810. 2023-03-24 13:35:50 +08:00
liumengyi 2fedb5d73d * Finish task #87810. 2023-03-24 13:30:32 +08:00
liumengyi fc04d3a5be * Finish task #87822, #87807. 2023-03-24 11:14:17 +08:00
liumengyi 8cb7883e7f * Finish task #87780. 2023-03-24 09:18:16 +08:00
王怡栋 ddc616af76 Merge branch 'ticket_474' into 'master'
* Adjust code.

See merge request easycorp/zentaopms!7263
2023-03-24 00:18:39 +00:00
wangyidong 2427f285a0 * fix bug #33175. 2023-03-23 17:27:26 +08:00
liumengyi 498ee8547f * Finish task #87765. 2023-03-23 15:54:19 +08:00
liumengyi f729ac2b47 * Update screen scheme. 2023-03-23 15:11:15 +08:00
wangyidong aac5f7c4d2 * fix bug for maxcount config. 2023-03-23 14:49:40 +08:00
孙广明 e075616a7e Merge branch 'sprint/scx_batchcreatetask_api' into 'master'
* Modify taskbatchcreate and product type is branch -create story api.

See merge request easycorp/zentaopms!7260
2023-03-23 05:19:57 +00:00
liuhong c1408e3edc * Adjust code. 2023-03-23 02:14:29 +00:00
wangyidong 183cb09315 * fix for sonar error. 2023-03-23 09:05:17 +08:00
wangyidong cd37890d59 * for Sonar error. 2023-03-23 08:56:57 +08:00
王怡栋 0afcc911e3 Merge branch 'ticket_474' into 'master'
* Fix ticket_474 for product changed when edit requirement on site.

See merge request easycorp/zentaopms!7262
2023-03-22 09:31:15 +00:00
liumengyi 5ed34238a0 * Finish task #87818. 2023-03-22 17:30:18 +08:00
liumengyi bc38e0bb85 * Finish task #87793. 2023-03-22 14:37:55 +08:00
liuhong 1e195ef0a2 * Fix ticket_474 for product changed when edit requirement on site. 2023-03-22 06:26:29 +00:00
胡方舟 d38e3e9618 Merge branch 'sprint/hufangzhou_87750' into 'zentaopms_300'
Sprint/hufangzhou 87750

See merge request easycorp/zentaopms!7261
2023-03-22 06:23:17 +00:00
liumengyi 5f8b06e105 * Finish task #87779. 2023-03-22 11:22:33 +08:00
hufangzhou 15bd1aeba6 * Adjust the lang item. 2023-03-22 03:07:33 +00:00
liumengyi 2d86fcc94a * Finish task #87763. 2023-03-22 10:54:53 +08:00
宋辰轩 8c5f7c510d * Modify taskbatchcreate and product type is branch -create story api. 2023-03-22 10:39:09 +08:00
liumengyi 062e80ac17 * Finish task #87759. 2023-03-22 10:12:27 +08:00
liumengyi b50f94c530 * Finish task #87759. 2023-03-22 10:00:25 +08:00
hufangzhou 1b92362e7a * Finish task #87750. 2023-03-22 01:24:23 +00:00
王怡栋 a4b69c17bc Merge branch 'dev/bug_#33115' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7259
2023-03-22 01:17:23 +00:00
liumengyi 036b327f15 * Finish task #87758. 2023-03-21 08:31:36 +00:00
wangyidong 6ecac70d85 * fix bug #33172. zentaopms_18.3 2023-03-21 15:44:47 +08:00
guofeilong acc21a3a4f * Adjust code . 2023-03-21 14:36:32 +08:00
hufangzhou 8660cc9663 * Remove the unsed code. 2023-03-21 14:18:26 +08:00
孙广明 da041f4b6c Merge branch 'sprint/hufangzhou_bug_closeBtn' into 'master'
* Fix bug for double close button.

See merge request easycorp/zentaopms!7258
2023-03-21 06:14:00 +00:00
hufangzhou 94d2b4de67 * Fix bug for double close button. 2023-03-21 14:12:50 +08:00
孙广明 5f20f3ad9c Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33127.

See merge request easycorp/zentaopms!7257
2023-03-21 06:04:36 +00:00
Yagami 3f307b913d * Fix bug #33154. 2023-03-21 14:02:36 +08:00
liumengyi 7d1d39187f * Fix bug #33139. 2023-03-21 05:39:04 +00:00
王怡栋 57d9038f3a Merge branch 'revertCode' into 'master'
* Revert the code.

See merge request easycorp/zentaopms!7256
2023-03-21 05:29:37 +00:00
王怡栋 cf737b035e Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33139, #33127

See merge request easycorp/zentaopms!7255
2023-03-21 05:27:39 +00:00
王怡栋 f51c04d4fc Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7252
2023-03-21 05:26:30 +00:00
王怡栋 0c1008f8a1 Merge branch 'hufangzhou_bug_33117' into 'master'
* Fix bug #33117.

See merge request easycorp/zentaopms!7250
2023-03-21 05:25:30 +00:00
hufangzhou d29643cf57 * Revert the code. 2023-03-21 13:25:02 +08:00