Commit Graph
23987 Commits
Author SHA1 Message Date
zhujinyong 6077c2ea7f * Fix mainNav divider. 2021-04-12 22:15:45 +08:00
Catouse 81a93f961a * fix search-list position on dropup with small distance to window top. 2021-04-12 21:17:27 +08:00
zhujinyong 4aac098b3f * Fix menu divider. 2021-04-12 17:27:05 +08:00
Yagami 28b24ac1ce * Remove program icon. 2021-04-12 17:18:06 +08:00
hufangzhou 468bfcf4b7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 17:09:15 +08:00
hufangzhou 51da5b5b4e * Finish task #37403. 2021-04-12 17:09:08 +08:00
wangyidong 39e069bec7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 16:58:26 +08:00
wangyidong 2e73f5c071 * fix bug. 2021-04-12 16:56:47 +08:00
Yagami 134b8d21ef * Fix demo.sql. 2021-04-12 16:51:48 +08:00
Catouse 869f175505 * force to open user-login/logout in parent window. 2021-04-12 16:47:06 +08:00
Catouse 4b0c06412d * fix search-list style in dropMenu. 2021-04-12 16:39:51 +08:00
Yagami e6048dfe8d * Fix repo bug. 2021-04-12 16:27:51 +08:00
hufangzhou 7a59c36eaf Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 16:27:23 +08:00
Catouse d8185adb63 * fix table sorter not work in block with rows count larger than 10 after refresh block. 2021-04-12 16:27:21 +08:00
hufangzhou 805eae57f0 * Fix bug #12009. 2021-04-12 16:27:19 +08:00
qiyu-xie eef102a26b * Fix bug#12006. 2021-04-12 16:19:25 +08:00
qiyu-xie bcc8fc401f * Finish task#37387. 2021-04-12 16:05:29 +08:00
Yagami 8a6ec7e152 * Fix bug. 2021-04-12 15:59:15 +08:00
Yagami 32ec8691e8 * Fix bug #11987. 2021-04-12 15:49:11 +08:00
leiyong 75d1a75a57 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 10:23:01 +03:00
leiyong e558b28a24 * Fix bug#11971. 2021-04-12 10:22:56 +03:00
Yagami 09d1557787 * Fix stakeholder view link. 2021-04-12 15:22:54 +08:00
tianshujie98 a69c7d2125 * Finish task 37381. 2021-04-12 14:56:25 +08:00
wangyidong 5b6353523f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 14:48:37 +08:00
wangyidong d6cbac7df4 * fix bug. 2021-04-12 14:47:50 +08:00
Yagami fee3eff032 * Fix sql. 2021-04-12 14:45:55 +08:00
tianshujie98 e47df9246c * Finish task #37391. 2021-04-12 14:13:32 +08:00
qiyu-xie 5a708667ba * Finish task#37386. 2021-04-12 14:04:26 +08:00
Yagami c97792dd90 * Fix bug #11989. 2021-04-12 13:31:15 +08:00
hufangzhou f200196ff0 * Finish task #37402. 2021-04-12 13:28:22 +08:00
Yagami b2314e26ee * Fix table assign css. 2021-04-12 13:18:28 +08:00
Yagami a92b40e1b2 * Fix bug #37388. 2021-04-12 13:16:15 +08:00
tianshujie98 2883c2e05c * Finish task #37405. 2021-04-12 13:07:03 +08:00
wangyidong d75672885d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 10:31:20 +08:00
wangyidong 403b4b3760 * finish task #37271. 2021-04-12 10:31:00 +08:00
hufangzhou b8138c41cc * Fix bug #11953. 2021-04-12 10:27:45 +08:00
holan20180123 36c004af26 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 10:14:34 +08:00
holan20180123 182f6b9acd * Fix bug #11980. 2021-04-12 10:14:12 +08:00
leiyong 2220d9493a * Repair error. 2021-04-12 04:59:25 +03:00
holan20180123 6f46353bd2 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 09:54:00 +08:00
holan20180123 ba26806e18 * Fix bug #11974. 2021-04-12 09:53:41 +08:00
Yagami 1f29a2c621 * Fix bug #11979. 2021-04-12 09:53:40 +08:00
Yagami ea67994c31 * Fix bug #11979. 2021-04-12 09:48:57 +08:00
hufangzhou 72ce1729b9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 09:31:17 +08:00
hufangzhou 7528daadd1 * Fix bug #11952. 2021-04-12 09:31:13 +08:00
tianshujie98 02c4f87a96 * Fix edit document error. 2021-04-12 09:09:29 +08:00
leiyong a09f161ee9 * Fix bug. 2021-04-09 13:33:43 +03:00
leiyong d0e21dee63 * Fix bug. 2021-04-09 13:16:24 +03:00
Yagami b89e3d0665 * Fix Version. 2021-04-09 17:13:32 +08:00
wangyidong 3da94c38fa Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:53:57 +08:00