Commit Graph
22098 Commits
Author SHA1 Message Date
holan20180123 f75815e4fb * Finish task #40305. 2021-07-16 16:58:36 +08:00
tianshujie98 ecf2810b1b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 16:50:21 +08:00
tianshujie98 f21634b963 * Adjust language. 2021-07-16 16:50:03 +08:00
wangyidong 21a3689bb2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 16:49:59 +08:00
wangyidong aa9871385a * fix bug #13618. 2021-07-16 16:49:35 +08:00
holan20180123 48b8cea00c * Adjust product list. 2021-07-16 16:42:37 +08:00
tianshujie98 9491fa4a5c * Ajust code. 2021-07-16 16:33:36 +08:00
wangyidong 2c3c0ce27d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 16:25:19 +08:00
wangyidong 8c43cd0fa6 * adjust for batchedit. 2021-07-16 16:25:02 +08:00
holan20180123 05b564fc39 * Fix bug #13691. 2021-07-16 16:17:31 +08:00
lichengjun b93f366581 * Adjust GitLab. 2021-07-16 16:12:17 +08:00
tianshujie98 8409cb5b54 * Adjust style. 2021-07-16 16:08:16 +08:00
holan20180123 6d8956ff41 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 16:07:07 +08:00
holan20180123 fa7e9fa792 * Fix bug #13694. 2021-07-16 16:06:38 +08:00
lichengjun c983c28857 *Turn off the new GItLab feature. 2021-07-16 16:01:28 +08:00
wangyidong 782bb743cd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 15:58:14 +08:00
wangyidong d12f9bd00c * fix bug #13620. 2021-07-16 15:57:41 +08:00
wangyidong 0f11bf5a2c * fix bug #13648. 2021-07-16 15:49:26 +08:00
tianshujie98 3a2d22e188 * Ajust code. 2021-07-16 15:23:41 +08:00
tianshujie98 46688484f6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 15:07:22 +08:00
tianshujie98 42217d6ae9 * Adjust code. 2021-07-16 15:07:06 +08:00
wangyidong 0eda274189 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 15:01:15 +08:00
wangyidong 4fe3d248cd * fix bug #13699. 2021-07-16 15:00:36 +08:00
hufangzhou 3c353c91cc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:55:10 +08:00
hufangzhou f91b8b975a * Finish task #40295. 2021-07-16 14:55:06 +08:00
wangyidong c787551eb0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:41:25 +08:00
wangyidong eb93e37b04 * fix error. 2021-07-16 14:41:13 +08:00
lichengjun 7811676145 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:40:29 +08:00
lichengjun a7d53c67e7 *Fix bug ID 40655. 2021-07-16 14:39:07 +08:00
wangyidong 4c43ac17b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:38:17 +08:00
wangyidong d18d3e3024 * fix error. 2021-07-16 14:37:56 +08:00
zenggang f27a385438 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:36:17 +08:00
zenggang 3533722c49 * change video src task #40002 2021-07-16 14:35:43 +08:00
lichengjun eec44392ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:32:31 +08:00
lichengjun 4e95021b08 Fix Bug ID 40660. 2021-07-16 14:32:26 +08:00
wangyidong 5f2f502fc6 * finish task #40312. 2021-07-16 14:32:25 +08:00
zenggang d8f8ae1e45 * English video task #40002 2021-07-16 14:31:28 +08:00
holan20180123 5d9942ff98 * Fix bug #13603. 2021-07-16 14:21:09 +08:00
qiyu-xie db3e544504 * Fix bug#13672. 2021-07-16 14:16:59 +08:00
tianshujie98 574ecd7bd3 * Fix the issue #173. 2021-07-16 14:12:08 +08:00
hufangzhou 19533bfb06 * Task #40318: Adjust the code. 2021-07-16 14:08:30 +08:00
qiyu-xie 50a0fc8da2 * Finish task#40318. 2021-07-16 14:03:32 +08:00
qiyu-xie 34992b6a40 * Adjust code. 2021-07-16 14:00:27 +08:00
wangyidong 3f25c7db97 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 13:49:47 +08:00
wangyidong 5133fd164a * finish task #40311. 2021-07-16 13:45:56 +08:00
wangyidong f63bb9135f * finish task #40307. 2021-07-16 13:45:01 +08:00
wangyidong 6a973517de * finish task #40306. 2021-07-16 13:43:54 +08:00
qiyu-xie 5e8bf5f6f6 * Adjust code. 2021-07-16 13:36:25 +08:00
wangyidong 143d8336b1 * finish task #40304. 2021-07-16 13:28:46 +08:00
hufangzhou 2c8a1ef5ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 13:20:05 +08:00