Commit Graph
23865 Commits
Author SHA1 Message Date
leiyong 2017cb2c80 * Fix bug#11896. 2021-04-08 10:51:43 +03:00
Yagami 703ed680db * Fix lang file. 2021-04-08 15:42:43 +08:00
Yagami 6c23c0a1bc * Fix bug #11920. 2021-04-08 15:29:58 +08:00
tianshujie98 9b05e05bb5 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 15:24:45 +08:00
tianshujie98 ee800c9b72 * Fix bug #11864. 2021-04-08 15:24:14 +08:00
hufangzhou 666748f707 * Fix bug #11162. 2021-04-08 15:20:32 +08:00
hufangzhou 27931276a2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 15:19:30 +08:00
hufangzhou e5dd0e98fc * Finish task #37288. 2021-04-08 15:19:25 +08:00
Yagami ba89a45150 * Fix icon. 2021-04-08 15:13:52 +08:00
tianshujie98 1bdc854229 * Fix edit doc error. 2021-04-08 15:08:25 +08:00
Yagami b9736fc551 * Code for task #37122. 2021-04-08 15:02:34 +08:00
Yagami ca96ce81e0 * Fix icon size. 2021-04-08 13:52:27 +08:00
hufangzhou 14d2e1b8aa Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 13:51:25 +08:00
hufangzhou 5e8fab3dd2 * Finish task #37277. 2021-04-08 13:51:18 +08:00
wangyidong 104b82e50f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 13:35:09 +08:00
wangyidong bb490ddbdc * Adjust for security leaks. 2021-04-08 13:34:47 +08:00
Yagami 7154d5113d * Fix an error. 2021-04-08 13:29:43 +08:00
Catouse 7e0c64726c * auto adjust navbar position to prevent overlay with heading. 2021-04-08 13:03:00 +08:00
Yagami 9ad024ce50 * Fix block link. zentaopms_15.0.rc1_20200408 2021-04-08 13:01:01 +08:00
Yagami 94e2d9d56a * Code for task #37108. 2021-04-08 11:29:17 +08:00
Catouse 8a114befb5 * auto adjust navbar position to prevent overlay with heading. 2021-04-08 11:24:32 +08:00
leiyong 26de022cd1 * Fix bug. 2021-04-08 05:48:42 +03:00
wangyidong 8a031d2ca4 * fix bug #11889. 2021-04-08 10:45:52 +08:00
leiyong 7ed7497a92 * Add traditional language item. 2021-04-08 05:10:07 +03:00
Yagami 4ff14d4a07 * Add bug title min-width. 2021-04-08 10:01:37 +08:00
leiyong 08305c6385 * Fix bug#11837. 2021-04-08 04:09:17 +03:00
wangyidong 0dc863da3a * change for set cookie secure. 2021-04-07 17:44:25 +08:00
wangyidong c5cb1aa479 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 17:41:07 +08:00
wangyidong 4a902c7e75 * adjust for 15. 2021-04-07 17:40:05 +08:00
leiyong 4469f64918 * Fix bug#11837. 2021-04-07 12:27:12 +03:00
holan20180123 6701530b1d * Finish task #37114. 2021-04-07 16:52:41 +08:00
qiyu-xie 1de3c951bf * Finish task#37265. 2021-04-07 16:49:21 +08:00
holan20180123 d0aeb07ac2 * Fix bug #11869. 2021-04-07 16:33:03 +08:00
hufangzhou 04068cd52f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 16:20:23 +08:00
hufangzhou d53140f21c * Fix an error. 2021-04-07 16:20:20 +08:00
wangyidong 75425fc30b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 16:16:26 +08:00
wangyidong 9db96ad4d5 * adjust for get product project. 2021-04-07 16:15:45 +08:00
Yagami f196a7677b * Fix lang. zentaopms_15.0.rc1_20210407 2021-04-07 15:55:15 +08:00
qiyu-xie 117c091bd8 * Adjust the code. 2021-04-07 15:54:00 +08:00
holan20180123 423374e11d Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 15:43:18 +08:00
holan20180123 a25955e575 * Fix bug #11006. 2021-04-07 15:43:06 +08:00
Catouse 7289ddbf26 * skip handle modalTrigger which is inited from js on click to prevent show modal in page. 2021-04-07 15:38:35 +08:00
Yagami 2aa8faf599 * Remove iframe. 2021-04-07 15:30:10 +08:00
qiyu-xie ac02e2ed87 * Finish task #37040. 2021-04-07 15:25:18 +08:00
wangyidong 5aae5b88c1 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 14:53:43 +08:00
wangyidong c1fdb0bbc0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 14:53:01 +08:00
Yagami cbb68c1f9e * Fix bug. 2021-04-07 14:51:49 +08:00
wangyidong f7f7bdc651 * adjust for upgrade. 2021-04-07 14:50:40 +08:00
wangyidong e0068f3bdc * adjust for flow. 2021-04-07 14:45:44 +08:00
wangyidong 0ca7f575aa * adjust upgrade. 2021-04-07 14:45:13 +08:00