 zenggang
|
261d23bc57
|
* Fix bug#21135
|
2022-04-06 07:36:22 +00: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 |
|
|
李玉春
|
2116639010
|
Merge branch 'sunhuawei_fixbug_18381' into 'master'
*Fix bug#18381.
See merge request easycorp/zentaopms!2762
|
2022-04-06 05:42:23 +00:00 |
|
|
孙华伟
|
3eb12785f1
|
*Fix bug#18381.
|
2022-04-06 13:37:19 +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 |
|
|
孙广明
|
7cac3e87e0
|
Merge branch 'autotest_feilun' into 'master'
Autotest feilun
See merge request easycorp/zentaopms!2757
|
2022-04-06 05:26:00 +00:00 |
|
|
孙广明
|
2da5d460cf
|
Update ztest
|
2022-04-06 05:25:14 +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 |
|
|
孙广明
|
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 |
|
|
zhangxuwen
|
4590b89567
|
Modify cron and caselib testcase
|
2022-04-06 10:22:24 +08:00 |
|
|
zhangxuwen
|
2abcb3ed75
|
Merge branch 'autotest_feilun' of https://gitlab.zcorp.cc/easycorp/zentaopms into autotest_feilun
|
2022-04-06 10:19:06 +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 |
|
|
renying
|
c0c75efea2
|
deal confilect
|
2022-04-02 18:01:03 +08:00 |
|
|
yinjinzhu
|
e40adde8cb
|
auto test release model
|
2022-04-02 17:42:47 +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 |
|
|
zhangxuwen
|
a9f4a4ef50
|
auto test cron model
|
2022-04-02 17:09:08 +08: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 |
|
|
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 |
|
|
朱金勇
|
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 |
|