Commit Graph
23531 Commits
Author SHA1 Message Date
zhujinyong 3a03f8b613 * Fix menu switch. 2021-04-01 07:52:56 +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
wangyidong faf5134ab3 * fix bug #11064. 2021-03-31 13:41:37 +08:00
Catouse a6bf76a326 * use $.apps.open instead of browser navigation on click links in pages. 2021-03-31 13:36:24 +08:00
Yagami 71de6b2e96 * Fix bug. 2021-03-31 13:34:04 +08:00
holan20180123 84166afde0 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 13:22:59 +08:00
holan20180123 ea9cc9cb2f * Finish task #37099. 2021-03-31 13:22:46 +08:00
qiyu-xie e325f99179 * Fix bug#11057. 2021-03-31 13:05:49 +08:00
Yagami 00093da4e8 * Fix bug #11698. 2021-03-31 11:44:36 +08:00
hufangzhou b75fa5c4a2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 11:35:18 +08:00
hufangzhou 8270948126 * Fix a bug. 2021-03-31 11:35:10 +08:00
wangyidong b69c4a9a2a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 11:31:08 +08:00
wangyidong bbda48740f * fix bug #11040. 2021-03-31 11:30:52 +08:00
Yagami 647e3db31d * Fix bug. 2021-03-31 11:16:27 +08:00
Catouse d9910cc561 * change minWidth to 250px for #dropMenu again. 2021-03-31 11:08:32 +08:00
holan20180123 95dcb759e0 * Finish task #37103. 2021-03-31 11:02:09 +08:00
Catouse 3836495437 * change minWidth to 250px for #dropMenu. 2021-03-31 11:00:56 +08:00
Yagami 5c59c161e5 * Fix bugs. 2021-03-31 10:57:34 +08:00
qiyu-xie 810ef4a465 * Fix bug#11660. 2021-03-31 10:51:35 +08:00
holan20180123 40d1401dca * Finish task #37111. 2021-03-31 10:41:39 +08:00
Yagami 2034dbd3a3 * Fix bug #6954. 2021-03-31 10:40:50 +08:00
Yagami cb439b1102 * Fix menu. 2021-03-31 10:40:50 +08:00
wangyidong 8e0491c487 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 10:39:13 +08:00