 王怡栋
|
bb5febef40
|
Merge branch 'sprint/165_package_lanzongjun_bugfix' into 'sprint/165_package'
* fix bug gantt
See merge request easycorp/zentaopms!2617
|
2022-03-29 09:14:21 +00:00 |
|
|
Wenrui LI
|
3446e4bf55
|
* fix xuan header hook not loaded.
|
2022-03-29 16:14:11 +08:00 |
|
|
Zongjun Lan
|
7c99a6153d
|
* fix bug gantt
|
2022-03-29 16:11:21 +08:00 |
|
|
王怡栋
|
901a9c7d0f
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package
|
2022-03-29 11:02:35 +08:00 |
|
|
王怡栋
|
e051df4562
|
* fix for merge program.
|
2022-03-29 11:01:22 +08:00 |
|
|
Zongjun Lan
|
4206ffb843
|
* fix bug #21181
|
2022-03-29 09:53:04 +08:00 |
|
|
Zongjun Lan
|
81791ba223
|
* fix bug #21181
|
2022-03-28 16:23:08 +08:00 |
|
|
mayue
|
b59f8c454a
|
* Optimize code.
|
2022-03-28 15:05:26 +08:00 |
|
|
mayue
|
872808d0ac
|
* Optimize code.
|
2022-03-28 14:55:22 +08:00 |
|
|
zhouxin
|
ce6da7784b
|
* Fix bug #21221.
|
2022-03-28 05:58:42 +00:00 |
|
|
mayue
|
3a3e351c8d
|
* Optimize code.
|
2022-03-28 10:52:41 +08:00 |
|
|
xieqiyu
|
41908ac69b
|
* Fix bug of modify index of batch create.
|
2022-03-28 10:27:48 +08:00 |
|
|
zhouxin
|
94c3233d5a
|
* Fix bug #17415.
|
2022-03-28 00:58:29 +00:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +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 |
|
|
李玉春
|
7e0cf1500e
|
Merge branch 'fixbug_cyy' into 'master'
* Fix bug #19745.
See merge request easycorp/zentaopms!2555
|
2022-03-28 00:38:56 +00: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 |
|
|
liyuchun
|
d1f18c6b08
|
Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into 165_package
|
2022-03-25 15:30:06 +08:00 |
|
|
liumengyi
|
2af66dd17f
|
* Fix bug.
|
2022-03-25 15:29:40 +08:00 |
|
|
王怡栋
|
67d4afd772
|
Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'
* fix bug #21005
See merge request easycorp/zentaopms!2546
|
2022-03-25 07:29:20 +00:00 |
|
|
liyuchun
|
b664c25b21
|
* Fix bug #21171.
|
2022-03-25 15:28:14 +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 |
|
|
孙广明
|
da5795f6c5
|
Merge branch 'sprint/165_tanghucheng_fixbug' into 'sprint/165_package'
* Fix bug #21164.
See merge request easycorp/zentaopms!2549
|
2022-03-25 06:59:32 +00: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 |
|
|
tanghucheng
|
1954837f7f
|
* Code for bug #21164.
|
2022-03-25 14:57:25 +08:00 |
|
|
hufangzhou
|
ec34fa3832
|
* Update the library of parse markdown.
|
2022-03-25 14:46:14 +08:00 |
|
|
tanghucheng
|
4ecf869644
|
* Fix bug #21164.
|
2022-03-25 14:42:54 +08: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 |
|
|
Zongjun Lan
|
733cbedc1e
|
* fix bug #21005
|
2022-03-25 14:26:17 +08: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 |
|
|
王怡栋
|
adee678647
|
Merge branch 'sprint/lite6_lwr_remove_score_notice' into 'sprint/165_package'
* remove score notice for lite vision, bug #21119.
See merge request easycorp/zentaopms!2538
|
2022-03-25 06:18:25 +00: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 |
|
|
Wenrui LI
|
aed115d5cf
|
* remove score notice for lite vision, bug #21119.
|
2022-03-25 11:11:10 +08: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 |
|