 mayue
|
7fc0cd6230
|
* Optimize code.
|
2022-03-28 15:02:28 +08:00 |
|
|
mayue
|
71d64d8e65
|
* Handling PHP compatibility issues.
|
2022-03-25 11:05:18 +08: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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
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 |
|
|
朱金勇
|
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 |
|
|
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
|
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 |
|
|
songchenxuan
|
7a9afd7052
|
*AjaxGetBranches function code format.
|
2022-03-24 15:39:35 +08:00 |
|
|
zhouxudong
|
3a3660764c
|
* Fix bug.
|
2022-03-24 15:15:12 +08:00 |
|
|
zhouxudong
|
c6f8ca1526
|
* Fix bug.
|
2022-03-24 14:57:46 +08:00 |
|
|
李玉春
|
ca3b8a3927
|
Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* optimize UI for kanban and fix drop rules not work.
See merge request easycorp/zentaopms!2511
|
2022-03-24 06:44:07 +00:00 |
|
|
tianshujie
|
c9c1573a2d
|
* Fix bug #20523.
|
2022-03-24 14:40:38 +08:00 |
|
|
李玉春
|
defd9faa28
|
Merge branch 'sunhuawei_fixbug_13935' into 'master'
*Fix bug#13935
See merge request easycorp/zentaopms!2505
|
2022-03-24 06:35:13 +00:00 |
|
|
Hao Sun
|
5c17d72ca9
|
* fix kanban drop rules not work.
|
2022-03-24 14:34:17 +08:00 |
|
|
孙华伟
|
cf0ba445e9
|
*Fix bug#13935
|
2022-03-24 14:30:05 +08:00 |
|
|
hufangzhou
|
f75e310eb9
|
* Fix bug #16183.
|
2022-03-24 14:29:35 +08:00 |
|
|
Hao Sun
|
0a7c559478
|
* optimize UI for kanban.
|
2022-03-24 14:27:03 +08:00 |
|
|
Wenrui LI
|
b6cc4de226
|
* set z-index to table-footer, fix bug #21053.
|
2022-03-24 14:25:57 +08:00 |
|
|
zenggang
|
dd5cab2011
|
* Finish task#51184,51176,51141
|
2022-03-24 06:21:10 +00:00 |
|
|
孙广明
|
4889b79a59
|
Merge branch 'sunhuawei_fixbug_20863' into 'master'
*Fix bug #20863.
See merge request easycorp/zentaopms!2502
|
2022-03-24 06:10:01 +00:00 |
|
|
孙华伟
|
a6fa85f9dd
|
*Fix bug#13935
|
2022-03-24 14:06:15 +08:00 |
|
|
Hao Sun
|
099d927657
|
* fix UI for product kanban.
|
2022-03-24 13:31:05 +08:00 |
|
|
孙华伟
|
cbbc6be340
|
*Optimize the code.
|
2022-03-24 11:29:55 +08:00 |
|
|
孙华伟
|
4282c9ebc2
|
*Fix bug #20863.
|
2022-03-24 11:11:02 +08:00 |
|
|
tianshujie
|
69bac81a9d
|
* Fix bug #17395.
|
2022-03-24 11:01:00 +08:00 |
|
|
liyuchun
|
57d6407fba
|
* Fix bug #13732.
|
2022-03-24 10:51:43 +08:00 |
|
|
李玉春
|
c458dab32a
|
Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072
See merge request easycorp/zentaopms!2496
|
2022-03-24 02:40:57 +00:00 |
|