Commit Graph
37254 Commits
Author SHA1 Message Date
hufangzhou 7d807a5694 * Fix bug #19789. 2022-04-11 14:40:07 +08:00
李玉春 e7974cb64e Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Fix bug#21488.

See merge request easycorp/zentaopms!2819
2022-04-11 06:14:56 +00:00
李玉春 ecf6797cb2 Merge branch 'sprint/master_zhouxudong_15146' into 'master'
Sprint/master zhouxudong 15146

See merge request easycorp/zentaopms!2855
2022-04-11 06:14:39 +00:00
周旭东 36e1809e7c Update control.php 2022-04-11 06:11:03 +00:00
xieqiyu 93cb0c08bf * Fix bug#15146. 2022-04-11 14:07:49 +08:00
孙广明 74af01c97a Merge branch 'fixbugs_zhouxin_21434' into 'master'
* Fix bug #21434.

See merge request easycorp/zentaopms!2854
2022-04-11 06:05:17 +00:00
zhouxin 28a842da55 * Fix bug #21434. 2022-04-11 05:58:43 +00:00
朱金勇 b19df074ab Merge branch 'sprint/scx_updateLang' into 'master'
* Translate lang.

See merge request easycorp/zentaopms!2848
2022-04-11 05:57:47 +00:00
朱金勇 dec9924838 Merge branch 'sgm_testtask' into 'master'
Sgm testtask

See merge request easycorp/zentaopms!2853
2022-04-11 05:57:26 +00:00
孙广明 a8674ddc91 * Add testtask test. 2022-04-11 13:52:02 +08:00
liyang bd2a51defe update build data 2022-04-11 13:52:02 +08:00
songchenxuan 177b9adbfa * Fix api format data bug. 2022-04-11 13:52:02 +08:00
zhouxin 26de46de0a * Fix bug #20812. 2022-04-11 13:52:02 +08:00
xieqiyu a1021a3a74 * Fix bug#19709. 2022-04-11 13:52:02 +08:00
zenggang c61209f40a * Fix bug#20630 2022-04-11 13:52:02 +08:00
孙广明 4cc6f833e1 Merge branch 'sprint/185_fixbug_zhangzilong_19365' into 'master'
* Fix bug #19365.

See merge request easycorp/zentaopms!2850
2022-04-11 03:22:16 +00:00
孙华伟 ce97fdbc7f Update edit.html.php 2022-04-11 03:21:49 +00:00
王怡栋 ddd6157733 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-11 11:18:50 +08:00
王怡栋 709d88226b * fix for case rate of story. 2022-04-11 11:17:31 +08:00
songchenxuan 419c95e8f9 * Translate lang. 2022-04-11 11:10:32 +08:00
王怡栋 2a3c1acea3 Merge branch 'sprint/fixbug_hufangzhou_21184' into 'master'
* Fix bug #21184.

See merge request easycorp/zentaopms!2841
2022-04-11 03:10:10 +00:00
王怡栋 132ee3b78a Merge branch 'sprint/master_fixbug' into 'master'
* Adjust for license.

See merge request easycorp/zentaopms!2847
2022-04-11 03:09:24 +00:00
王怡栋 a181ee1e2b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21598

See merge request easycorp/zentaopms!2844
2022-04-11 03:07:30 +00:00
孙广明 0981d23bcc Merge branch 'dht_personnel' into 'master'
add new personnel unittest

See merge request easycorp/zentaopms!2846
2022-04-11 03:03:47 +00:00
tanghucheng 77aab6fcbf * Fix bug . 2022-04-11 11:00:38 +08:00
denghongtao 8e3fb530a1 add new personnel unittest 2022-04-11 10:54:13 +08:00
孙广明 de73e8d2eb Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master'
* Add auto test of testcase.

See merge request easycorp/zentaopms!2845
2022-04-11 02:53:41 +00:00
liumengyi c00d476e84 * Add auto test of testcase. 2022-04-11 10:48:52 +08:00
孙广明 ccd84601f3 Merge branch 'sprint/tianshujie_bug21210' into 'master'
* Fix bug #21210.

See merge request easycorp/zentaopms!2843
2022-04-11 02:22:55 +00:00
孙广明 d561fb5dd4 Merge branch 'sprint/tianshujie_bug21631' into 'master'
* Fix bug #21631.

See merge request easycorp/zentaopms!2842
2022-04-11 02:22:00 +00:00
Zongjun Lan c5aed66c8e * fix bug #21598 2022-04-11 10:21:17 +08:00
tianshujie edc9f9a75a * Fix bug #21631. 2022-04-11 10:17:52 +08:00
hufangzhou df4c83b23a * Fix bug #21184. 2022-04-11 10:08:13 +08:00
孙广明 08bbc2cb98 Merge branch 'mayue_fix_bug#16601' into 'master'
* Fix bug #16601.

See merge request easycorp/zentaopms!2840
2022-04-11 02:07:56 +00:00
mayue 7efe1e3726 * Fix bug #16601. 2022-04-11 10:05:00 +08:00
zhouxudong 5e5f3c50d1 * Fix bug #15146. 2022-04-11 09:50:59 +08:00
李玉春 8847f7863d Merge branch 'mayue_fix_bug#21616' into 'master'
* Fix bug #21616.

See merge request easycorp/zentaopms!2836
2022-04-11 01:47:15 +00:00
mayue 2cdf6f1e98 * Fix bug #21616. 2022-04-11 09:44:40 +08:00
mayue 512a7dcf78 * Fix bug #21616. 2022-04-11 09:29:24 +08:00
mayue a8d114fe3c * Fix bug #21616. 2022-04-11 09:19:19 +08:00
tianshujie 4a80b55540 * Fix bug #21210. 2022-04-11 09:16:55 +08:00
孙广明 4655f8551d Merge branch 'autotest_ly' into 'master'
update build data

See merge request easycorp/zentaopms!2838
2022-04-11 01:14:11 +00:00
liyang 8e749be5d9 update build data 2022-04-11 09:13:11 +08:00
朱金勇 ec9aef0807 Merge branch 'sprint/scx_api' into 'master'
* Fix api format data bug.

See merge request easycorp/zentaopms!2835
2022-04-11 01:10:52 +00:00
mayue 327ff13564 * Fix bug #21616. 2022-04-11 09:07:38 +08:00
孙广明 bc910099e5 Merge branch 'fixbugs_zhouxin_20812' into 'master'
* Fix bug #20812.

See merge request easycorp/zentaopms!2832
2022-04-11 00:40:25 +00:00
mayue a9c203b866 * Fix bug #21616. 2022-04-11 08:38:13 +08:00
孙广明 93fc1c2617 Merge branch 'master_xieqiyu_19709' into 'master'
* Fix bug#19709.

See merge request easycorp/zentaopms!2831
2022-04-11 00:30:00 +00:00
李玉春 18645df3f2 Merge branch 'devops25_52088' into 'master'
Fix bug#20630

See merge request easycorp/zentaopms!2829
2022-04-11 00:26:38 +00:00
孙广明 9d8df16da8 * Add testtask. 2022-04-09 15:58:16 +08:00