Commit Graph
551 Commits
Author SHA1 Message Date
qiyu-xie eab73f9546 * Finish task#37039. 2021-04-01 11:30:54 +08:00
hufangzhou e3b6117235 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 11:27:57 +08:00
hufangzhou 75a531c422 * Finish task #37051. 2021-04-01 11:27:53 +08:00
qiyu-xie b04ca379f2 * Finish task#37050. 2021-04-01 11:25:29 +08:00
holan20180123 b12efb31ef * Finish task #37004. 2021-04-01 11:07:11 +08:00
qiyu-xie 74a1d60d91 * Finish task#37011. 2021-04-01 10:55:55 +08:00
tianshujie98 8daec0e8f5 * Finish task #37003. 2021-04-01 10:47:51 +08:00
holan20180123 4c73b6a489 * Adjust hour unit. 2021-03-31 17:15:33 +08:00
holan20180123 2b8d2a2503 * Finish task #37002. 2021-03-31 16:24:24 +08:00
holan20180123 a3e7399566 * Finish task #37027. 2021-03-31 15:51:06 +08:00
Yagami 399daad442 * Fix bug #11257. 2021-03-31 13:51:46 +08:00
holan20180123 21ab7ec3b2 * Finish task #37030. 2021-03-31 13:43:55 +08:00
Yagami 5c59c161e5 * Fix bugs. 2021-03-31 10:57:34 +08:00
qiyu-xie d371f402fc * Finish task#37011. 2021-03-30 16:30:24 +08:00
Yagami 2295ffd01c * Fix block link. 2021-03-30 16:26:13 +08:00
holan20180123 6ac7575072 * Finish task #37014. 2021-03-30 11:05:23 +08:00
holan20180123 a881b796dd * Finish task #37033. 2021-03-30 09:58:48 +08:00
qiyu-xie 669b0794ab * Fix bug#11577. 2021-03-29 16:42:09 +08:00
tianshujie98 a4307f0fc5 * Fix bug #11096. 2021-03-26 15:32:34 +08:00
tianshujie98 a4c865e7fd * Deal with more link issues in project blocks. 2021-03-26 12:16:56 +08:00
holan20180123 5b0010f846 * Adjust session and project lang. 2021-03-25 09:30:02 +08:00
leiyong c7782fdefd * Adjust block module. 2021-03-24 16:14:36 +08:00
Yagami 20cc1ae288 * Fix code. 2021-03-24 16:09:09 +08:00
holan20180123 deae7f5f9d * Fix bug #11254. 2021-03-22 11:37:11 +08:00
wangyidong f591dd9311 * change for PRJ. 2021-03-18 17:30:01 +08:00
wangyidong 9a5f56ff47 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-18 16:12:43 +08:00
Yagami 02c3db0e1c * Merge code. 2021-03-17 11:08:43 +08:00
wangyidong e43b1fd89e * fix bug. 2021-03-17 09:21:26 +08:00
Yagami 1241e1a769 * Fix code error. 2021-03-12 13:29:48 +08:00
qiyu-xie 1f407babdc * Fix bug. 2021-03-11 09:51:21 +08:00
zhujinyong c869d88cc2 * Fix css style of *.html.php 2021-03-10 23:35:56 +08:00
tianshujie98 33bcb0922e * Finish task #36438. 2021-03-09 17:28:23 +08:00
holan20180123 f0db2b971d Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-09 15:15:52 +08:00
holan20180123 032b89aaed * Adjust all executions lanague. 2021-03-09 15:15:28 +08:00
leiyong fb89b18fd9 * Adjust block module code. 2021-03-09 15:03:25 +08:00
qiyu-xie 3f4a0d9d5c * Finish task#36499. 2021-03-09 14:29:36 +08:00
Yagami 84622c3231 * Fix project details. 2021-03-09 14:07:45 +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
wangyidong e24eab6174 * adjust code. 2021-03-04 13:02:00 +08:00
Yagami 79e1029298 * Fix code review error. 2021-02-26 17:34:07 +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
qiyu-xie 9d17c0a8d3 * Project list block budget unit conversion. 2021-02-23 11:15:46 +08:00
qiyu-xie fc33d9e27a * Finish task#3833. 2021-01-29 13:44:21 +08:00
hufangzhou f885d7afd6 * Fix bug #3832. 2021-01-29 09:10:53 +08:00
Yagami ac77fa3a15 * Merge code. 2021-01-27 15:20:27 +08:00
qiyu-xie 64e01f669f * Finish task#9094. 2021-01-27 13:47:12 +08:00