Commit Graph
23552 Commits
Author SHA1 Message Date
holan20180123 e17648144b Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 17:15:51 +08:00
holan20180123 4c73b6a489 * Adjust hour unit. 2021-03-31 17:15:33 +08:00
leiyong 2296b03083 * Adjust code. 2021-03-31 12:15:23 +03:00
Yagami 4b37af11aa * Fix lang. 2021-03-31 17:07:49 +08:00
wangyidong ad5f261a37 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 17:04:56 +08:00
wangyidong 2537dd035b * fix bug #11352. 2021-03-31 17:04:11 +08:00
Yagami 32ce91bdde * Comment unused code. 2021-03-31 17:02:10 +08:00
Yagami eeeca403d7 * Fix menu. 2021-03-31 17:01:08 +08:00
leiyong e9f8347506 * Fix bug#11645. 2021-03-31 11:58:18 +03:00
wangyidong 1c9260eeca Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 16:49:56 +08:00
wangyidong 5dd5f12b1f * fix bug #11115. 2021-03-31 16:49:34 +08:00
leiyong b1c24577ee * Fix bug, 2021-03-31 11:49:23 +03:00
leiyong 7b971221a4 * Fix bug#11646. 2021-03-31 11:47:56 +03:00
tianshujie98 eddd75f15a * Fix bug #11157. 2021-03-31 16:32:06 +08:00
wangyidong 27317517dc Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 16:27:40 +08:00
wangyidong 0a32be6e2e * fix bug #11064. 2021-03-31 16:27:26 +08:00
holan20180123 819cec83ed * Finish task #37010. 2021-03-31 16:26:48 +08:00
holan20180123 2b8d2a2503 * Finish task #37002. 2021-03-31 16:24:24 +08:00
wangyidong 74a05d5e60 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 16:12:50 +08:00
wangyidong 66cee22b67 * fix bug #11145. 2021-03-31 16:12:35 +08:00
leiyong 623ce6b32f * Fix bug#11695. 2021-03-31 11:12:25 +03:00
holan20180123 9a010bf5ef * Finish task #37126. 2021-03-31 16:08:35 +08:00
zhujinyong 23d3e60c07 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 16:07:34 +08:00
zhujinyong d966b2e214 * Ajdust openApp logic. 2021-03-31 16:07:11 +08:00
tianshujie98 06209850d5 * Fix bug #11132. 2021-03-31 16:04:09 +08:00
holan20180123 a3e7399566 * Finish task #37027. 2021-03-31 15:51:06 +08:00
wangyidong 209b7a43b8 * fix bug #11142. 2021-03-31 15:44:24 +08:00
wangyidong bd991f876e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 15:33:20 +08:00
wangyidong 23fef68818 * fix bug #11131. 2021-03-31 15:33:03 +08:00
Yagami fcab5dd888 * Fix bug #11300. 2021-03-31 15:28:26 +08:00
holan20180123 be58f2de18 * Adjust header menu style. 2021-03-31 15:11:37 +08:00
leiyong bfe5c251cc * Fix bug#11701. 2021-03-31 10:11:07 +03:00
tianshujie98 7f359558c1 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 15:10:20 +08:00
tianshujie98 1f66357244 * Fix bug #11015,11024. 2021-03-31 15:09:50 +08:00
holan20180123 a859c4d23b * Adjust user menu style. 2021-03-31 14:51:16 +08:00
hufangzhou 6d0d014128 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 14:48:46 +08:00
hufangzhou 5763f0725f * Fix bug #11709. 2021-03-31 14:48:42 +08:00
Catouse 287af9adf7 * fix some dialog shake caused by size changed on load. 2021-03-31 14:44:13 +08:00
holan20180123 10766ec2b2 * Adjust header style. 2021-03-31 14:37:39 +08:00
Yagami 6997ad43af * Fix bug. 2021-03-31 14:28:14 +08:00
hufangzhou 72e975cbc7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 14:22:39 +08:00
hufangzhou b18abc006e * Fix bug #11706. 2021-03-31 14:22:36 +08:00
leiyong 599c274c52 * Fix bug#11708. 2021-03-31 09:19:03 +03:00
hufangzhou 6a349c3366 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 14:04:58 +08:00
hufangzhou bf9d1737ff * Fix bug #11681. 2021-03-31 14:04:54 +08:00
qiyu-xie 84baa56389 * Fix bug#11707. 2021-03-31 14:01:12 +08:00
leiyong a8051fdbfe * Adjust automation module. 2021-03-31 08:54:43 +03: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
wangyidong 17961041ca Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 13:42:00 +08:00