Commit Graph
1994 Commits
Author SHA1 Message Date
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
王怡栋 d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2 fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
李玉春 06a38f17e3 Merge branch 'sprint/renying_Fixbug#21999' into 'master'
Sprint/renying fixbug#21999

See merge request easycorp/zentaopms!3215
2022-04-29 05:34:30 +00:00
renying d17854d07d Fixbug#21999 2022-04-29 05:11:53 +00:00
xieqiyu 88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
renying a2430ed507 Fixbug#21999 2022-04-29 03:13:32 +00:00
renying e06c2e8666 Fixbug#21999 2022-04-29 03:10:49 +00:00
renying 6a5e9b8657 Fixbug#21999 2022-04-29 02:50:51 +00:00
孙广明 8d8b999608 Merge branch 'fixbug_sunjun_17329' into 'master'
*Fixbug_sunjun_17329

See merge request easycorp/zentaopms!3188
2022-04-28 06:23:11 +00:00
sunjun 7f7f3013ea *Fixbug_sunjun_17329 2022-04-28 06:18:13 +00:00
liyuchun 537c1bea2d * Fix bug #15039. 2022-04-28 02:06:10 +00:00
zhouxudong 06cd4caa4d * Fix bug #22024. 2022-04-27 01:55:30 +00:00
zhouxudong a2e957e3c8 * Fix bug #22024. 2022-04-27 01:49:17 +00:00
wangyidong 0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
孙广明 57e90b8dbc * Fix bug for qiqi. 2022-04-22 14:42:22 +08:00
孙广明 8dec8a485b * Fix bug for qiqi. 2022-04-22 14:31:06 +08:00
孙广明 6509056a9e * Fix bug for qiqi. 2022-04-22 14:27:32 +08:00
tianshujie 0a5ef1e4fa * Fix bug #18060. 2022-04-21 16:51:57 +08:00
tianshujie ec0faba808 * Fix bug #18060. 2022-04-21 15:59:45 +08:00
tianshujie edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
zhouxin 6097b53514 * Fix bug. 2022-04-18 08:35:55 +00:00
liyuchun 13d354ba8c * Fix bug #21518. 2022-04-18 11:35:36 +08:00
zhouxin b04e4d2236 * Fix bug #21801. 2022-04-15 07:36:19 +00:00
tianshujie 5fa9f0d1a9 * Fix bug #21717. 2022-04-14 15:48:09 +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
tianshujie 1ef7a9f6b0 * Fix bug #16607. 2022-04-13 09:45:05 +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
tanghucheng 7e1a3564d1 * Fix bug #21614. 2022-04-12 17:02:48 +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
王怡栋 403ad59a5f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-12 15:03:48 +08: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
tianshujie a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
mayue 8730491de8 * Fix bug#17864. 2022-04-12 10:54:21 +08:00
孙广明 2b02f4dd38 Merge branch 'fixbug_sunjun_21618' into 'master'
Fixbug sunjun 21618

See merge request easycorp/zentaopms!2859
2022-04-12 01:40:59 +00:00
sunjun c36f432e1a *Fixbug_sunjun_21618 2022-04-12 08:35:31 +08:00
xieqiyu c7894fdb78 * Fix bug#15697. 2022-04-11 16:07:45 +08:00
sunjun ce5044b2a5 *Fixbug_sunjun_21618 2022-04-11 14:53:31 +08:00
sunjun 75a70acec3 *Fixbug_sunjun_21618 2022-04-11 14:50:59 +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
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