 sunjun
|
a049bfb817
|
*Fixbug 17627
|
2022-03-23 11:32:07 +08:00 |
|
|
sunjun
|
0fe1276953
|
*Fixbug #17627
|
2022-03-23 11:10:44 +08:00 |
|
|
sunjun
|
0cc256d221
|
*Fixbug #17627
|
2022-03-23 11:06:26 +08:00 |
|
|
sunjun
|
69bb361319
|
*Fixbug #17627
|
2022-03-23 09:59:36 +08:00 |
|
|
sunjun
|
3e310f632f
|
fixbug#17627
|
2022-03-22 15:18:35 +08:00 |
|
|
sunjun
|
5dc4afbf0c
|
fixbug #17627
|
2022-03-22 15:09:46 +08:00 |
|
|
sunjun
|
7d85a0d00a
|
fixbug #17627
|
2022-03-22 15:05:08 +08:00 |
|
|
李玉春
|
e7503d435d
|
Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2416
|
2022-03-22 01:39:02 +00:00 |
|
|
xieqiyu
|
f1aa12aae3
|
* Fix bug.
|
2022-03-22 09:36:32 +08:00 |
|
|
王怡栋
|
18298694c6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-22 09:36:30 +08:00 |
|
|
王怡栋
|
e4c3911d5f
|
* fix bug for setstage.
|
2022-03-22 09:36:07 +08:00 |
|
|
王怡栋
|
44bb282b85
|
Merge branch 'sprint/lite6_lwr_fix_id_batch_create' into 'master'
* use correct id for input errors on batch create, task #51316, bug #20963.
See merge request easycorp/zentaopms!2414
|
2022-03-22 01:24:17 +00:00 |
|
|
王怡栋
|
08350a9795
|
Merge branch 'sprint/fixbug_hufangzhou_16114' into 'master'
* Fix bug #16114, #16204.
See merge request easycorp/zentaopms!2415
|
2022-03-22 01:17:53 +00:00 |
|
|
王怡栋
|
ff22527151
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51306,#51304
See merge request easycorp/zentaopms!2395
|
2022-03-22 01:17:19 +00:00 |
|
|
Zongjun Lan
|
1e8b5800be
|
* fix task #51306,#51304
|
2022-03-22 09:16:16 +08:00 |
|
|
hufangzhou
|
a9eebef134
|
* Fix bug #16114, #16204.
|
2022-03-22 09:06:37 +08:00 |
|
|
Wenrui LI
|
90ab73d1f7
|
* use correct id for input errors on batch create, task #51316, bug #20963.
|
2022-03-22 09:02:40 +08:00 |
|
|
王怡栋
|
9ab0bd99c8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-22 09:01:14 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
朱金勇
|
d4ae966ebc
|
Merge branch 'sprint/xuanxuan_93' into 'master'
Zentaoclient related changes from xuanxuan sprint 93
See merge request easycorp/zentaopms!2398
|
2022-03-22 00:55:07 +00:00 |
|
|
liyuchun
|
fc02079335
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-22 08:45:16 +08:00 |
|
|
liyuchun
|
2c276b4322
|
Merge branch 'devops24'
|
2022-03-22 08:44:37 +08:00 |
|
|
xieqiyu
|
0d21516997
|
* Modify create bug.
|
2022-03-22 08:40:43 +08:00 |
|
|
孙广明
|
a222494e09
|
Merge branch 'sprint/sunhao/firefox_bug' into 'master'
* Fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>.
See merge request easycorp/zentaopms!2401
|
2022-03-22 00:34:50 +00:00 |
|
|
孙广明
|
386dd3f000
|
Merge branch 'pailei2_zhouxin_19382' into 'pailei2'
Fix bug #19382.
See merge request easycorp/zentaopms!2392
|
2022-03-22 00:33:36 +00:00 |
|
|
王怡栋
|
b0ebeb78c4
|
Merge branch 'sprint/master_lanzongjun_fixbug_version_biz' into 'master'
* fix bug #15274
See merge request easycorp/zentaopms!2386
|
2022-03-22 00:32:33 +00:00 |
|
|
王怡栋
|
a1f6d6153e
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20968,20964.
See merge request easycorp/zentaopms!2406
|
2022-03-22 00:32:01 +00:00 |
|
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
|
tanghucheng
|
987d0d0443
|
* Fix bug #20968,20964.
|
2022-03-21 17:00:42 +08:00 |
|
|
liyuchun
|
8b2d19b30c
|
* Fix bug #20580.
|
2022-03-21 16:47:57 +08:00 |
|
|
李玉春
|
0e4e9594c7
|
Merge branch 'pailei2_mayue_bug#20808' into 'pailei2'
* Fix bug #20808.
See merge request easycorp/zentaopms!2403
|
2022-03-21 08:44:09 +00:00 |
|
|
mayue
|
8f09a4957c
|
Optimize code.
|
2022-03-21 16:37:56 +08:00 |
|
|
mayue
|
710805bcb0
|
Optimize code.
|
2022-03-21 16:35:54 +08:00 |
|
|
mayue
|
eb54393450
|
* Fix bug #20808.
|
2022-03-21 16:26:28 +08:00 |
|
|
孙广明
|
9995d4c68d
|
Merge branch 'fixbug' into 'master'
* Fix bug for upgrade.
See merge request easycorp/zentaopms!2400
|
2022-03-21 08:13:34 +00:00 |
|
|
孙广明
|
b7ccaaec25
|
Update model.php
|
2022-03-21 08:13:24 +00:00 |
|
|
tanghucheng
|
3bda7c38aa
|
* Fix bug for upgrade.
|
2022-03-21 16:07:03 +08:00 |
|
|
Hao Sun
|
aee62254eb
|
* fix $(window).height() value is difference in firefox: avoid to insert js before <!DOCTYPE html>.
|
2022-03-21 16:03:52 +08:00 |
|
|
Zongjun Lan
|
3d05fdb119
|
* fix task #51306,#51304
|
2022-03-21 14:50:58 +08:00 |
|
|
孙广明
|
c8c25d957f
|
Merge branch 'pailei_sj_17317' into 'pailei2'
fixbug #17317
See merge request easycorp/zentaopms!2394
|
2022-03-21 06:37:20 +00:00 |
|
|
孙广明
|
c44da998c0
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.
See merge request easycorp/zentaopms!2393
|
2022-03-21 06:30:44 +00:00 |
|
|
liumengyi
|
441200128a
|
* Add auto test of bug.
|
2022-03-21 14:29:19 +08:00 |
|
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
|
sunjun
|
c470946d4e
|
fixbug #17317
|
2022-03-21 14:08:52 +08:00 |
|
|
zhouxin
|
22b377a5aa
|
Fix bug #19382.
|
2022-03-21 05:48:13 +00:00 |
|
|
李玉春
|
fe118cd12f
|
Merge branch 'sprint/pailei2_zhouxudong_12671' into 'pailei2'
* Fix bug #12671.
See merge request easycorp/zentaopms!2391
|
2022-03-21 05:40:40 +00:00 |
|
|
zhouxudong
|
53152cbeb0
|
* Fix bug #12671.
|
2022-03-21 13:36:58 +08:00 |
|
|
liyuchun
|
df358d29ef
|
* Fix bug #50954.
|
2022-03-21 13:14:44 +08:00 |
|
|
李玉春
|
57710b38ef
|
Merge branch 'pailei2_sunhuawei_20355' into 'pailei2'
*Fix bug 20355
See merge request easycorp/zentaopms!2389
|
2022-03-21 05:11:31 +00:00 |
|
|
李玉春
|
5559456992
|
Merge branch 'pailei2_mayue_bug14363' into 'pailei2'
* Fix bug #14363.
See merge request easycorp/zentaopms!2388
|
2022-03-21 05:02:46 +00:00 |
|