 朱金勇
|
33adc0ffbb
|
Merge branch 'sprint/sunhao/bug17170' into 'master'
* bug #17170, support for toggle all children rows on toggle parent row.
See merge request easycorp/zentaopms!2744
|
2022-04-02 08:23:42 +00:00 |
|
|
孙广明
|
ed276fb0fe
|
Merge branch 'master_xieqiyu_20882' into 'master'
* Fix bug#20882.
See merge request easycorp/zentaopms!2743
|
2022-04-02 08:10:56 +00:00 |
|
|
Hao Sun
|
f4222d7247
|
* bug #17170, support for toggle all children rows on toggle parent row.
|
2022-04-02 16:10:53 +08:00 |
|
|
孙广明
|
30645ffbff
|
Merge branch 'master_xieqiyu_21334' into 'master'
* Fix bug#21334.
See merge request easycorp/zentaopms!2729
|
2022-04-02 08:10:36 +00:00 |
|
|
孙广明
|
1b7c01606a
|
Merge branch 'master_xieqiyu_19711' into 'master'
Master xieqiyu 19711
See merge request easycorp/zentaopms!2742
|
2022-04-02 08:10:22 +00:00 |
|
|
王怡栋
|
665bfee637
|
Merge branch 'sprint/fixbug_hufangzhou_17362' into 'master'
* Fix bug #17362.
See merge request easycorp/zentaopms!2740
|
2022-04-02 08:05:56 +00:00 |
|
|
hufangzhou
|
4eeaa81691
|
* Rename the method name.
|
2022-04-02 16:05:19 +08:00 |
|
|
hufangzhou
|
8cd3b4eb9f
|
* Packaging method.
|
2022-04-02 15:58:22 +08:00 |
|
|
王怡栋
|
3f74884813
|
* fix bug #21411.
|
2022-04-02 15:53:38 +08:00 |
|
|
xieqiyu
|
55f3f11e48
|
* Fix bug#19711.
|
2022-04-02 15:44:34 +08:00 |
|
|
xieqiyu
|
f9295faec3
|
* Fix bug#19711.
|
2022-04-02 15:39:03 +08:00 |
|
|
王怡栋
|
adb3a7ea72
|
Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
# module/project/model.php
|
2022-04-02 07:33:24 +00:00 |
|
|
tanghucheng
|
5b2f81b688
|
* Fix bug .
|
2022-04-02 15:11:20 +08:00 |
|
|
李玉春
|
addc89cede
|
Merge branch 'master' into 'sprint/tianshujie_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-04-02 07:07:46 +00:00 |
|
|
tanghucheng
|
ab074962cc
|
* Fix bug of project session.
|
2022-04-02 15:06:17 +08:00 |
|
|
王怡栋
|
031076a570
|
Merge branch 'sprint/fixbug_hufangzhou_projectsession' into 'master'
* Fix bug of project session.
See merge request easycorp/zentaopms!2735
|
2022-04-02 07:06:08 +00:00 |
|
|
hufangzhou
|
c155d3aa96
|
* Fix bug #17362.
|
2022-04-02 15:05:39 +08:00 |
|
|
tianshujie
|
479c647cf5
|
* Fix code style issues.
|
2022-04-02 15:01:16 +08:00 |
|
|
李玉春
|
315c7e1041
|
Merge branch 'sprint/master_zhouxudong_13789' into 'master'
* Fix bug #13789.
See merge request easycorp/zentaopms!2739
|
2022-04-02 06:59:11 +00:00 |
|
|
hufangzhou
|
9ff0537cda
|
* Fix bug #17362.
|
2022-04-02 14:57:33 +08:00 |
|
|
王怡栋
|
f9961cfa52
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-02 14:55:35 +08:00 |
|
|
王怡栋
|
534ed4e9d8
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21422#21455#21413
See merge request easycorp/zentaopms!2733
|
2022-04-02 06:53:04 +00:00 |
|
|
Zongjun Lan
|
6865f5cdd6
|
* fix bug
|
2022-04-02 14:52:33 +08:00 |
|
|
孙广明
|
1c8f929a0d
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.
See merge request easycorp/zentaopms!2684
|
2022-04-02 06:49:30 +00:00 |
|
|
孙广明
|
51499d6b8c
|
Merge branch 'sprint/master_zhouxudong_21378' into 'master'
* Fix bug #21378.
See merge request easycorp/zentaopms!2737
|
2022-04-02 06:48:47 +00:00 |
|
|
王怡栋
|
c18710567b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-02 14:44:44 +08:00 |
|
|
王怡栋
|
6edb5fe805
|
* fix bug #21413.
|
2022-04-02 14:44:18 +08:00 |
|
|
Zongjun Lan
|
1542533e44
|
* fix bug #21455#21413
|
2022-04-02 14:36:13 +08:00 |
|
|
李玉春
|
8329ed43fa
|
Merge branch 'devops24_zenggang' into 'master'
Fix bug#13131,16610
See merge request easycorp/zentaopms!2718
|
2022-04-02 06:32:21 +00:00 |
|
|
tanghucheng
|
8c81661d37
|
* Fix bug #21431.
|
2022-04-02 14:30:25 +08:00 |
|
|
zhouxudong
|
c0bf8f5275
|
* Fix bug #21378.
|
2022-04-02 14:16:09 +08:00 |
|
|
李玉春
|
f59b0c428d
|
Merge branch 'mayue_fix_bug#21359' into 'master'
* Fix bug #21359.
See merge request easycorp/zentaopms!2716
|
2022-04-02 06:13:35 +00:00 |
|
|
李玉春
|
8da183c51b
|
Merge branch 'fixbug_sunjun_20719' into 'master'
Fixbug sunjun 20719
See merge request easycorp/zentaopms!2726
|
2022-04-02 06:12:59 +00:00 |
|
|
mayue
|
cb5f72d34e
|
* Optimize code.
|
2022-04-02 14:11:23 +08:00 |
|
|
tanghucheng
|
1d168b0468
|
* Fix bug #21408,21406,20199.
|
2022-04-02 14:06:41 +08:00 |
|
|
李玉春
|
46a965b02b
|
Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.
See merge request easycorp/zentaopms!2662
|
2022-04-02 06:05:51 +00:00 |
|
|
caoyanyi
|
59efd44767
|
* Adjust codes.
|
2022-04-02 14:03:23 +08:00 |
|
|
hufangzhou
|
1703c7f5bd
|
* Fix bug of project session.
|
2022-04-02 13:55:33 +08:00 |
|
|
tianshujie
|
9d03df55de
|
* Fix bug #19950.
|
2022-04-02 13:46:49 +08:00 |
|
|
tianshujie
|
8b2c7f1288
|
* Fix bug #21158.
|
2022-04-02 13:41:52 +08:00 |
|
|
xieqiyu
|
0ab12f5d80
|
* Fix bug#20882.
|
2022-04-02 13:07:33 +08:00 |
|
|
hufangzhou
|
02d1b146fe
|
* Fix bug #15617.
|
2022-04-02 11:27:37 +08:00 |
|
|
xieqiyu
|
c0a9bad1a6
|
* Fix bug#21334.
|
2022-04-02 11:25:18 +08:00 |
|
|
王怡栋
|
0c669263ba
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18722#19905#21424
See merge request easycorp/zentaopms!2708
|
2022-04-02 02:59:57 +00:00 |
|
|
Zongjun Lan
|
f61cdef8d0
|
* fix bug #21424
|
2022-04-02 10:56:10 +08:00 |
|
|
hufangzhou
|
0608a7dadb
|
* Fix bug #21304.
|
2022-04-02 10:55:16 +08:00 |
|
|
王怡栋
|
b799261c19
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2725
|
2022-04-02 02:39:23 +00:00 |
|
|
tianshujie
|
b2e99c8dd4
|
* Modify the jump link mode.
|
2022-04-02 10:37:43 +08:00 |
|
|
tianshujie
|
a9b0b2127a
|
* Fix bug #21401.
|
2022-04-02 10:26:41 +08:00 |
|
|
孙广明
|
19c7ce9a37
|
Merge branch 'mayue_fix_bug#21435' into 'master'
* Fix bug #21435.
See merge request easycorp/zentaopms!2724
|
2022-04-02 02:23:21 +00:00 |
|