Commit Graph

1112 Commits

Author SHA1 Message Date
孙广明
b34e312e86 * Fix bug #31353. 2022-12-30 14:18:50 +08:00
Lufei
c3244b958f * Fix search style error in execution view page. 2022-12-19 16:36:14 +08:00
lanzongjun
0a492b61fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-13 09:08:08 +08:00
lanzongjun
d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
Yagami
92ba115642 * Finish task #79460. 2022-12-12 15:57:05 +08:00
Yagami
8a5d1a8e04 * Finish task #79461. 2022-12-12 15:22:45 +08:00
Yagami
b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
孙广明
8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
lanzongjun
d07a8a3e37 * Fix Bug #78695 2022-12-09 13:44:48 +08:00
wangyidong
f1b27ca35a * fix bug #30745. 2022-12-09 12:23:09 +08:00
孙广明
688866a30e Merge branch 'master_xieqiyu_78668' into 'master'
* Finish task#78668.

See merge request easycorp/zentaopms!6488
2022-12-07 05:01:49 +00:00
xieqiyu
afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
wangyidong
595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
Yagami
55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
wangyidong
fdc4c4159f * adjust for icon. 2022-12-05 10:29:48 +08:00
wangyidong
42e85ebbb8 * code for task #78384. 2022-12-05 10:10:59 +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
王怡栋
7013e19604 Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
2022-12-01 07:54:50 +00:00
chaideqing
6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing
bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
wangyidong
b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
王怡栋
67a0be29e7 * fix bug. 2022-11-25 13:59:22 +08:00
wangyuting
6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
lanzongjun
675891f136 * Fix Bug #30028 2022-11-24 14:26:27 +08:00
王怡栋
db4bd4ebd6 * fix bug #29996. 2022-11-23 13:12:53 +08:00
Yagami
a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
xieqiyu
c35c8bbcad * Fix bug#30036. 2022-11-21 14:20:03 +08:00
王怡栋
223546510d Merge branch 'zentaopms_263_bug#29561' into 'master'
* Fix bug #29561.

See merge request easycorp/zentaopms!6270
2022-11-21 05:27:16 +00:00
王怡栋
d9e22f5976 * fix bug #29670. 2022-11-21 10:48:07 +08:00
wangyuting
bddf9e6602 * Fix bug #29561. 2022-11-21 02:37:08 +00:00
xieqiyu
bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00
王怡栋
40e9827d45 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6260
2022-11-18 08:29:41 +00:00
王怡栋
28f7de276c Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.

See merge request easycorp/zentaopms!6252
2022-11-18 07:22:17 +00:00
xieqiyu
de8cfb9fec * Fix bug#29997. 2022-11-18 15:19:18 +08:00
lanzongjun
35fd254797 * Fix bug create execution 2022-11-18 14:57:52 +08:00
tianshujie
6faaaf865c * Fix bug #29847. 2022-11-18 14:24:41 +08:00
lanzongjun
ccbf2ee9eb * Fix task #76414 2022-11-18 09:59:39 +08:00
lanzongjun
85a5d00a53 * Fix bug #29947 2022-11-17 16:03:27 +08:00
caoyanyi
4d90d01042 * Fix bug #29835. 2022-11-16 09:38:27 +08:00
王怡栋
ab5e0d9b4a Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/execution/control.php
2022-11-15 08:26:48 +00:00
王怡栋
1890c90011 Merge branch 'zentaopms_258_bug#29694' into 'master'
* Fix bug #29694.

See merge request easycorp/zentaopms!6161
2022-11-15 08:18:56 +00:00
孙广明
093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
lanzongjun
df7841c7b7 * finish task #75920 2022-11-15 15:50:05 +08:00
wangyuting
aed6871cd8 * Fix bug #29694. 2022-11-15 05:20:46 +00:00
xieqiyu
e2d3a349cc * Fix bug#29531. 2022-11-15 10:55:39 +08:00
xieqiyu
6534d1b7ef * Fix bug#29531. 2022-11-15 10:27:50 +08:00
lanzongjun
4d4b1565f4 * finish task #75923#75924 2022-11-15 10:23:54 +08:00
lanzongjun
9cc5139a08 * finish task #75919 2022-11-15 09:53:24 +08:00