Commit Graph
36231 Commits
Author SHA1 Message Date
liumengyi fb98e38d42 * Optimize code for task #65807. 2022-08-23 15:03:41 +08:00
tianshujie 5cfc47639a Merge branch 'sprint/231_tianshujie_65808' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/231_tianshujie_65808 2022-08-23 15:03:29 +08:00
tianshujie dca2784559 * Finish task #65808. 2022-08-23 15:02:57 +08:00
liumengyi b016635bd8 * Fix bug for task #65807. 2022-08-23 14:53:24 +08:00
liumengyi 545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
tianshujie 976de6e849 * Fix the problem of error reporting in the contribution task list. 2022-08-23 14:17:43 +08:00
liumengyi cc92f9d3ef * Optimize code. 2022-08-23 13:54:29 +08:00
liumengyi 617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
tianshujie 4e1ca8bd60 * Finish task #65808. 2022-08-23 13:40:34 +08:00
tianshujie d8a419798d * Fix bug #26728. 2022-08-22 14:47:40 +08:00
liumengyi 20041ea696 * Fix bug #26723. 2022-08-22 11:12:38 +08:00
王怡栋 e28e4e8981 Merge branch 'importExport' into 'master'
* Fix bug #26714.

See merge request easycorp/zentaopms!5044
2022-08-22 02:47:35 +00:00
tanghucheng 17f08b4b70 * Fix bug #26714. 2022-08-22 10:46:13 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
liumengyi f5f452bb39 Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 10:06:52 +08:00
liumengyi f42d3690c5 * Finish task #64967. 2022-08-22 10:06:05 +08:00
tianshujie 8916862314 Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 10:02:04 +08:00
tianshujie 060a2d9df0 * Finish task #64967. 2022-08-22 10:01:53 +08:00
liumengyi 5137289dd8 * Fix bug for task #64967. 2022-08-22 09:47:53 +08:00
王怡栋 a232caa81b Merge branch 'sprint/lanzongjun_testunit' into 'master'
testcase user and my

See merge request easycorp/zentaopms!5036
2022-08-22 01:40:39 +00:00
王怡栋 25bb8d8810 Merge branch 'notify_email' into 'master'
* Adjust style

See merge request easycorp/zentaopms!5041
2022-08-22 01:39:56 +00:00
王怡栋 81aae6a252 Update model.php 2022-08-22 01:34:24 +00:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
王怡栋 a4c474011c Merge branch 'sprint/master_zhouxudong_updateCode' into 'master'
* Optimization task #64887.

See merge request easycorp/zentaopms!5033
2022-08-22 01:29:07 +00:00
tianshujie 6bbff6043e Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 09:24:30 +08:00
tianshujie ee63dc4f17 * Finish task #64967. 2022-08-22 09:24:18 +08:00
王怡栋 f8fa7dc0c9 Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5034
2022-08-22 01:23:30 +00:00
liumengyi ee19dd6d4a * Fix bug for task #64967. 2022-08-22 09:22:39 +08:00
zenggang 7ebf86134f * Adjust style 2022-08-19 08:37:39 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
tianshujie c990e09f61 * Finish task #64967. 2022-08-19 16:29:53 +08:00
tianshujie 5eb41bedef * Fixed bug where Kanban prompts for newline under execution. 2022-08-19 15:53:08 +08:00
liyuchun cb2b5d9e24 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-19 15:42:01 +08:00
liyuchun fc4615e871 * Adjust style in repo maintain. 2022-08-19 15:40:00 +08:00
lanzongjun 1148c6fdf6 * module my testcase 2022-08-19 15:28:41 +08:00
lanzongjun b0943b567d * module my testcase 2022-08-19 15:27:43 +08:00
lanzongjun c0c981a1f6 * module my testcase 2022-08-19 15:16:09 +08:00
zhouxudong 000f8842e8 * Fix bug. 2022-08-19 06:55:39 +00:00
tianshujie 0b1327902b * Finish task #63696. 2022-08-19 14:45:10 +08:00
zhouxudong f3b134581f * Optimization task #64887. 2022-08-19 06:43:38 +00:00
tianshujie 36347984e3 * Finish task #64967. 2022-08-19 14:41:30 +08:00
tianshujie 095b35b675 * Fix bug #26339. 2022-08-19 13:48:57 +08:00
liuhong 6d74ea8acc *Fix bug 2022-08-19 05:35:37 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
王怡栋 e75b9b4b5f Merge branch 'sprint/228_tianshujie_api' into 'master'
* Get the execution list.

See merge request easycorp/zentaopms!5029
2022-08-19 05:13:29 +00:00
王怡栋 0c1750f575 Merge branch 'sprint/hufangzhou_action' into 'master'
* Add the ignored object type config for plugin.

See merge request easycorp/zentaopms!5028
2022-08-19 05:12:45 +00:00
王怡栋 035494261b Merge branch 'max42_tanghucheng' into 'master'
* Fix bug #26677.

See merge request easycorp/zentaopms!5027
2022-08-19 05:12:14 +00:00
王怡栋 861242917e Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.

See merge request easycorp/zentaopms!5026
2022-08-19 05:11:53 +00:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
王怡栋 5e76c2db87 Merge branch 'sprint/228_26664' into 'master'
Fix bug#26664

See merge request easycorp/zentaopms!5021
2022-08-19 05:10:19 +00:00