 tianshujie
|
7c46d9c61d
|
* Fix bug #17291.
|
2022-03-25 12:51:59 +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 |
|
|
孙广明
|
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 |
|
|
朱金勇
|
01310e31ce
|
Merge branch 'sprint/scx_englishfeatures' into 'master'
*English features.
See merge request easycorp/zentaopms!2528
|
2022-03-25 01:28:09 +00:00 |
|
|
songchenxuan
|
a7a5c69722
|
*English features.
|
2022-03-25 09:25:44 +08:00 |
|
|
孙广明
|
82188691db
|
Merge branch 'liyuchun_fixbug' into 'master'
Liyuchun fixbug #18151,13732.
See merge request easycorp/zentaopms!2516
|
2022-03-25 01:19:43 +00:00 |
|
|
朱金勇
|
5900a80918
|
Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master'
* fix columns layout confusion.
See merge request easycorp/zentaopms!2523
|
2022-03-25 01:11:44 +00:00 |
|
|
朱金勇
|
4369a3e2c3
|
Merge branch 'sprint/sunhao/fix_merge_mistake' into 'master'
* fix mistable for merging zui.js.
See merge request easycorp/zentaopms!2526
|
2022-03-25 01:11:31 +00:00 |
|
|
Hao Sun
|
eb815ce136
|
* fix mistable for merging zui.js.
|
2022-03-25 09:01:34 +08:00 |
|
|
李玉春
|
de4406ba83
|
Merge branch 'sprint/master_zhouxudong_16718' into 'master'
Fix bug #16718.
See merge request easycorp/zentaopms!2525
|
2022-03-25 00:59:10 +00:00 |
|
|
liyuchun
|
00c5c5465d
|
* Fix bug #21142.
|
2022-03-25 08:56:54 +08:00 |
|
|
zhouxudong
|
08ffefca35
|
Fix bug #16718.
|
2022-03-25 08:56:10 +08:00 |
|
|
Hao Sun
|
4d12c8b5b6
|
* fix maincontent confution.
|
2022-03-25 08:39:44 +08:00 |
|
|
zhujinyong
|
eaf550b617
|
Merge branch 'sprint/sunhao/bug15206'
|
2022-03-24 21:23:36 +08:00 |
|
|
朱金勇
|
47dc604e6d
|
Merge branch 'sprint/sunhao/fix_maincontent_confusion' into 'master'
* fix maincontent confution.
See merge request easycorp/zentaopms!2522
|
2022-03-24 13:20:37 +00:00 |
|
|
Hao Sun
|
c335216ed1
|
* fix maincontent confution.
|
2022-03-24 17:30:00 +08:00 |
|
|
朱金勇
|
c6077f7c40
|
Merge branch 'sgm_storytest' into 'master'
* Add story test.
See merge request easycorp/zentaopms!2521
|
2022-03-24 09:21:41 +00:00 |
|
|
李玉春
|
169fa0c19e
|
Merge branch 'mayue_fix_bug#13804' into 'master'
* Fix bug #13804.
See merge request easycorp/zentaopms!2520
|
2022-03-24 09:21:04 +00:00 |
|
|
朱金勇
|
b2b30ea4bc
|
Merge branch 'sprint/sunhao/optimize_dropmenu' into 'master'
* optimize UI for dropmenu.
See merge request easycorp/zentaopms!2519
|
2022-03-24 09:20:45 +00:00 |
|
|
mayue
|
fb1821c735
|
* Optimize code.
|
2022-03-24 17:19:20 +08:00 |
|
|
李玉春
|
eef0da7fd0
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2517
|
2022-03-24 09:16:36 +00:00 |
|
|
孙广明
|
d8cfabd4a7
|
* Add story test.
|
2022-03-24 17:15:18 +08:00 |
|
|
孙广明
|
e41cd55b4c
|
Merge branch 'sprint/autoTest_liumengyi_product'
|
2022-03-24 17:08:57 +08:00 |
|
|
Hao Sun
|
f6b6fdd023
|
* add "onSearchComplete" event to search-list in dropmenu.
|
2022-03-24 17:06:42 +08:00 |
|
|
mayue
|
7d2b061a75
|
* Fix bug #13804.
|
2022-03-24 17:06:28 +08:00 |
|
|
孙广明
|
133c7f7b04
|
Merge branch 'master' into 'sprint/autoTest_liumengyi_product'
# Conflicts:
# module/product/model.php
|
2022-03-24 09:04:36 +00:00 |
|
|
liumengyi
|
333cc3fbb2
|
* Modify code.
|
2022-03-24 17:02:26 +08:00 |
|
|
Hao Sun
|
8d043cc467
|
* update themes.
|
2022-03-24 17:01:49 +08:00 |
|
|
liumengyi
|
ac5c19df57
|
* Add auto test of product.
|
2022-03-24 17:01:42 +08:00 |
|
|
Hao Sun
|
539c797bd5
|
* bug #14569, optimize style for dropmenu.
|
2022-03-24 17:01:41 +08:00 |
|
|
tianshujie
|
f5bc1f99a2
|
* Modify the code.
|
2022-03-24 16:53:54 +08:00 |
|
|
王怡栋
|
44d14b8c6a
|
Merge branch 'sprint/lite6_lwr_fix_table_footer' into 'master'
* set z-index to table-footer, fix bug #21053.
See merge request easycorp/zentaopms!2509
|
2022-03-24 08:39:42 +00:00 |
|
|
王怡栋
|
2b3cb7a687
|
Merge branch 'sprint/fixbug_hufangzhou_16183' into 'master'
* Fix bug #16183.
See merge request easycorp/zentaopms!2510
|
2022-03-24 08:39:23 +00:00 |
|
|
liyuchun
|
07622ec7af
|
* Fix bug #18151.
|
2022-03-24 16:21:06 +08:00 |
|
|
李玉春
|
009aaed504
|
Merge branch 'devops24_zenggang' into 'master'
Finish task#51184,51176,51141
See merge request easycorp/zentaopms!2508
|
2022-03-24 07:45:13 +00:00 |
|
|
李玉春
|
43d834e01d
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2513
|
2022-03-24 07:44:23 +00:00 |
|