Commit Graph

88 Commits

Author SHA1 Message Date
Yagami
20f4e15a72 * Fix bug #35428. 2023-05-19 14:05:10 +08:00
Yagami
f3cafbbed9 * Finish task #93378. 2023-05-18 13:06:23 +08:00
Yagami
b94a69a0b8 * Finish task #92304. 2023-05-06 16:21:28 +08:00
liumengyi
c5083612cb * Fix bug #33127. 2023-03-21 02:31:54 +00:00
tianshujie
665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
Yagami
f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
孙广明
f4d8409742 Merge branch 'fixbug_liumengyi_32559' into 'master'
* Fix bug 32558.

See merge request easycorp/zentaopms!7111
2023-03-01 07:50:35 +00:00
liumengyi
fcf2ca081f * Fix bug #32559. 2023-03-01 07:44:17 +00:00
liumengyi
ba064c9aa8 * Fix bug #32559. 2023-03-01 07:05:35 +00:00
liumengyi
33903ea9cb * Fix bug #32456. 2023-02-28 01:55:52 +00:00
liumengyi
226f798470 * Finish task #85631. 2023-02-27 08:08:07 +00:00
liumengyi
f2d6a76c93 * Modify method to management method. 2023-02-24 02:07:22 +00:00
孙广明
61bc2f5a3a Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug #32183, #32400..

See merge request easycorp/zentaopms!7049
2023-02-23 04:02:22 +00:00
liumengyi
c7be7a041e * Fix bug #32400. 2023-02-23 02:53:21 +00:00
hufangzhou
42ffe61dc4 * Fix the bug of has product waterfall project. 2023-02-23 01:55:24 +00:00
孙广明
0b0d592647 Merge branch 'wxp_bug32388' into 'master'
* Fix bug #32388.

See merge request easycorp/zentaopms!7039
2023-02-22 09:07:13 +00:00
hufangzhou
553d78a8b3 * Fix bug #32372, #32373. 2023-02-22 09:05:53 +00:00
wangxuepeng
7ce34db406 * Fix bug #32388. 2023-02-22 08:56:08 +00:00
tianshujie
af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
tianshujie
deae64dcd1 * Add a prompt for the execution type. 2023-02-22 10:38:25 +08:00
hufangzhou
dc40747000 * Finish task #85051. 2023-02-21 05:14:28 +00:00
liumengyi
6a9b3fc6e4 * Fix bug #32243. 2023-02-17 06:26:19 +00:00
liumengyi
7501362a58 * Finish task #84591. 2023-02-16 06:34:10 +00:00
tianshujie
484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi
b9ae54ede7 * Fix bug of task #84592. 2023-02-15 08:58:18 +00:00
liumengyi
f12271a1f2 * Finish task #84592. 2023-02-14 16:24:14 +08:00
hufangzhou
aa909099a4 * Fix sub-stage's attribute bug in execution-edit page. 2023-02-08 13:58:55 +08:00
liumengyi
165e7f5bb0 * Optimize code for task #83214. 2023-01-30 15:32:59 +08:00
liumengyi
8f17a289b3 * Finish task #83214. 2023-01-30 15:23:59 +08:00
孙广明
b34e312e86 * Fix bug #31353. 2022-12-30 14:18:50 +08:00
Yagami
dbc00993c6 * Fix execution manage products bug. 2022-12-02 13:42:09 +08:00
Yagami
32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
daitingting
0bacaf044c * Fix bug #28928, #28930. 2022-10-28 06:09:33 +00:00
daitingting
3442f50905 * Fix bug for task #71572. 2022-10-26 05:31:07 +00:00
tanghucheng
cf00a736a1 * Finish task #73241. 2022-10-26 09:03:24 +08:00
daitingting
6750bed454 * Finish task #71572. 2022-10-20 01:41:01 +00:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
xieqiyu
45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
tanghucheng
14dd9807e9 * Finish task #69006. 2022-09-16 13:13:26 +08:00
liuyongkai
4f60c73ab5 * Fix bug #26364 2022-08-12 08:52:29 +00:00
mayue
b7310d4748 * Fix bug 25891. 2022-08-11 10:12:23 +08:00
liuyongkai
fd46c9fd62 * Fix bug of xiangmu 2022-08-10 09:15:36 +00:00
liumengyi
5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
tianshujie
e8603eef32 * Finish task #61181. 2022-07-19 15:25:43 +08:00
leiyong
f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
王怡栋
77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
liumengyi
4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00