Commit Graph
37105 Commits
Author SHA1 Message Date
mayue 21a7e2bac1 * Fix bug #21579. 2022-04-07 16:50:03 +08:00
王怡栋 6c1b31ac86 Merge branch 'sprint/fixbug_hufangzhou_splitStory' into 'master'
* Fix bug for lite.

See merge request easycorp/zentaopms!2803
2022-04-07 08:47:58 +00:00
孙广明 475c0d7dd7 Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master'
* Add auto test of testcase.

See merge request easycorp/zentaopms!2802
2022-04-07 08:47:33 +00:00
孙广明 16877a9733 Merge branch 'autotest_feilun' into 'master'
auto test testreport model

See merge request easycorp/zentaopms!2800
2022-04-07 08:47:15 +00:00
hufangzhou 19e8bf99ea * Fix bug for lite. 2022-04-07 16:46:38 +08:00
liumengyi 37ee31d10e * Add auto test of testcase. 2022-04-07 16:46:11 +08:00
王怡栋 f4d2ce3809 Merge branch 'sprint/fixbug_hufangzhou_splitStory' into 'master'
* Fix bug of split story.

See merge request easycorp/zentaopms!2801
2022-04-07 08:43:27 +00:00
hufangzhou 85eb91ce9c * Fix bug of split story. 2022-04-07 16:40:30 +08:00
李玉春 730989ce6c Merge branch 'sunhuawei_fixbug_18309' into 'master'
*Fix bug#18309.

See merge request easycorp/zentaopms!2794
2022-04-07 08:39:06 +00:00
王怡栋 f7ded5c5cf Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2769
2022-04-07 08:38:10 +00:00
wangxiaomeng 89aa89a2f5 auto test testreport model 2022-04-07 16:25:23 +08:00
孙华伟 3e484e917d Update managecontacts.html.php 2022-04-07 08:23:51 +00:00
孙华伟 d351d9bc83 Optimize the code. 2022-04-07 16:22:52 +08:00
文睿 李 896e8c06cc * fix indent. 2022-04-07 08:21:43 +00:00
王怡栋 4b8ed58692 Merge branch 'sprint/fixbug_hufangzhou_doclibaction' into 'master'
* Fix the bug of doc lib related actions don't show.

See merge request easycorp/zentaopms!2755
2022-04-07 08:21:03 +00:00
王怡栋 713bec5182 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21489#21427#21423

See merge request easycorp/zentaopms!2759
2022-04-07 08:19:05 +00:00
Zongjun Lan bf35f0e20a * remove line 2022-04-07 16:18:08 +08:00
Zongjun Lan 931c3ccc38 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-07 16:17:21 +08:00
王怡栋 b79106bc87 Merge branch 'sprint/fixbug_hufangzhou_16198' into 'master'
* Fix bug #16198.

See merge request easycorp/zentaopms!2772
2022-04-07 08:14:44 +00:00
王怡栋 262cdf3eef Merge branch 'sprint/fixbug_hufangzhou_15647' into 'master'
* Fix bug #15647.

See merge request easycorp/zentaopms!2779
2022-04-07 08:14:15 +00:00
王怡栋 ada2189c25 Merge branch 'sprint/fixbug_hufangzhou_15608' into 'master'
* Fix bug #15608.

See merge request easycorp/zentaopms!2798
2022-04-07 08:01:28 +00:00
王怡栋 d2f81a38b7 Merge branch 'sprint/fixbug_hufangzhou_16204' into 'master'
* Fix bug #16204.

See merge request easycorp/zentaopms!2797
2022-04-07 08:00:58 +00:00
孙广明 af9545b817 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.

See merge request easycorp/zentaopms!2756
2022-04-07 07:57:51 +00:00
hufangzhou 32da4b3b25 * Fix bug #16204. 2022-04-07 15:54:06 +08:00
孙广明 cad1bd8c6e Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2795
2022-04-07 07:32:40 +00:00
liyang f711ec0c55 Merge branch 'autotest_ly' of https://gitlab.zcorp.cc/easycorp/zentaopms into autotest_ly 2022-04-07 15:30:29 +08:00
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
liyang 19af348c3c add case data 2022-04-07 15:27:45 +08:00
孙华伟 cb159d5aee *Fix bug#18309. 2022-04-07 15:22:54 +08:00
王怡栋 14e892f6ab Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-07 15:06:23 +08:00
王怡栋 a5e6f2ca15 * fix bug #20885. 2022-04-07 15:05:39 +08:00
孙广明 65132d2517 Merge branch 'master_xieqiyu_21552' into 'master'
* Fix bug#21552.

See merge request easycorp/zentaopms!2789
2022-04-07 06:42:19 +00:00
孙广明 55832ef09f Merge branch 'master_xieqiyu_21468' into 'master'
* Fix bug#21468.

See merge request easycorp/zentaopms!2787
2022-04-07 06:41:25 +00:00
孙广明 6c7711949e Merge branch 'sprint/fixbug_hufangzhou_21525' into 'master'
* Fix bug #21525.

See merge request easycorp/zentaopms!2792
2022-04-07 06:40:20 +00:00
孙广明 dd043d3bda Merge branch 'autotest_ly' 2022-04-07 14:37:24 +08:00
孙广明 18a269ea60 Merge branch 'master' into 'autotest_ly'
# Conflicts:
#   test/data/zentao/processor.php
2022-04-07 06:36:06 +00:00
liyang a03d2d52d2 add design test 2022-04-07 14:33:10 +08:00
hufangzhou fe7158cf3a * Fix bug #21525. 2022-04-07 14:32:44 +08:00
李玉春 5a9dd5095b Merge branch 'fixbug_sunjun_16397' into 'master'
*Fixbug_sunjun_16397

See merge request easycorp/zentaopms!2791
2022-04-07 06:31:07 +00:00
李玉春 29941e73f7 Merge branch 'sprint/tianshujie_bug21159' into 'master'
* Fix bug #21159.

See merge request easycorp/zentaopms!2790
2022-04-07 06:17:30 +00:00
tianshujie f4fd8bbf37 * Fix bug #21159. 2022-04-07 14:13:24 +08:00
sunjun 6b40ab7df0 *Fixbug_sunjun_16397 2022-04-07 14:09:51 +08:00
xieqiyu d6ab24caff * Fix bug#21552. 2022-04-07 13:53:41 +08:00
Hao Sun c36bee8ff0 * bug #13567, support to fit content width for priority label. 2022-04-07 13:49:24 +08:00
李玉春 9a23e30c7a Merge branch 'devops25_51075' into 'master'
Fix bug#19960

See merge request easycorp/zentaopms!2788
2022-04-07 05:14:55 +00:00
Zongjun Lan e9b834db10 * fix bug #21423 2022-04-07 13:08:21 +08:00
李玉春 f53dbe81d9 Merge branch 'fixbugs_zhouxin_20718' into 'master'
* Fix bug #20718.

See merge request easycorp/zentaopms!2784
2022-04-07 05:05:55 +00:00
zenggang 691cde081b * Fix bug#19960 2022-04-07 03:32:14 +00:00
xieqiyu 7892d031e4 * Fix bug#21468. 2022-04-07 11:18:58 +08:00
孙广明 c286e44d55 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16610.

See merge request easycorp/zentaopms!2773
2022-04-07 02:44:02 +00:00