Commit Graph
23840 Commits
Author SHA1 Message Date
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
leiyong b94fa22b92 * Fix bug#11837. 2021-04-07 09:45:03 +03:00
tianshujie98 df6440c3d5 * Fix bug #11855. 2021-04-07 14:44:08 +08:00
hufangzhou 1fc283cdc0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-07 14:39:49 +08:00
hufangzhou bcabffb94b * Adjust the code. 2021-04-07 14:39:46 +08:00
Yagami 5d21cfb236 * Fix priv bug. 2021-04-07 14:35:11 +08:00
Yagami b50c55ffc2 * Fix project icon. 2021-04-07 14:18:01 +08:00
Yagami 82df33e205 * Fix bug. 2021-04-07 14:12:17 +08:00
holan20180123 7dae38a2a3 * Finish task #37295. 2021-04-07 14:05:37 +08:00
holan20180123 4794f0cb0b * Finish task #37114,37115. 2021-04-07 13:54:23 +08:00
leiyong a892be6db3 * Fix bug#11020,task#37298. 2021-04-07 08:26:52 +03:00
holan20180123 3e31b3961a * Finish task #37114. 2021-04-07 11:43:56 +08:00
holan20180123 f385acc4b5 * Finish task #37114. 2021-04-07 11:35:04 +08:00
leiyong a2f2b2ca69 * Fix bug#6943. 2021-04-06 11:48:40 +03:00
hufangzhou a09d9f3cf3 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-06 15:58:51 +08:00
hufangzhou 6b7f84c9ac * Fix bug #11162, #11261. 2021-04-06 15:58:48 +08:00
Yagami eaa478eaa4 * Fix bug. zentaopms_15.0.rc1_20210406 2021-04-06 14:43:07 +08:00
holan20180123 6e53b91a98 * Delete blank space. 2021-04-06 14:39:13 +08:00
Yagami d0de1bf57a * Fix code error. 2021-04-06 13:26:32 +08:00
qiyu-xie c4596e90fa * Fix bug#11721. 2021-04-06 13:20:58 +08:00
hufangzhou bb96f95cdd Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-06 13:08:39 +08:00
hufangzhou 0d17fad58d * Adjust the product view style. 2021-04-06 13:08:35 +08:00
leiyong e9a2d382ea * Fix bug#11151. 2021-04-06 06:46:21 +03:00
Yagami d743f24768 * Fix upgrade error. 2021-04-06 11:42:56 +08:00
holan20180123 bbf02b0ce9 * Fix testcase view error. 2021-04-06 11:27:29 +08:00
holan20180123 f5d16cda67 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-06 11:21:40 +08:00