Commit Graph
25910 Commits
Author SHA1 Message Date
tianshujie98 f734d04bbc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-22 17:30:48 +08:00
tianshujie98 b10592575b * Finish task #40507. 2021-07-22 17:30:03 +08:00
qiyu-xie a10a069fd6 * Finish task#40514. 2021-07-22 16:00:23 +08:00
dingguodong 0db7f60ed2 * Change ajaxGetProductByRepo function. 2021-07-22 15:25:32 +08:00
holan20180123 f91513425f * Finish task #40491. 2021-07-22 14:59:11 +08:00
Yagami 048ec8020b * Code for bug #13766. 2021-07-22 14:57:15 +08:00
qiyu-xie 5a25b835ff * Finish task#40512. 2021-07-22 14:40:05 +08:00
qiyu-xie 39dd1339ba * Finish task#40512. 2021-07-22 14:32:13 +08:00
qiyu-xie 94d2a7e781 * Adjust code. 2021-07-22 14:14:34 +08:00
holan20180123 d06c0b12f2 * Finish task #40490. 2021-07-22 14:06:03 +08:00
qiyu-xie 101a8a16b5 * Finish task#40489. 2021-07-22 14:02:39 +08:00
Yagami 7d2733396d * Fix bug #13766. 2021-07-22 13:53:24 +08:00
qiyu-xie 599e51660b * Finish task#40489. 2021-07-22 13:39:59 +08:00
holan20180123 260c129f30 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-22 11:33:43 +08:00
holan20180123 90c3ce0e81 * Finish task #40503. 2021-07-22 11:33:29 +08:00
hufangzhou 17780ea4a1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-22 11:01:29 +08:00
hufangzhou fb9d13856b * Finish task #40495. 2021-07-22 11:01:23 +08:00
tianshujie98 85d80014dd * Finish task #40510. 2021-07-22 10:48:06 +08:00
hufangzhou 85e974c7a1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-22 10:46:13 +08:00
hufangzhou dd4372e1eb * Finish task #40494. 2021-07-22 10:46:08 +08:00
dingguodong 1b03630493 + Add getting product by repo. 2021-07-22 10:42:30 +08:00
hufangzhou 6b57df2abc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-22 10:37:43 +08:00
hufangzhou 1f81cb5c18 * Finish task #40493. 2021-07-22 10:37:39 +08:00
qiyu-xie 7de636609c * Finish task#40512. 2021-07-22 10:28:48 +08:00
qiyu-xie 94ba06cf2a * Finish task#40511. 2021-07-22 10:23:28 +08:00
tianshujie98 6cfa9a5878 * Finish task #40508. 2021-07-22 10:04:09 +08:00
dingguodong daf877dfb6 * Add gitlab to pipeline job(staging). 2021-07-22 09:30:46 +08:00
dingguodong bbf8e0b88b * Rename function name for jenkins. 2021-07-22 09:29:52 +08:00
dingguodong efbfe56d27 * Comment gitlab menu instead of deleting it. 2021-07-22 09:28:36 +08:00
dingguodong 21c9ee13bc + Add ajaxc getting gitlab project pipeline. 2021-07-22 09:27:24 +08:00
dingguodong ca014d182f * Enable newer gitlab module for repo. 2021-07-22 09:25:09 +08:00
dingguodong cfee7fdf8f * Remove warning message for git repo. 2021-07-22 09:23:18 +08:00
wangyidong dd1331d853 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 17:42:02 +08:00
wangyidong 3384f53fa9 * fix bug. 2021-07-21 17:41:43 +08:00
zhujinyong eb5a96a23b Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 13:59:40 +08:00
dingguodong 9646584b16 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-21 13:58:16 +08:00
zhujinyong f157a35f20 * Add params of list. 2021-07-21 13:57:30 +08:00
dingguodong 443f016f25 * Finish task #40406 (change jenkins variables to general name). 2021-07-21 13:57:20 +08:00
tianshujie98 bbee699fe8 * Fix bug #13743. 2021-07-21 12:12:41 +08:00
zenggang 7781d1d5fd * Finish bug #13740 2021-07-21 11:44:13 +08:00
tianshujie98 7c0ee909ec * Fix bug #13744. 2021-07-21 11:38:10 +08:00
tianshujie98 fa763bc550 * Fix bug #13742. 2021-07-21 09:43:32 +08:00
wangyidong f0bb1eb52b * adjust for changelog. 2021-07-21 08:26:59 +08:00
zhujinyong 8f6bf9800e * Format fields of response data. 2021-07-21 06:44:41 +08:00
zenggang 51558901a5 * Finish task #40117 2021-07-20 18:30:19 +08:00
qiyu-xie 16e442433a * Fix bug#13685. 2021-07-20 17:30:18 +08:00
dingguodong 379e0ba43c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms zentaopms_15.2_20210720 2021-07-20 16:49:05 +08:00
dingguodong cfd37eb46d * Revert jenkins related files. 2021-07-20 16:48:41 +08:00
wangyidong 26bef8c7de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 16:48:34 +08:00
wangyidong eab9f17636 * adjust for english. 2021-07-20 16:48:14 +08:00