Commit Graph
37121 Commits
Author SHA1 Message Date
李玉春 156b77aead Merge branch 'sprint/scx_storyrecall' into 'master'
* Add lang.

See merge request easycorp/zentaopms!2786
2022-04-08 00:22:31 +00:00
李玉春 8fd308411b Merge branch 'devops25_52046' into 'master'
Fix bug #21103,21176

See merge request easycorp/zentaopms!2796
2022-04-08 00:22:17 +00:00
zenggang c67d09a090 * Fix bug#20900 2022-04-07 09:30:51 +00:00
王怡栋 6c07213aa2 Merge branch 'sprint/tianshujie_bug18781' into 'master'
Modify the popup style of the popup window.

See merge request easycorp/zentaopms!2809
2022-04-07 09:25:16 +00:00
孙广明 d9345f6a62 Merge branch 'master_xieqiyu_21550' into 'master'
* Fix bug#21550.

See merge request easycorp/zentaopms!2807
2022-04-07 09:23:31 +00:00
tianshujie 534783603f Modify the popup style of the popup window. 2022-04-07 17:22:26 +08:00
xieqiyu 8aaaeafcb3 * Modify review code. 2022-04-07 17:22:15 +08:00
xieqiyu 1a59190992 * Fix bug#21550. 2022-04-07 17:09:41 +08:00
李玉春 69a8379657 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2806
2022-04-07 09:09:04 +00:00
tianshujie 209f8c9655 * Add comment. 2022-04-07 17:06:42 +08:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
李玉春 329312cde1 Merge branch 'mayue_fix_bug#21579' into 'master'
* Fix bug #21579.

See merge request easycorp/zentaopms!2805
2022-04-07 08:55:02 +00:00
zenggang 49ce3282a9 * Fix bug#6971 2022-04-07 08:50:39 +00:00
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
zenggang 6deba0c240 * Fix bug #21103,21176 2022-04-07 07:44:39 +00: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
tianshujie 2af6c7df8b * Fix bug #20977. 2022-04-07 14:38:41 +08:00
孙广明 dd043d3bda Merge branch 'autotest_ly' 2022-04-07 14:37:24 +08:00