Commit Graph
32185 Commits
Author SHA1 Message Date
zhouxudong 37337bdb68 * Fix bug #17994. 2022-04-13 10:59:25 +08:00
tanghucheng 0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
zhouxudong 19f499e121 * Fix bug #17994. 2022-04-13 10:36:39 +08:00
zhouxudong 7ac526401d * Fix bug #21700. 2022-04-13 10:08:53 +08:00
孙广明 64df7ac5c0 Merge branch 'sunhuawei_fixbug_21668' into 'master'
*Fix bug#21668

See merge request easycorp/zentaopms!2903
2022-04-13 02:07:02 +00:00
王怡栋 f6b236aed7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-13 10:02:05 +08:00
王怡栋 a9809c35aa * code for bug #20823. 2022-04-13 10:01:36 +08:00
孙华伟 df57c95636 *Fix bug#21668 2022-04-13 09:59:37 +08:00
王怡栋 f9e8a8d69f Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21614.

See merge request easycorp/zentaopms!2896
2022-04-13 01:55:56 +00:00
王怡栋 9529d136a8 Merge branch 'sprint/tianshujie_bug17280' into 'master'
Sprint/tianshujie bug17280

See merge request easycorp/zentaopms!2902
2022-04-13 01:54:16 +00:00
tianshujie 2e5b43979e * Fix bug #21641. 2022-04-13 09:51:40 +08:00
tianshujie 1ef7a9f6b0 * Fix bug #16607. 2022-04-13 09:45:05 +08:00
孙广明 e172ea39b6 Merge branch 'fixbug_zhouxin_18307' into 'master'
* Fix bug #18307.

See merge request easycorp/zentaopms!2527
2022-04-13 01:34:42 +00:00
zhouxudong 1dd4af6ff3 * Fix bug #17994. 2022-04-13 09:26:20 +08:00
tianshujie f6cf76e520 * Fix bug #19261. 2022-04-13 09:18:15 +08:00
tianshujie 04dc939bda Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug17280 2022-04-13 09:15:30 +08:00
xieqiyu 41b48ac200 * Fix bug of create test case. 2022-04-13 09:13:50 +08:00
zhouxudong 233a035b12 * Fix bug #17994. 2022-04-12 17:23:24 +08:00
李玉春 34451f5715 Merge branch 'devops26_52583' into 'master'
Fix bug#21649,21512,21002

See merge request easycorp/zentaopms!2882
2022-04-12 09:06:51 +00:00
tanghucheng 7e1a3564d1 * Fix bug #21614. 2022-04-12 17:02:48 +08:00
王怡栋 9a10781201 Merge branch 'sprint/tianshujie_bug21641' into 'master'
Sprint/tianshujie bug21641

See merge request easycorp/zentaopms!2887
2022-04-12 08:55:41 +00:00
王怡栋 a8a174a455 Merge branch 'sprint/fixbug_hufangzhou_17974' into 'master'
* Fix bug #17974 for objectlibs method.

See merge request easycorp/zentaopms!2889
2022-04-12 08:55:02 +00:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
王怡栋 827d74f46e Merge branch 'sprint/scx_doclang' into 'master'
* Move doc lang.

See merge request easycorp/zentaopms!2891
2022-04-12 08:46:07 +00:00
孙广明 e17188285c Merge branch 'master_xieqiyu_19625' into 'master'
* Fix bug#19625.

See merge request easycorp/zentaopms!2890
2022-04-12 08:33:15 +00:00
孙广明 6ef66fd6ef Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.

See merge request easycorp/zentaopms!2885
2022-04-12 08:32:47 +00:00
孙广明 ee9aaa85b8 Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.

See merge request easycorp/zentaopms!2884
2022-04-12 08:32:31 +00:00
孙广明 b309300da4 Merge branch 'mayue_fix_bug#18065' into 'master'
* Fix bug#18065.

See merge request easycorp/zentaopms!2886
2022-04-12 07:58:45 +00:00
孙广明 d82b552898 Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.

See merge request easycorp/zentaopms!2893
2022-04-12 07:52:52 +00:00
zhouxin 6cdeacd9ac * Fix bug #21374. 2022-04-12 07:51:55 +00:00
孙广明 92eb57d9ef Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Beautify the interface.

See merge request easycorp/zentaopms!2894
2022-04-12 07:50:54 +00:00
孙华伟 6c85c8f49c *Beautify the interface. 2022-04-12 15:47:01 +08:00
zhouxin 125fa381fc * Fix bug #21374. 2022-04-12 07:40:28 +00:00
songchenxuan 95e6a143a8 * Move doc lang. 2022-04-12 15:37:55 +08:00
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
xieqiyu e7314a8343 * Fix bug#19625. 2022-04-12 15:27:51 +08:00
mayue 4aaefa9fb7 * Fix bug #18065. 2022-04-12 15:24:47 +08:00
tianshujie 69be820156 * Restore code. 2022-04-12 15:19:39 +08:00
tianshujie b0e5f808c4 * Modify the default value of a function. 2022-04-12 15:13:15 +08:00
tianshujie e1df191578 * Fix bug #17280. 2022-04-12 15:12:45 +08:00
hufangzhou 07a887f62c * Fix bug #17974 for objectlibs method. 2022-04-12 15:10:20 +08:00
王怡栋 403ad59a5f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-12 15:03:48 +08:00
孙广明 0e676c281a Merge branch 'mayue_fix_bug#17864' into 'master'
* Fix bug#17864.

See merge request easycorp/zentaopms!2880
2022-04-12 07:02:41 +00:00
王怡栋 538f831692 Merge branch 'master' into 'sprint/tianshujie_bug16527'
# Conflicts:
#   module/testcase/control.php
#   module/testcase/view/batchedit.html.php
2022-04-12 06:57:23 +00:00
孙广明 2f5a7dccef Merge branch 'fixbugs_zhouxin_21636' into 'master'
* Fix bug #21636.

See merge request easycorp/zentaopms!2877
2022-04-12 06:47:00 +00:00
孙广明 1e86d0872a Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488

See merge request easycorp/zentaopms!2879
2022-04-12 06:44:47 +00:00
孙华伟 684196f776 *Optimize the code. 2022-04-12 14:43:05 +08:00
zhengrunyu 9cb5cb1134 * Add api for resolve bug. 2022-04-12 14:40:48 +08:00
孙华伟 91597abdb7 *Optimize the code. 2022-04-12 14:39:27 +08:00
孙华伟 03cf60bdcb *project,execution,bug have the same problem. 2022-04-12 14:26:12 +08:00