 李玉春
|
b9e4882cd8
|
Merge branch 'devops24_51139' into 'master'
Finish task#51139
See merge request easycorp/zentaopms!2560
|
2022-03-28 03:13:31 +00:00 |
|
|
李玉春
|
a04046f4b2
|
Merge branch 'mayue_optimizeCode' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!2571
|
2022-03-28 02:59:37 +00:00 |
|
|
李玉春
|
0a6130a20b
|
Merge branch 'sunhuawei_fixbug_21124' into 'master'
*Fix bug#21124.
See merge request easycorp/zentaopms!2572
|
2022-03-28 02:59:07 +00:00 |
|
|
mayue
|
0a562d579a
|
* Optimize code.
|
2022-03-28 10:58:58 +08:00 |
|
|
mayue
|
1dc8f123df
|
* Optimize code.
|
2022-03-28 10:56:14 +08:00 |
|
|
孙华伟
|
92a4949c6e
|
*Fix bug#21124.
|
2022-03-28 10:55:05 +08:00 |
|
|
朱金勇
|
9c675f316c
|
Merge branch 'sprint/sunhao/bug19123' into 'master'
* try to redirect to index/index when access iframe page directly.
See merge request easycorp/zentaopms!2557
|
2022-03-28 02:32:57 +00:00 |
|
|
朱金勇
|
0901a14d5d
|
Merge branch 'app_zhengrunyu' into 'master'
* Change api for story.
See merge request easycorp/zentaopms!2535
|
2022-03-28 02:32:18 +00:00 |
|
|
zenggang
|
ae463ddd27
|
* Finish task#51139
|
2022-03-28 01:44:26 +00: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 |
|
|
李玉春
|
7e0cf1500e
|
Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.
See merge request easycorp/zentaopms!2555
|
2022-03-28 00:38:56 +00:00 |
|
|
Hao Sun
|
56e9a9ce9d
|
* try to redirect to index/index when access iframe page directly.
|
2022-03-25 20:48:18 +08:00 |
|
|
zenggang
|
0867f72e20
|
* Finish task#51136
|
2022-03-25 07:56:31 +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 |
|
|
liumengyi
|
2af66dd17f
|
* Fix bug.
|
2022-03-25 15:29:40 +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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
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 |
|
|
zhengrunyu
|
c7f13939b8
|
* Change api for story.
|
2022-03-25 10:38:38 +08: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 |
|
|
孙广明
|
e4189b329c
|
* Fix whitelist bug.
|
2022-03-25 10:21:50 +08:00 |
|
|
tianshujie
|
79e9ff2bdd
|
* Fix bug #17187.
|
2022-03-25 09:52:44 +08:00 |
|
|
zenggang
|
553b32b60d
|
* Finish task#51104
|
2022-03-25 01:47:22 +00:00 |
|
|
songchenxuan
|
a7a5c69722
|
*English features.
|
2022-03-25 09:25:44 +08:00 |
|
|
liyuchun
|
81c04c08e9
|
* Fix bug #17367.
|
2022-03-25 09:20:22 +08:00 |
|