Commit Graph

186 Commits

Author SHA1 Message Date
孙广明
a09f51348b * Fix lang. 2022-07-14 10:45:29 +08:00
hufangzhou
d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
孙广明
105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
guofeilong
28c8b303da * add executionTable stage1 2022-07-07 05:24:57 +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
xieqiyu
678d8ae3d3 * Code for task#58578. 2022-06-30 10:33:20 +08:00
xieqiyu
38ba859322 * Code for task#58578. 2022-06-30 10:28:38 +08:00
tianshujie
7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08: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
mayue
37125b72bc * Finish task #55175. 2022-05-24 07:34:38 +00:00
hufangzhou
90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
tanghucheng
f67e77e4e6 * Fix bug for gantt. 2022-04-29 13:17:26 +08:00
tanghucheng
650db6bbf6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-04-28 16:49:58 +08:00
tanghucheng
ebde9241cf * Fix bug. 2022-04-28 16:49:03 +08:00
孙广明
e3ff7b36e6 * Fix bug #14997. 2022-04-28 13:28:09 +08:00
zenggang
f81b53bc38 * Fix bug#2942,15431,21981 2022-04-27 07:23:08 +00:00
wangyidong
701d007a9f * code for bug #22030. 2022-04-27 13:40:47 +08:00
李玉春
fe221fec43 Merge branch 'bug_21982' into 'master'
Fix bug#21982,21983,21981

See merge request easycorp/zentaopms!3122
2022-04-26 08:09:06 +00:00
zenggang
7688d211d3 * Fix bug#21981 2022-04-26 06:21:15 +00:00
tanghucheng
44fe7084c0 * Fix bug #10877. 2022-04-26 10:35:50 +08:00
tanghucheng
cbec525102 * Fix bug #17602. 2022-04-24 13:55:08 +08:00
王怡栋
f8ef430ad6 * fix error. 2022-04-22 10:59:30 +08:00
王怡栋
89e1854932 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-21 15:39:05 +08:00
王怡栋
7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
王怡栋
c5f4ad704e Merge branch 'fixbug' into 'master'
* Fix bug #19142.

See merge request easycorp/zentaopms!3041
2022-04-21 01:34:48 +00:00
王怡栋
54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
tanghucheng
12ebbad5c3 * Fix bug #19142. 2022-04-20 05:25:50 +00:00
xieqiyu
f100564e6a * Fix bug#21848. 2022-04-19 17:08:49 +08:00
xieqiyu
843c14c894 * Fix bug#6948. 2022-04-06 08:46:23 +08:00
tianshujie
b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
xieqiyu
e52f5c78b7 * Fix bug#21037. 2022-03-23 14:57:59 +08:00
zhouxin
30523ec374 Fix bug #17943. 2022-03-22 06:48:55 +00:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
李玉春
0e26c165c2 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
pailei2_sunhuawei_50407

See merge request easycorp/zentaopms!2319
2022-03-17 01:31:38 +00:00
孙华伟
9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
zhujinyong
489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
mayue
24320d7dc3 * Optimize code. 2022-03-16 08:30:41 +08:00
mayue
38d281825c * Fix bug #18395. 2022-03-15 16:41:04 +08:00
孙广明
6a6af4e1a2 * Fix weekly bug. 2022-03-13 15:08:54 +08:00
liumengyi
084d882f9b * Fix bug #50341. 2022-03-08 10:07:42 +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