Commit Graph
25689 Commits
Author SHA1 Message Date
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
tianshujie98 1f4d75765d * Adjust lang. 2021-07-15 16:03:56 +08:00
holan20180123 1531bb805b * Adjust create product required field. 2021-07-15 15:58:05 +08:00
hufangzhou d9f5c53e0b * Adjust the code. 2021-07-15 15:54:08 +08:00
hufangzhou f2fdd0b433 * Adjust the code. 2021-07-15 15:23:50 +08:00
hufangzhou be50281d7a * Adjust the code. 2021-07-15 15:19:59 +08:00
dingguodong cc51c80047 * Correct bad comments. 2021-07-15 15:18:01 +08:00
tianshujie98 ed6eddb82b * Adjust code. 2021-07-15 14:45:14 +08:00
tianshujie98 2759b55b41 * Adjust lang. 2021-07-15 14:39:58 +08:00
dingguodong 763dee0749 * Correct bad statement. 2021-07-15 14:02:41 +08:00
dingguodong 3747bf90d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 13:53:43 +08:00
dingguodong bb7f7cf142 * Remove duplicated loadModel for gitlab related after CR. 2021-07-15 13:53:04 +08:00
zhujinyong 437ed911c8 + Add product and story entry points of API. 2021-07-15 13:39:06 +08:00
tianshujie98 e11a32c975 * Fix bug #13611. 2021-07-15 13:16:54 +08:00
tianshujie98 8064db6050 * Fix bug #13663. 2021-07-15 13:14:00 +08:00
tianshujie98 d95833ed27 *Fix bug #13666. 2021-07-15 13:09:38 +08:00
zenggang 4c58d0bbe4 * Finish task #40111 2021-07-15 10:16:18 +08:00
dingguodong ef1b0dbb90 * Correct link in gitlab view. 2021-07-15 09:52:05 +08:00
tianshujie98 bf17874e41 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-15 09:50:40 +08:00
tianshujie98 850d98c8a8 * Fix bug #13662. 2021-07-15 09:50:13 +08:00
dingguodong 0de91bbaf5 * Correct gitlab display error. 2021-07-15 09:40:51 +08:00
lichengjun 5d46c91a6b *Fix bug 13651. 2021-07-15 09:34:33 +08:00
dingguodong 0ca193a73c * Optimize action moments for gitlab module. 2021-07-15 09:25:51 +08:00
dingguodong 5af6ff7707 * Optimize action moments for gitlab module. 2021-07-15 09:11:42 +08:00
holan20180123 b73608a9b3 * Add gitlib language. 2021-07-15 09:08:07 +08:00
hufangzhou 8c4a074c0f * Adjust the search box width. 2021-07-15 08:58:02 +08:00
lichengjun a9862dc312 * Fix Bug 13654 and 13651. 2021-07-14 21:21:36 +08:00
hufangzhou 089977624b * Fix bug #13650. 2021-07-14 17:51:06 +08:00
hufangzhou a2340a1a91 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 17:26:21 +08:00