Commit Graph
534 Commits
Author SHA1 Message Date
hufangzhou 44ad3e602c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 17:32:15 +08:00
hufangzhou 280b62c916 * Fix a bug. 2021-07-16 17:32:09 +08:00
holan20180123 48b8cea00c * Adjust product list. 2021-07-16 16:42:37 +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
wangyidong 0f11bf5a2c * fix bug #13648. 2021-07-16 15:49:26 +08:00
hufangzhou 1c61084531 * Fix bug #13649. 2021-07-14 16:54:01 +08:00
holan20180123 a14b1c8711 * Finish task #40004. 2021-07-13 10:02:40 +08:00
holan20180123 195e6492d2 * Finish task #40004. 2021-07-12 10:36:44 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
guanxiying b72c17b291 * Remove the branch in storylib search. 2021-07-02 13:05:16 +08:00
wangyidong 3893084999 * adjust for mhtml. 2021-06-08 13:33:34 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
wangyidong 8d1ca6b022 * finish task #38890. 2021-06-04 15:59:01 +08:00
tianshujie98 3cc93bd722 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 08:56:35 +08:00
tianshujie98 b157d011e8 * Fix bug #13022. 2021-06-04 08:56:21 +08:00
holan20180123 5389de2709 * Adjust code for review. 2021-06-04 08:51:45 +08:00
tianshujie98 6957fa70a4 * Adjust code style. 2021-06-01 14:31:11 +08:00
tianshujie98 b2c742abfc * Fix bug. 2021-06-01 14:05:50 +08:00
tianshujie98 591fdee8ff * Fix bug #38634. 2021-06-01 13:29:48 +08:00
wangyidong 1cae502aee * adjust for web html. 2021-05-20 16:55:12 +08:00
hufangzhou 2392386b86 * Adjust the code. 2021-05-14 11:19:07 +08:00
hufangzhou bc71469cd1 * Adjust the product getSwitcher link under the testtask module. 2021-04-28 15:07:12 +08:00
tianshujie98 7ed10733b3 * Fix bug #11210. 2021-04-27 15:06:52 +08:00
tianshujie98 5b2dd0cfec * Fix bug #12404. 2021-04-27 13:16:13 +08:00
tianshujie98 9d88236bfd * Fix bug #12400. 2021-04-27 11:13:05 +08:00
Yagami 6b962a12c4 * Add testtask switcher link. 2021-04-26 11:12:30 +08:00
tianshujie98 2ec2a2fb85 * Fix bug. 2021-04-26 10:51:07 +08:00
leiyong 6c2132567b * Finish task#37522 2021-04-16 02:39:21 +00: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
hufangzhou c19ad08621 * Finish task #37530. 2021-04-15 14:38:39 +08:00
tianshujie98 f496c74591 * Fix bug #11858. 2021-04-15 13:02:17 +08:00
holan20180123 c399ec5280 * Finish task #37518. 2021-04-15 10:02:21 +08:00
tianshujie98 7a86299868 * Fix testsuite problem. 2021-04-13 10:16:30 +08:00
wangyidong 2a6f1c1359 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-13 09:16:52 +08:00
wangyidong 6d15bc4ed0 * finish task #37408. 2021-04-13 09:16:32 +08:00
hufangzhou 51da5b5b4e * Finish task #37403. 2021-04-12 17:09:08 +08:00
hufangzhou b8138c41cc * Fix bug #11953. 2021-04-12 10:27:45 +08:00
leiyong 2220d9493a * Repair error. 2021-04-12 04:59:25 +03:00
leiyong 3c72f70d36 * Finish task#37284. 2021-04-09 05:16:19 +03:00
Yagami 94e2d9d56a * Code for task #37108. 2021-04-08 11:29:17 +08:00
wangyidong 0dc863da3a * change for set cookie secure. 2021-04-07 17:44:25 +08:00
wangyidong 9db96ad4d5 * adjust for get product project. 2021-04-07 16:15:45 +08:00
holan20180123 8f5471ebe6 * Fix bug #11006,#11058. 2021-04-06 11:19:09 +08:00
Yagami 45df4dea29 * Fix bug #11363. 2021-04-06 09:41:45 +08:00
tianshujie98 47d8b743d5 * Fix bug #11787. 2021-04-02 14:29:40 +08:00
qiyu-xie c21142e790 * Fix bug#11588. 2021-04-02 11:43:41 +08:00
tianshujie98 ff3bb25320 * Sort products. 2021-04-01 11:32:55 +08:00
tianshujie98 eddd75f15a * Fix bug #11157. 2021-03-31 16:32:06 +08:00
tianshujie98 e1b120bb0a * Fix bug. 2021-03-31 08:20:50 +08:00