 liumengyi
|
3f65617afc
|
* Add auto test of action.
|
2022-04-06 17:16:35 +08:00 |
|
|
孙广明
|
e7b10d4c3d
|
Merge branch 'autotest_ly' into 'master'
update action data
See merge request easycorp/zentaopms!2758
|
2022-04-06 02:49:15 +00:00 |
|
|
liyang
|
0b8768c1d6
|
update action data
|
2022-04-06 10:48:24 +08:00 |
|
|
孙广明
|
6a5231b013
|
Merge branch 'master_xieqiyu_13881' into 'master'
* Fix bug#13881.
See merge request easycorp/zentaopms!2754
|
2022-04-06 01:53:08 +00: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 |
|
|
李玉春
|
938173d32c
|
Merge branch 'app_zry' into 'master'
* Change api for edit story.
See merge request easycorp/zentaopms!2753
|
2022-04-06 01:40:04 +00:00 |
|
|
zhengrunyu
|
365a048084
|
* Change api for edit story.
|
2022-04-06 09:38:07 +08:00 |
|
|
孙广明
|
56dc995d61
|
Merge branch 'master_xieqiyu_6948' into 'master'
* Fix bug#6948.
See merge request easycorp/zentaopms!2751
|
2022-04-06 00:51:24 +00:00 |
|
|
孙广明
|
918fd9af30
|
Merge branch 'autotest_ly' into 'master'
update action data
See merge request easycorp/zentaopms!2752
|
2022-04-06 00:50:13 +00:00 |
|
|
liyang
|
d05a941079
|
update action data
|
2022-04-06 08:48:56 +08:00 |
|
|
xieqiyu
|
843c14c894
|
* Fix bug#6948.
|
2022-04-06 08:46:23 +08:00 |
|
|
孙广明
|
d355805659
|
Merge branch 'autotest_ly' into 'master'
add history data
See merge request easycorp/zentaopms!2750
|
2022-04-06 00:45:05 +00:00 |
|
|
liyang
|
23c6643896
|
add history data
|
2022-04-06 08:44:02 +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 |
|
|
李玉春
|
3aa896ccb7
|
Merge branch 'sprint/tianshujie_19813' into 'master'
* Fix bug #19813.
See merge request easycorp/zentaopms!2748
|
2022-04-02 09:06:25 +00:00 |
|
|
tianshujie
|
a382e1c434
|
* Fix bug #19813.
|
2022-04-02 16:57:52 +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 |
|
|
朱金勇
|
b376b08cbd
|
Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest
See merge request easycorp/zentaopms!2746
|
2022-04-02 08:23:16 +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 |
|
|
王怡栋
|
1deb2c4f25
|
Merge branch 'sprint/master_fixbug'
|
2022-04-02 15:33:52 +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 |
|
|
孙广明
|
cee1b2bbf8
|
* Finish program test.
|
2022-04-02 15:23:42 +08:00 |
|
|
tanghucheng
|
b352dc9a86
|
* Fix bug.
|
2022-04-02 15:17:17 +08:00 |
|
|
tanghucheng
|
5b2f81b688
|
* Fix bug .
|
2022-04-02 15:11:20 +08:00 |
|
|
liyuchun
|
388314c625
|
Merge branch 'sprint/tianshujie_fixbug'
|
2022-04-02 15:09:30 +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 |
|