Commit Graph

824 Commits

Author SHA1 Message Date
liuhong
40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
王怡栋
5ce0bb3c97 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389 :if delete execution directly the execute is empty.

See merge request easycorp/zentaopms!6793
2023-01-29 08:49:21 +00:00
liuhong
3a2ef158b5 * Fix bug #30389 :if delete execution directly the execute is empty. 2023-01-29 08:00:24 +00:00
caoyanyi
152ec6b49c * Add test case and remove unused function. 2023-01-29 13:58:40 +08:00
xieqiyu
62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
caoyanyi
5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
Yagami
e9f88d3cbd * Fix code error. 2023-01-05 13:59:41 +08:00
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
xieqiyu
2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
wangyidong
489d7aa695 * fix bug save lastExecution. 2022-12-26 16:21:09 +08:00
liugang
8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
宋辰轩
c0933cea53 * Fix execution view burn. 2022-12-23 10:57:52 +08:00
宋辰轩
c0f84b7f29 * Modify burn chart . 2022-12-23 10:49:21 +08:00
xieqiyu
fa65b4a6e0 * Code for task#79440. 2022-12-15 13:43:08 +08:00
孙广明
9648b48513 * Finish task #79457. 2022-12-14 09:45:36 +08:00
lanzongjun
d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
lanzongjun
980b2998ad * Fix Bug #78688 2022-12-09 13:58:10 +08:00
xieqiyu
44c075b0ae * Fix bug#30613. 2022-12-08 09:50:30 +08:00
xieqiyu
a2d2c55e94 * Code for task#78668. Add trim. 2022-12-07 11:25:41 +08:00
xieqiyu
afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
lanzongjun
cb6f17a43e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-07 09:13:19 +08:00
hufangzhou
871eb1c0a3 * Fix bug #30500. 2022-12-06 09:20:32 +00:00
lanzongjun
55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
lanzongjun
7bef1eaf28 * Finish Task #78670 2022-12-05 11:22:24 +08:00
Yagami
3c088eb548 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 15:59:02 +08:00
Yagami
d7d897a8f7 * Fix code error. 2022-12-02 15:58:52 +08:00
lanzongjun
a0c214eace * fix bug #30475 2022-12-02 15:54:05 +08:00
lanzongjun
a1bd34b3ce * fix bug #30496 2022-12-02 15:32:36 +08:00
Yagami
dbc00993c6 * Fix execution manage products bug. 2022-12-02 13:42:09 +08:00
Yagami
8cb3e136d3 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 10:48:11 +08:00
Yagami
32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
liumengyi
a6c8171286 * Fix bug #30278. 2022-12-01 10:33:59 +08:00
lanzongjun
65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
lanzongjun
9eebd0051d * Finish Task #77799 2022-11-30 13:44:25 +08:00
lanzongjun
ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
lanzongjun
d671be8b02 project link plan tips 2022-11-29 16:22:24 +08:00
lanzongjun
9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
xieqiyu
79a9c38403 * Delete unused code. 2022-11-25 15:11:54 +08:00
wangyuting
6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
lanzongjun
13d7490288 * Fix Task #77263 2022-11-23 09:39:10 +08:00
lanzongjun
1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
Yagami
a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
lanzongjun
8b84363de8 * Fix task #76483 2022-11-21 10:58:48 +08:00
王怡栋
e55339258b Merge branch 'master_feedback_1353' into 'master'
* Resolved feedback #1353.

See merge request easycorp/zentaopms!6015
2022-11-21 01:16:39 +00:00
daitingting
ef60d89f47 * Fix bug #29653. 2022-11-18 02:55:33 +00: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
王怡栋
e969873a84 Merge branch 'zentaopms_258_bug#29692' into 'master'
* Fix bug #29692.

See merge request easycorp/zentaopms!6190
2022-11-16 07:26:48 +00:00
王怡栋
dfbe3f202e Merge branch 'zentaopms_258_bug#29704' into 'master'
* Fix bug #29704.

See merge request easycorp/zentaopms!6189
2022-11-16 07:26:31 +00:00