Commit Graph
2119 Commits
Author SHA1 Message Date
wangyuting 8c6753ea42 * Finish task #77140. 2022-11-22 06:03:51 +00:00
Yagami 02580a0465 * Cannot remove product link when story in execution. 2022-11-22 11:17:40 +08:00
孙广明 70eb171c39 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #76951

See merge request easycorp/zentaopms!6287
2022-11-22 02:04:54 +00:00
lanzongjun 0a5cd963cf * Fix Task #76951 2022-11-22 08:50:39 +08:00
王怡栋 7a47096356 * fix bug #30007. 2022-11-21 14:10:53 +08:00
王怡栋 d9e22f5976 * fix bug #29670. 2022-11-21 10:48:07 +08:00
xieqiyu bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00
王怡栋 1db91b628a Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695

See merge request easycorp/zentaopms!6258
2022-11-18 08:28:55 +00:00
lanzongjun 8ef4f02bf8 * Fix bug #29442#29695 2022-11-18 15:38:59 +08:00
王怡栋 350d74575e Merge branch 'master_xieqiyu_29990' into 'master'
* Fix bug#29990.

See merge request easycorp/zentaopms!6248
2022-11-18 07:20:08 +00:00
lanzongjun 0b2bb1a273 * Fix bug #29442#29695 2022-11-18 15:18:57 +08:00
xieqiyu 22499f1f96 * Fix bug#29990. 2022-11-18 11:22:09 +08:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
mayue 0d50c31c0c * Fix bug #29468. 2022-11-17 13:04:52 +08:00
mayue 5de7f12729 * Fix bug #29817. 2022-11-17 09:57:15 +08:00
孙广明 46a1701d05 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/project/lang/de.php
#   module/project/lang/en.php
#   module/project/lang/fr.php
2022-11-16 08:29:00 +00:00
lanzongjun d07579f5eb * fix bug #29877#29878 2022-11-16 15:52:08 +08:00
王怡栋 1a4d187866 Merge branch 'zentaopms261_wyd' into 'master'
* fix bug #29733.

See merge request easycorp/zentaopms!6187
2022-11-16 05:06:13 +00:00
王怡栋 e04c30fa3b * fix bug #29733. 2022-11-16 11:00:44 +08:00
wangyuting 61438d05cb * Fix bug #29705. 2022-11-16 02:34:34 +00:00
王怡栋 fc592d33d2 Merge branch 'fixbug' into 'master'
* Fix bug #29820.

See merge request easycorp/zentaopms!6169
2022-11-16 01:58:37 +00:00
tanghucheng d626bfbaef * Fix bug #29820. 2022-11-16 08:49:31 +08:00
daitingting 8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
王怡栋 575854c7dd Merge branch 'fixbug' into 'master'
* Fix bug #29749.

See merge request easycorp/zentaopms!6153
2022-11-15 05:31:35 +00:00
tanghucheng 9835f45987 * Fix bug #29749. 2022-11-15 13:09:44 +08:00
Yagami 8e481418df * Finish task #76107. 2022-11-14 16:20:32 +08:00
xieqiyu 5ee8a7e1ac * Fix bug#29441. 2022-11-14 14:46:19 +08:00
daitingting be40637a66 * Rename config->custom->feature. 2022-11-11 02:52:58 +00:00
王怡栋 3c83b8dbcb Merge branch 'fixbug' into 'master'
* Add gantt icon.

See merge request easycorp/zentaopms!6109
2022-11-11 01:57:19 +00:00
tanghucheng f017fddb67 * Add gantt icon. 2022-11-10 15:37:08 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
王怡栋 d8b1b0ba39 Merge branch 'zentaopms_258_task#75248' into 'master'
* Finish task #75248.

See merge request easycorp/zentaopms!6082
2022-11-09 08:00:04 +00:00
wangyidong b32f2af9b7 * code for task #75236. 2022-11-09 10:30:30 +08:00
wangyuting aed53849d1 * Finish task #75248. 2022-11-09 02:10:29 +00:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
wangyuting2 0cefde5d28 * Optimize code for review code. 2022-11-04 06:35:21 +00:00
lanzongjun 506e752d0e * fix bug #26290 2022-11-04 11:04:06 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting b163bd0f32 * Finish task #73985. 2022-11-02 02:09:34 +00:00
wangyidong 3a8ef27bec * code for task #73993. 2022-11-01 08:45:15 +08:00
daitingting a1cf2ccdf8 * Finish task #74159. 2022-10-31 05:56:40 +00:00
daitingting 6a2200647e * Fix bug #29073. 2022-10-28 09:08:37 +00:00
wangyidong 7050943933 * fix bug #29017. 2022-10-28 15:25:17 +08:00
李玉春 e5ddf25385 Merge branch 'sprint/253_tianshujie_fixbug' into 'master'
Sprint/253 tianshujie fixbug

See merge request easycorp/zentaopms!5927
2022-10-28 03:15:24 +00:00
tianshujie 8f10f11926 * Fix bug #29077. 2022-10-28 10:09:57 +08:00
caoyanyi 6c7e3e0253 * Modify project and execution view page style. 2022-10-28 09:31:09 +08:00
Yagami 1ec7f132ea * Code for edit product page. 2022-10-28 08:35:15 +08:00
Yagami a16b8f5e45 Merge branch 'zentaopms_252' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_252 2022-10-27 16:22:21 +08:00
Yagami bce03159e7 * Code for code review. 2022-10-27 16:22:09 +08:00