Commit Graph

323 Commits

Author SHA1 Message Date
Yagami
18acf1cef6 * Fix progress block logic. 2021-06-29 16:24:26 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
tianshujie98
0c351122cd * Fix error. 2021-04-20 16:53:09 +08:00
tianshujie98
de1f0c0798 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 15:12:33 +08:00
tianshujie98
3fc650e112 * Fix bug #12176. 2021-04-16 15:12:16 +08:00
qiyu-xie
251ec077b6 * Fix a bug. 2021-04-16 14:38:47 +08:00
tianshujie98
4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
tianshujie98
8c1de08633 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 08:21:32 +08:00
tianshujie98
985101a0f0 * Adjust the language items of the block module. 2021-04-15 08:20:46 +08:00
Yagami
38f23c454e * Adjust code. 2021-04-14 15:52:29 +08:00
wangyidong
44a6ed5a8c * fix for bug #11891. 2021-04-09 12:11:48 +08:00
qiyu-xie
117c091bd8 * Adjust the code. 2021-04-07 15:54:00 +08:00
tianshujie98
690d4aa32a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 17:40:46 +08:00
tianshujie98
d0b6699671 * Finish task#37020. 2021-04-01 17:40:15 +08:00
hufangzhou
ee4864a30a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 15:48:24 +08:00
hufangzhou
24e7dd0e61 * Finish task #37035. 2021-04-01 15:48:18 +08:00
wangyidong
7567d4436a * fix error. 2021-04-01 15:23:01 +08:00
qiyu-xie
9db0c51417 * Finish task#37029. 2021-04-01 14:33:45 +08:00
hufangzhou
5b1a279c3d * Finish task #37041. 2021-04-01 13:24:56 +08:00
hufangzhou
75a531c422 * Finish task #37051. 2021-04-01 11:27:53 +08:00
wangyidong
faf5134ab3 * fix bug #11064. 2021-03-31 13:41:37 +08:00
holan20180123
a881b796dd * Finish task #37033. 2021-03-30 09:58:48 +08:00
holan20180123
39a4a0ce7c * Finish task #37033. 2021-03-29 16:44:15 +08:00
tianshujie98
a4c865e7fd * Deal with more link issues in project blocks. 2021-03-26 12:16:56 +08:00
leiyong
49d78a2bfb * Fix bug. 2021-03-25 11:38:45 +08:00
tianshujie98
36c99fed2f * Fix bug #11534. 2021-03-25 10:55:47 +08:00
leiyong
c7782fdefd * Adjust block module. 2021-03-24 16:14:36 +08:00
zhujinyong
28017454fa Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-22 11:47:44 +08:00
zhujinyong
c7313cefd6 * Fix setMenu of execution. 2021-03-22 11:44:09 +08:00
holan20180123
163a736f99 * Fix project index error. 2021-03-22 10:51:40 +08:00
holan20180123
7a2c83f5bc * Finish task #36760. 2021-03-18 09:02:48 +08:00
Yagami
d1e6e9265b * Rename project session to PRJ. 2021-03-09 15:29:06 +08:00
leiyong
fb89b18fd9 * Adjust block module code. 2021-03-09 15:03:25 +08:00
leiyong
c8c64bd05d * Adjust code. 2021-03-09 13:50:43 +08:00
leiyong
86b18553a7 * Adjust block module code. 2021-03-09 12:30:23 +08:00
Yagami
acad687e68 * Fix project block. 2021-03-09 11:18:08 +08:00
holan20180123
4caf65064c * Fix product,project error. 2021-03-08 15:47:09 +08:00
wangyidong
e24eab6174 * adjust code. 2021-03-04 13:02:00 +08:00
Yagami
cd59ba3da3 * Move workestimation. 2021-02-25 13:11:40 +08:00
Yagami
8415d3831a * Move durationestimation to max. 2021-02-25 13:03:05 +08:00
Yagami
ca9e3f907e * Move weekly to max. 2021-02-25 09:35:52 +08:00
leiyong
20075135ab * Finish task#36038. 2021-02-23 14:36:54 +08:00
qiyu-xie
e4a47518ea * Finish task#36154. 2021-02-20 11:10:46 +08:00
holan20180123
652aa74347 * Finish task #9030. 2021-01-13 08:28:59 +08:00
hufangzhou
30e13a49c8 * Finish task#8687. 2020-12-16 14:22:32 +08:00
qiyu-xie
f11c8319f7 * Finish task#8576. 2020-12-09 13:04:49 +08:00
leiyong
53df6f14e0 * Fix bug. 2020-12-09 09:42:15 +08:00
leiyong
467c593f20 * Fix bug. 2020-12-09 09:34:20 +08:00
leiyong
d990666ee6 * Fix bug. 2020-12-07 09:50:03 +08:00
leiyong
58f8f4b234 * Adjust code. 2020-12-04 13:48:23 +08:00