Commit Graph
24067 Commits
Author SHA1 Message Date
leiyong 5f325b5287 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 09:21:49 +00:00
Guanxiying 59e9eacc18 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 16:00:53 +08:00
Guanxiying a31a271e69 * Fix bug 12038. 2021-04-14 16:00:35 +08:00
Yagami 38f23c454e * Adjust code. 2021-04-14 15:52:29 +08:00
Yagami b1f9e04904 * Remove unused code. 2021-04-14 15:52:29 +08:00
Guanxiying 6453f7bed0 * Fix bugs. 2021-04-14 15:44:17 +08:00
Guanxiying 061bef299f * Fix save gitlab repo bug. 2021-04-14 15:00:36 +08:00
Guanxiying 2b760a4d18 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 14:56:13 +08:00
Guanxiying 0357b59014 * Hide password when edit gitlab repo. 2021-04-14 14:55:43 +08:00
Yagami 0568b470d3 * Adjust case field width. 2021-04-14 14:10:43 +08:00
Guanxiying 87f49eb3e1 * Merge gitlab codes. 2021-04-14 13:19:33 +08:00
Guanxiying 7a5d0100a7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 12:01:57 +08:00
Guanxiying 291702e3f5 * Add gitlab type to repo type list. 2021-04-14 12:01:10 +08:00
Guanxiying bffb33fcbc * Add gitlab config. 2021-04-14 12:00:32 +08:00
tianshujie98 b9d0de87db * Fix bug #11858. 2021-04-14 11:45:12 +08:00
leiyong 5b7e640d49 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 03:35:56 +00:00
holan20180123 20be4489cb * Fix bug #11797. 2021-04-14 11:19:13 +08:00
tianshujie98 5c810f2420 * Fix bug #11005. 2021-04-14 11:18:29 +08:00
qiyu-xie 941304aae6 * Fix bug#11371. 2021-04-14 10:51:51 +08:00
tianshujie98 5d74fc96d2 * Fix bug #12030. 2021-04-14 10:46:54 +08:00
tianshujie98 068411733c * Fix bug #11060. 2021-04-14 10:36:11 +08:00
Yagami 6dc7aa8f58 * Fix doc link. 2021-04-14 10:13:01 +08:00
leiyong e2dd43497c Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 02:10:59 +00:00
tianshujie98 4b6f98f3cc * Fix bug #6952. 2021-04-14 10:10:54 +08:00
qiyu-xie eee47cabc8 * Fix bug#11396. 2021-04-14 10:08:50 +08:00
leiyong 193924c498 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 02:06:41 +00:00
leiyong 84f243d051 * Fix bug. 2021-04-14 02:06:35 +00:00
Yagami 352fcc29b9 * Add upgrade logic. 2021-04-14 10:01:59 +08:00
leiyong 18840c71a4 * Adjust code. 2021-04-14 02:01:46 +00:00
holan20180123 fd56c9d71c * Fix bug #11915. 2021-04-14 10:01:22 +08:00
tianshujie98 37791e8bfe Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 09:53:12 +08:00
tianshujie98 ba56961f03 * Fix bug #11544. 2021-04-14 09:52:47 +08:00
Yagami 16d12813c4 * Remove comment for execution setMenu. 2021-04-14 09:48:03 +08:00
Yagami 909b3d9e13 * Fix doc details. 2021-04-14 09:44:14 +08:00
tianshujie98 c9ae331403 * Fix bug #11495. 2021-04-14 09:37:43 +08:00
holan20180123 8f861c26af * Fix bug #11940. 2021-04-14 09:37:09 +08:00
hufangzhou c946ff50b3 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 09:15:30 +08:00
hufangzhou 2d6c45d5b1 * Fix bug #12028. 2021-04-14 09:15:27 +08:00
holan20180123 a581008314 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 08:51:06 +08:00
holan20180123 198bffa755 * Fix bug #11842. 2021-04-14 08:50:50 +08:00
hufangzhou 0d6c6f10e8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 08:33:19 +08:00
hufangzhou 47993648c4 * Fix bug #12027. 2021-04-14 08:33:16 +08:00
leiyong 86d44e25a6 * Fix bug. 2021-04-13 16:00:45 +00:00
holan20180123 68bca5dcf6 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-13 16:51:48 +08:00
holan20180123 bcbf9b6ac4 * Fix bug #11966. 2021-04-13 16:51:32 +08:00
hufangzhou 025c95c77f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-13 16:38:56 +08:00
hufangzhou bcc7a99a4b * Fix bug #11128. 2021-04-13 16:38:52 +08:00
Yagami a1ee0caa3f * Adjust doc code. 2021-04-13 16:31:33 +08:00
holan20180123 1ccb76c487 * Fix product doc lib acl error. 2021-04-13 16:18:46 +08:00
qiyu-xie 42bda40735 * Fix bug#11075. 2021-04-13 15:41:11 +08:00