caoyanyi
|
ae8728b5da
|
* Fix bug #20309.
|
2022-04-06 15:46:25 +08:00 |
|
李玉春
|
7dc812188f
|
Merge branch 'sunhuawei_fixbug_21514' into 'master'
*Fix bug#21514.
See merge request easycorp/zentaopms!2767
|
2022-04-06 07:45:27 +00:00 |
|
李玉春
|
d9393143a6
|
Merge branch 'sprint/tianshujie_bug18710' into 'master'
* Fix bug #18710.
See merge request easycorp/zentaopms!2764
|
2022-04-06 07:39:25 +00:00 |
|
xieqiyu
|
d8774117b9
|
* Fix bug#21290.
|
2022-04-06 15:36:20 +08:00 |
|
孙华伟
|
a10b23a5c0
|
*Fix bug#21514.
|
2022-04-06 15:24:00 +08:00 |
|
tianshujie
|
0530b892e4
|
* Fix bug #18710.
|
2022-04-06 15:22:15 +08:00 |
|
李玉春
|
64f7e522bf
|
Merge branch 'devops24_51071' into 'master'
Finish task#51071
See merge request easycorp/zentaopms!2760
|
2022-04-06 06:42:07 +00:00 |
|
zenggang
|
badb961a37
|
* Adjust code
|
2022-04-06 06:27:49 +00:00 |
|
zenggang
|
6cdf575678
|
* Adjust code
|
2022-04-06 06:07:46 +00:00 |
|
zenggang
|
c149ac6299
|
* Adjust code
|
2022-04-06 06:03:03 +00:00 |
|
xieqiyu
|
d8ef00183b
|
* Fix bug#17296.
|
2022-04-06 13:47:49 +08:00 |
|
Zongjun Lan
|
a161089073
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-04-06 13:37:23 +08:00 |
|
孙华伟
|
3eb12785f1
|
*Fix bug#18381.
|
2022-04-06 13:37:19 +08:00 |
|
tianshujie
|
8aa61bfc0e
|
* Fix bug #14961.
|
2022-04-06 13:31:56 +08:00 |
|
朱金勇
|
a70a61f078
|
Merge branch 'spring/sunhao/bug18928' into 'master'
* bug #18928, fix switch button not work when statistic block place in right side.
See merge request easycorp/zentaopms!2747
|
2022-04-06 05:28:50 +00:00 |
|
zenggang
|
8e0fc555c8
|
* Fix bug#11398
|
2022-04-06 05:19:30 +00:00 |
|
王怡栋
|
d75d09e70a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-06 13:14:16 +08:00 |
|
王怡栋
|
4f5529867b
|
* code for bug #20933.
|
2022-04-06 13:13:29 +08:00 |
|
zenggang
|
4b87e07830
|
* Finish task#51071
|
2022-04-06 04:16:24 +00:00 |
|
Zongjun Lan
|
f22d8882eb
|
* fix bug #21489
|
2022-04-06 11:26:29 +08:00 |
|
hufangzhou
|
87a515c803
|
* Fix the bug of doc lib related actions don't show.
|
2022-04-06 09:53:13 +08:00 |
|
xieqiyu
|
c4e9e00959
|
* Fix bug#13881.
|
2022-04-06 09:49:30 +08:00 |
|
李玉春
|
0bcc43bdff
|
Merge branch 'cyy_20793' into 'master'
* Fix bug #20793.
See merge request easycorp/zentaopms!2741
|
2022-04-06 01:40:29 +00:00 |
|
tianshujie
|
7b731b4a47
|
* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.
|
2022-04-06 08:54:57 +08:00 |
|
xieqiyu
|
843c14c894
|
* Fix bug#6948.
|
2022-04-06 08:46:23 +08:00 |
|
tianshujie
|
824724f657
|
* Fix bug #19813.
|
2022-04-02 20:16:00 +08:00 |
|
王怡栋
|
598a6eb7e9
|
Merge branch 'sprint/fixbug_hufangzhou_16115' into 'master'
* Fix bug #16115.
See merge request easycorp/zentaopms!2745
|
2022-04-02 09:17:13 +00:00 |
|
李玉春
|
8a687ef1d5
|
Merge branch 'sunhuawei_fixbug_20335' into 'master'
Sunhuawei fixbug 20335
See merge request easycorp/zentaopms!2702
|
2022-04-02 09:10:04 +00:00 |
|
孙华伟
|
1612f6aabd
|
Optimize the code.
|
2022-04-02 17:08:34 +08:00 |
|
tianshujie
|
a382e1c434
|
* Fix bug #19813.
|
2022-04-02 16:57:52 +08:00 |
|
Hao Sun
|
025a6f32b0
|
* bug #18928, fix switch button not work when statistic block place in right side.
|
2022-04-02 16:25:02 +08:00 |
|
朱金勇
|
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 |
|
hufangzhou
|
54c00c0907
|
* Fix bug #16115.
|
2022-04-02 16:11:47 +08: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 |
|
caoyanyi
|
bbb19ac183
|
* Fix bug #20793.
|
2022-04-02 15:31:07 +08: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 |
|