Commit Graph
25717 Commits
Author SHA1 Message Date
wangyidong 143d8336b1 * finish task #40304. 2021-07-16 13:28:46 +08:00
wangyidong 92ea15541f * finish task #40299. 2021-07-16 13:03:55 +08:00
wangyidong 268c4e47b7 * finish task #40293. 2021-07-16 13:02:42 +08:00
wangyidong 4c80b77454 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 11:46:01 +08:00
wangyidong f2620f53ec * finish task #40292. 2021-07-16 11:45:43 +08:00
holan20180123 51cf6d2aa0 * Fix bug #13692. 2021-07-16 11:40:49 +08:00
holan20180123 4e85c05ae9 * Fix bug #13691. 2021-07-16 11:31:04 +08:00
qiyu-xie 685b270170 * Finish task#40313. 2021-07-16 11:29:29 +08:00
tianshujie98 c3bfd5a36a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 11:29:11 +08:00
tianshujie98 0a63fa55d6 * Finish task #40301. 2021-07-16 11:28:52 +08:00
qiyu-xie 8a29874b14 * Finish task#40317. 2021-07-16 11:25:53 +08:00
qiyu-xie 7db4307242 * Finish task#40302. 2021-07-16 11:22:56 +08:00
qiyu-xie 2c27035699 * Adjust code. 2021-07-16 11:22:56 +08:00
tianshujie98 4eb641ad81 * Finish task #40289. 2021-07-16 11:21:48 +08:00
wangyidong 425280996a * finish task #40289. 2021-07-16 11:21:10 +08:00
wangyidong 2017a9cc78 * finish task #40291. 2021-07-16 11:20:23 +08:00
wangyidong 22abf816b9 * finish task #40290. 2021-07-16 11:19:08 +08:00
tianshujie98 2608091b67 * Fix bug. 2021-07-16 11:18:35 +08:00
Guan Xiying 75d459bfd9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 10:58:57 +08:00
Guan Xiying 788620eeb1 * Skip process gitlab repo function. 2021-07-16 10:58:18 +08:00
holan20180123 25a3320c75 * Finish task #40315. 2021-07-16 10:57:51 +08:00
zenggang d77656a14c * Finish task #40110 2021-07-16 10:34:11 +08:00
lichengjun 8710a08f6f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 10:08:23 +08:00
lichengjun fcf6f3149a Fix code bug. 2021-07-16 10:08:19 +08:00
lichengjun 9fea485339 *Skip gitlab menu. 2021-07-16 10:06:02 +08:00
Guan Xiying 81883efbb6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 10:00:49 +08:00
Guan Xiying 19d343dec4 * Skip process gitlab repo function. 2021-07-16 09:59:55 +08:00
lichengjun 3326a59cbd *Fix Bug ID 13665. 2021-07-16 09:46:01 +08:00
zhujinyong e50ecb316a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:50 +08:00
zhujinyong 6f04aedcd3 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:23 +08:00
hufangzhou cc3f4f45a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:41:58 +08:00
hufangzhou 8075005620 * Finish task #40314. 2021-07-16 09:41:53 +08:00
Hao Sun 842230d91f * add new icons: icon-swap, icon-lane, icon-side-right, icon-side-left. 2021-07-16 09:41:02 +08:00
zhujinyong 1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
dingguodong e465c7635d * Correct code to meet devel standard after CR. 2021-07-16 09:04:49 +08:00
zenggang 0b4279fbba * Adjust code task #40319 2021-07-16 09:04:25 +08:00
Guan Xiying 7d86ce798a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 08:57:11 +08:00
Guan Xiying be7bb7c331 * Add upgrade from 15.0.3 options. 2021-07-16 08:56:39 +08:00
hufangzhou c7391fb286 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 08:53:38 +08:00
hufangzhou 52ffea1d9d * Adapt to fallback version. 2021-07-16 08:53:34 +08:00
zenggang 8709db17bb * Adjust code 2021-07-16 08:46:15 +08:00
dingguodong 373ebc4522 * Fix bug #13657, remove useless codes. 2021-07-15 18:02:44 +08:00
tianshujie98 f8a107bd79 * Adjust code. 2021-07-15 17:27:25 +08:00
holan20180123 109867f103 * Adjust create repo. 2021-07-15 17:18:16 +08:00
tianshujie98 347ca7c674 * Adjust code. 2021-07-15 17:02:03 +08:00
lichengjun ee5392f676 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 16:48:46 +08:00
lichengjun 53c075cbee *Adjust code. 2021-07-15 16:39:58 +08:00
zenggang 03ac2e6820 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 16:34:49 +08:00
zenggang f448f4d37e * Finish task #40002 2021-07-15 16:33:59 +08:00
tianshujie98 6520a11545 * Adjust code. 2021-07-15 16:33:51 +08:00