Commit Graph

59 Commits

Author SHA1 Message Date
liumengyi
af5fbbab18 * Fix bug of task #84584. 2023-02-15 08:17:12 +00:00
tianshujie
1e0346d696 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sortable 2023-02-14 13:32:06 +08:00
tianshujie
836ce16b03 * Code for finish task #84575. 2023-02-14 13:29:36 +08:00
liumengyi
7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +08:00
liumengyi
1aaefb79d3 * Fix bug of merge code. 2023-02-13 16:43:02 +08:00
liumengyi
f9daa6072b * Fix bug of merge code. 2023-02-13 16:35:51 +08:00
tianshujie
4f2ca7d709 * Merge master. 2023-02-13 14:27:49 +08:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
hufangzhou
aa48048939 * Modify the default value of acl when create sub-stage. 2023-02-10 08:16:45 +00:00
hufangzhou
652595112f * Finish task #83955. 2023-02-06 08:59:34 +00:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
zenggang
560a95f623 * Fix bug #28983 2022-10-27 05:27:32 +00:00
zenggang
f3f92631e3 * Fix bug#28983 2022-10-26 08:38:23 +00:00
Yagami
c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
liuhong
c44c768145 *Fix bug #25759 2022-08-04 02:11:40 +00:00
liuhong
2bd5412bb1 *Fix bug #25759 2022-08-04 02:05:07 +00:00
liuhong
b2f152d904 *Fix bug #25759 2022-08-04 01:40:59 +00:00
liuhong
868ee2d3fe *Fix bug #25759 2022-08-04 01:10:28 +00:00
leiyong
c85e72f4da * Adjust code. 2022-07-05 06:53:22 +00:00
leiyong
480f3f49a1 * Finish task#59523. 2022-07-05 06:32:05 +00:00
leiyong
a87a9bc2fb * Edit comments. 2022-06-17 02:06:02 +00:00
leiyong
1706ec6a42 * Remove spaces. 2022-06-17 02:01:46 +00:00
leiyong
ae55e2c31e * Fix bug#23841. 2022-06-17 01:30:09 +00:00
leiyong
80c03beea7 * Fix bug#23821. 2022-06-16 11:16:17 +00:00
leiyong
fcd6f4c333 * Finish task#56932. 2022-06-15 10:57:05 +00:00
leiyong
32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tanghucheng
cbec525102 * Fix bug #17602. 2022-04-24 13:55:08 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
孙华伟
9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
孙广明
62f755c3b2 * Finish task #50341. 2022-03-07 15:28:52 +08:00
liumengyi
119fde1713 * Finish task #50341. 2022-03-07 13:56:51 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhouxin
d34b83cd96 Fix bug #18201. 2022-01-05 05:54:10 +00:00
zhouxin
ee431f18e3 Fix bug #18199. 2022-01-05 05:09:08 +00:00
zhouxin
d44067f4e6 Fix a bug. 2022-01-04 07:31:20 +00:00
zhouxin
68647da31c Finish task #46683. 2022-01-04 01:57:16 +00:00
zhouxin
2e79c5f869 Finish task #46679 and fix a bug. 2021-12-29 03:49:17 +00:00
tanghucheng
30d1e22dca * Merge programplan into stage. 2021-12-03 13:57:08 +08:00
孙广明
75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
Yagami
774eceaf1d * Merge code. 2021-02-25 13:28:21 +08:00
holan20180123
b04e04c186 * Finish task #8988. 2021-01-21 15:42:54 +08:00
holan20180123
a5607fbb6b * Finish task #8988. 2021-01-18 10:16:36 +08:00
holan20180123
907dfc23d7 * Finish task #8988. 2021-01-15 14:17:46 +08:00
holan20180123
b2e53cf935 * Finish task #8986,#9002. 2021-01-15 09:49:16 +08:00
holan20180123
6a2505f025 * Finish task #8989. 2021-01-13 17:24:38 +08:00
holan20180123
81128047cc * Finish task #8987. 2021-01-13 15:34:19 +08:00
qiyu-xie
df3d5186a7 * Finish task#8984. 2021-01-12 08:26:28 +08:00
tianshujie98
da954e3766 * Finish task #8534. 2020-11-26 15:26:38 +08:00