 李玉春
|
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 |
|
|
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 |
|
|
李玉春
|
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 |
|
|
李玉春
|
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 |
|
|
tianshujie
|
9178a6e3b3
|
* Modify variable name.
|
2022-03-24 10:27:42 +08:00 |
|
|
tianshujie
|
9b7d8686c7
|
* Modify the judgment logic.
|
2022-03-24 09:42:08 +08:00 |
|
|
tianshujie
|
e9ee8a176d
|
* Fix bug #19072.
|
2022-03-24 09:35:39 +08:00 |
|
|
tianshujie
|
bd9b982157
|
* Fix the problem that the kanban cannot be displayed in the IE browser.
|
2022-03-24 08:39:15 +08:00 |
|
|
李玉春
|
6729298c92
|
Merge branch 'bugfix_cyy' into 'master'
Modify app language and API
See merge request easycorp/zentaopms!2488
|
2022-03-24 00:29:54 +00:00 |
|
|
王怡栋
|
7c8dcef938
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-23 17:28:59 +08:00 |
|
|
孙广明
|
85c0bedc77
|
Merge branch 'master_xieqiyu_21037' into 'master'
* Fix bug#21037.
See merge request easycorp/zentaopms!2480
|
2022-03-23 09:27:21 +00:00 |
|
|
王怡栋
|
2f0f2e2965
|
* adjust for js default value and init userview in upgrade.
|
2022-03-23 17:19:41 +08:00 |
|
|
王怡栋
|
f41e6c2932
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51328
See merge request easycorp/zentaopms!2489
|
2022-03-23 08:56:06 +00:00 |
|
|
王怡栋
|
181c0025a4
|
Merge branch 'sprint/tianshujie_bug_20653' into 'master'
* Fix bug #20653.
See merge request easycorp/zentaopms!2491
|
2022-03-23 08:55:50 +00:00 |
|
|
孙广明
|
c08b31e854
|
Merge branch 'sunhuawei_fixbug_11441' into 'master'
*Fix bug#11441.
See merge request easycorp/zentaopms!2479
|
2022-03-23 08:47:00 +00:00 |
|
|
tianshujie
|
ceeb1d17b8
|
* Fix bug #20653.
|
2022-03-23 16:46:20 +08:00 |
|
|
Zongjun Lan
|
fe7cbfbced
|
* fix task #51323
|
2022-03-23 16:36:15 +08:00 |
|
|
李玉春
|
21a6de6681
|
Merge branch 'devops24_zenggang' into 'master'
Finish task#51109,51108,51128
See merge request easycorp/zentaopms!2486
|
2022-03-23 08:31:17 +00:00 |
|
|
zenggang
|
1d9f6dd503
|
* Adjust code
|
2022-03-23 08:27:30 +00:00 |
|
|
caoyanyi
|
b7b3a26e33
|
* Add app language.
|
2022-03-23 16:26:51 +08:00 |
|
|
王怡栋
|
100c5e3506
|
Merge branch 'sprint/sunhao/optimize_kanban' into 'master'
* Fix bugs for kanban, include bug #17938, bug #19116, bug #18935, bug #18985, bug #19078.
See merge request easycorp/zentaopms!2482
|
2022-03-23 08:19:58 +00:00 |
|
|
王怡栋
|
fb917029b7
|
Merge branch 'fixbug' into 'master'
* Fix bug #21032.
See merge request easycorp/zentaopms!2478
|
2022-03-23 08:17:24 +00:00 |
|