 mayue
|
4ec9ec4869
|
* Optimize code.
|
2022-03-28 10:38:25 +08:00 |
|
|
mayue
|
1842ec83a2
|
* Fix bug #18310.
|
2022-03-28 10:36:24 +08:00 |
|
|
孙广明
|
20f060bcaf
|
Merge branch 'sprint/autoTest_liumengyi_product' into 'master'
* Add auto test of product.
See merge request easycorp/zentaopms!2563
|
2022-03-28 02:05:44 +00:00 |
|
|
liumengyi
|
0bc904fe27
|
* Add auto test of product.
|
2022-03-28 10:03:43 +08:00 |
|
|
孙广明
|
21d4a48642
|
Merge branch 'liyuchun_fixbug' into 'master'
Fix bug #17252,17367.
See merge request easycorp/zentaopms!2539
|
2022-03-28 00:42:01 +00:00 |
|
|
孙广明
|
e736c8d8c0
|
Merge branch 'autotest_ly' into 'master'
add project and product data
See merge request easycorp/zentaopms!2559
|
2022-03-28 00:41:34 +00:00 |
|
|
liyang
|
ce6fd25ee2
|
add project and product data
|
2022-03-28 08:39:33 +08:00 |
|
|
李玉春
|
7e0cf1500e
|
Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.
See merge request easycorp/zentaopms!2555
|
2022-03-28 00:38:56 +00:00 |
|
|
李玉春
|
5d0e802a49
|
Merge branch 'devops24_51136' into 'master'
Finish task#51136
See merge request easycorp/zentaopms!2554
|
2022-03-25 09:35:43 +00:00 |
|
|
zenggang
|
0867f72e20
|
* Finish task#51136
|
2022-03-25 07:56:31 +00:00 |
|
|
孙广明
|
2ea79a7e21
|
Merge branch 'autotest_ly' into 'master'
update story data
See merge request easycorp/zentaopms!2552
|
2022-03-25 07:34:01 +00:00 |
|
|
孙广明
|
0d6d80e6f2
|
Merge branch 'sprint/autoTest_liumengyi_product' into 'master'
* Add auto test of product.
See merge request easycorp/zentaopms!2551
|
2022-03-25 07:33:06 +00:00 |
|
|
liyang
|
5cc3608d29
|
update story data
|
2022-03-25 15:30:29 +08:00 |
|
|
liumengyi
|
2af66dd17f
|
* Fix bug.
|
2022-03-25 15:29:40 +08:00 |
|
|
liumengyi
|
bda014f73b
|
* Add auto test of product.
|
2022-03-25 15:28:29 +08:00 |
|
|
李玉春
|
f481b0fd9a
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2550
|
2022-03-25 07:11:11 +00:00 |
|
|
tianshujie
|
d3e63841fa
|
* Fix bug #20559.
|
2022-03-25 15:00:30 +08:00 |
|
|
孙广明
|
8acea5b35c
|
Merge branch 'master_xieqiyu_20878' into 'master'
* Fix bug#20878.
See merge request easycorp/zentaopms!2547
|
2022-03-25 06:59:00 +00:00 |
|
|
朱金勇
|
530f055e7b
|
Merge branch 'sgm_storytest' into 'master'
* Remove unused code and fix bug.
See merge request easycorp/zentaopms!2545
|
2022-03-25 06:29:10 +00:00 |
|
|
朱金勇
|
d097a892cf
|
Merge branch 'sprint/sunhao/bug11279' into 'master'
* bug #11279, fix hotkey up/down with datetimepicker not work in batch action page.
See merge request easycorp/zentaopms!2540
|
2022-03-25 06:28:32 +00:00 |
|
|
朱金勇
|
dbdbe26be7
|
Merge branch 'sprint/scx_getproductsbyproject' into 'master'
* Get products by projectID.
See merge request easycorp/zentaopms!2541
|
2022-03-25 06:28:12 +00:00 |
|
|
孙广明
|
4b50d187e4
|
* Remove unused code and fix bug.
|
2022-03-25 14:25:26 +08:00 |
|
|
孙广明
|
06c255995c
|
Merge branch 'mayue_fix_bug#17402' into 'master'
* Fix bug#17402.
See merge request easycorp/zentaopms!2543
|
2022-03-25 06:23:58 +00:00 |
|
|
mayue
|
59af75b136
|
* Optimize code.
|
2022-03-25 14:21:22 +08:00 |
|
|
王怡栋
|
45ba41e14e
|
Merge branch 'fixbug' into 'master'
* Fix bug #21034,21059.
See merge request easycorp/zentaopms!2542
|
2022-03-25 06:16:55 +00:00 |
|
|
王怡栋
|
b1b05f4fc0
|
Merge branch 'sprint/fixbug_hufangzhou_markdown' into 'master'
* Update the library of parse markdown.
See merge request easycorp/zentaopms!2544
|
2022-03-25 06:16:30 +00:00 |
|
|
xieqiyu
|
39123bd4d9
|
* Fix bug#20878.
|
2022-03-25 14:15:30 +08:00 |
|
|
hufangzhou
|
fac6327ee8
|
* Update the library of parse markdown.
|
2022-03-25 14:13:54 +08:00 |
|
|
tianshujie
|
eca3d6a43f
|
* Fix bug #17965.
|
2022-03-25 13:48:06 +08:00 |
|
|
mayue
|
6f3071f217
|
* Optimize code.
|
2022-03-25 13:48:00 +08:00 |
|
|
mayue
|
f184873bca
|
* Fix bug #17402.
|
2022-03-25 13:45:28 +08:00 |
|
|
tanghucheng
|
8f95192d7a
|
* Fix bug #21034,21059.
|
2022-03-25 13:39:45 +08:00 |
|
|
liyuchun
|
3a566fb870
|
* Fix bug.
|
2022-03-25 13:39:12 +08:00 |
|
|
songchenxuan
|
84d1aafb94
|
* Get products by projectID.
|
2022-03-25 13:27:02 +08:00 |
|
|
Hao Sun
|
b818f4054a
|
* bug #11279, fix hotkey up/down with datetimepicker not work in batch action page.
|
2022-03-25 13:13:29 +08:00 |
|
|
tianshujie
|
7c46d9c61d
|
* Fix bug #17291.
|
2022-03-25 12:51:59 +08:00 |
|
|
liyuchun
|
262e38d0c8
|
* Fix bug #17252.
|
2022-03-25 11:21:03 +08:00 |
|
|
孙广明
|
70ef6bae33
|
Merge branch 'fixbug_zhouxin_16571' into 'master'
* Fix bug #16571.
See merge request easycorp/zentaopms!2498
|
2022-03-25 03:17:04 +00:00 |
|
|
李玉春
|
31c97d51c6
|
Merge branch 'mayue_optimize_code' into 'master'
* Handling PHP compatibility issues.
See merge request easycorp/zentaopms!2536
|
2022-03-25 03:06:59 +00:00 |
|
|
mayue
|
71d64d8e65
|
* Handling PHP compatibility issues.
|
2022-03-25 11:05:18 +08:00 |
|
|
李玉春
|
016fef8ec6
|
Merge branch 'devops24_51104' into 'master'
Finish task#51104
See merge request easycorp/zentaopms!2530
|
2022-03-25 03:02:57 +00:00 |
|
|
李玉春
|
c0ebf6480e
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2534
|
2022-03-25 03:00:00 +00:00 |
|
|
tianshujie
|
67efa0838e
|
* Modify the code judgment logic.
|
2022-03-25 10:58:04 +08:00 |
|
|
tianshujie
|
e36fdcb004
|
* Fix bug #18719.
|
2022-03-25 10:39:09 +08:00 |
|
|
朱金勇
|
339ac919c6
|
Merge branch 'sgm_autotest' into 'master'
Sgm autotest
See merge request easycorp/zentaopms!2533
|
2022-03-25 02:30:24 +00:00 |
|
|
孙广明
|
74029a1a9f
|
* Fix product whitelist bug.
|
2022-03-25 10:29:12 +08:00 |
|
|
孙广明
|
02e91b8ac5
|
* Fix program whitelist bug.
|
2022-03-25 10:27:56 +08:00 |
|
|
tianshujie
|
a3b55806f5
|
* Fix bug #17212.
|
2022-03-25 10:25:37 +08:00 |
|
|
朱金勇
|
71756da30e
|
Merge branch 'sgm_autotest' into 'master'
Sgm autotest
See merge request easycorp/zentaopms!2532
|
2022-03-25 02:24:35 +00:00 |
|
|
孙广明
|
65bad8be6a
|
* Fix test file.
|
2022-03-25 10:23:05 +08:00 |
|