Commit Graph

24103 Commits

Author SHA1 Message Date
holan20180123
57450ee56e * Finish task #37526. 2021-04-15 14:51:10 +08:00
tianshujie98
1162c7a8a2 * Rename. 2021-04-15 14:47:24 +08:00
wangyidong
1e1c5e0f43 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:46:05 +08:00
wangyidong
04a5041611 * fix bug #12059. 2021-04-15 14:45:35 +08:00
tianshujie98
3162efb035 * Finish task #37535. 2021-04-15 14:44:46 +08:00
hufangzhou
035efe6bd4 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:38:55 +08:00
hufangzhou
e5a1820b05 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:38:44 +08:00
leiyong
ac7be952c9 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 06:38:42 +00:00
hufangzhou
c19ad08621 * Finish task #37530. 2021-04-15 14:38:39 +08:00
leiyong
bc26fa80a9 * Fix bug#37538. 2021-04-15 06:38:37 +00:00
holan20180123
460c24e27e * Finish task #37519. 2021-04-15 14:37:37 +08:00
Yagami
5647cfb066 * Adjust code detail. 2021-04-15 14:34:23 +08:00
tianshujie98
f496c74591 * Fix bug #11858. 2021-04-15 13:02:17 +08:00
holan20180123
a6e9f70abd * Finish task #37528. 2021-04-15 10:27:10 +08:00
tianshujie98
0604748623 * Fix bug #12049. 2021-04-15 10:13:38 +08:00
holan20180123
c399ec5280 * Finish task #37518. 2021-04-15 10:02:21 +08:00
Guanxiying
78895ace0a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 09:57:13 +08:00
Guanxiying
df90fbb77d * Fix skip field bug. 2021-04-15 09:57:00 +08:00
wangyidong
c4454bb6d9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 09:43:51 +08:00
wangyidong
bb3705495a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 09:43:40 +08:00
qiyu-xie
6d92f44c4b * Fix an error. 2021-04-15 09:43:39 +08:00
wangyidong
dbd5cef729 * finish task #37534. 2021-04-15 09:43:12 +08:00
tianshujie98
d5abe7f975 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 09:42:54 +08:00
tianshujie98
f2b30be51a * Finish task #37537. 2021-04-15 09:42:40 +08:00
qiyu-xie
8d5ac5bbc5 * Finish task#37525. 2021-04-15 09:38:05 +08:00
wangyidong
7f83505e7a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 09:35:00 +08:00
wangyidong
656b745a3e * adjust for doc dropmenu. 2021-04-15 09:34:36 +08:00
holan20180123
cf1eb77f7a * Finish task #37532. 2021-04-15 09:30:18 +08:00
holan20180123
d5fcc2fc1a * Finish task #37536. 2021-04-15 09:21:53 +08:00
hufangzhou
b0c6c5eb2a * Fix bug #12058. 2021-04-15 09:08:42 +08:00
tianshujie98
8c1de08633 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 08:21:32 +08:00
tianshujie98
985101a0f0 * Adjust the language items of the block module. 2021-04-15 08:20:46 +08: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
hufangzhou
dc69fda25a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 13:51:11 +08:00
leiyong
82c6522c97 * Adjust code. 2021-04-14 09:28:36 +00:00
leiyong
26aa38cf7e * Adjust code. 2021-04-14 09:22:21 +00:00
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
hufangzhou
77f7031226 * Fix a bug. 2021-04-14 13:51:07 +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