Commit Graph
37407 Commits
Author SHA1 Message Date
王怡栋 0ebf3671d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-08 10:18:12 +08:00
孙广明 e2d5fe33e1 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20986.

See merge request easycorp/zentaopms!2818
2022-04-08 02:17:04 +00:00
王怡栋 63761f3d23 * adjust for icon-version. 2022-04-08 10:13:35 +08:00
sunjun 95b2c3317a *Fixbug_sunjun_17344 2022-04-08 10:11:16 +08:00
liyuchun ff102f75c4 * Fix bug #20986. 2022-04-08 10:07:46 +08:00
xieqiyu 6618197691 * Fix bug#19196. 2022-04-08 09:48:11 +08:00
sunjun 7c540be4d7 *Fixbug_sunjun_17344 2022-04-08 09:37:49 +08:00
李玉春 5c78c8825d Merge branch 'sprint/master_zhouxudong_15442' into 'master'
* Fix bug #15442.

See merge request easycorp/zentaopms!2812
2022-04-08 01:22:39 +00:00
zhouxudong da24c3abf9 * Fix bug #15442. 2022-04-08 09:21:39 +08:00
caoyanyi a6a56ea4fe * Fix bug #17175. 2022-04-08 09:18:27 +08:00
孙广明 e55a88b34b * Finish project test. 2022-04-08 09:16:57 +08:00
李玉春 a0c697e670 Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!2810
2022-04-08 01:13:44 +00:00
Zongjun Lan 2bede46847 * modify version name 2022-04-08 08:51:21 +08:00
renying 846e904b01 Add auto test of custom. 2022-04-08 08:42:01 +08:00
孙广明 803ed24768 Merge branch 'autotest_ly' into 'master'
add design test

See merge request easycorp/zentaopms!2811
2022-04-08 00:30:27 +00:00
孙广明 6df9232062 Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master'
* Add auto test of testcase.

See merge request easycorp/zentaopms!2804
2022-04-08 00:28:59 +00:00
liyang 9d5cedc97b add design test 2022-04-08 08:28:52 +08:00
李玉春 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
zhouxudong 3bf6c7fd5e * Fix bug #15442. 2022-04-07 17:26:23 +08: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
Hao Sun edfae1f3c5 * bug #21160, optimize chosen UI. 2022-04-07 17:11:28 +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
liumengyi 82fe0608eb * Add auto test of testcase. 2022-04-07 16:50:52 +08:00
zenggang 49ce3282a9 * Fix bug#6971 2022-04-07 08:50:39 +00:00
caoyanyi 020834ec7a * Fix bug #11026. 2022-04-07 16:50:28 +08:00
caoyanyi 4819b30292 * Fix bug #18018. 2022-04-07 16:50:05 +08:00
mayue 21a7e2bac1 * Fix bug #21579. 2022-04-07 16:50:03 +08:00
liumengyi 67ada70ab2 * Add auto test of testcase. 2022-04-07 16:48:31 +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