Commit Graph
36237 Commits
Author SHA1 Message Date
孙广明 eda772428a Merge branch 'sprint/max43_mayue_bug#26638' into 'master'
Sprint/max43 mayue bug#26638

See merge request easycorp/zentaopms!5051
2022-08-22 09:11:01 +00:00
李玉春 a31e96170b Merge branch 'sprint/231_tianshujie_65781' into 'master'
Sprint/231 tianshujie 65781

See merge request easycorp/zentaopms!5052
2022-08-22 08:17:49 +00:00
tianshujie 33eb51b9d1 * Finish task #65781. 2022-08-22 16:16:54 +08:00
tianshujie 59000f958f * Finish task #65781. 2022-08-22 16:14:00 +08:00
liumengyi 66532261dd * Fix bug for no execution view. 2022-08-22 15:54:42 +08:00
tianshujie eb35e54251 * Finish task #65781. 2022-08-22 15:48:13 +08:00
tianshujie 2cbee1b76c * Finish task #65781. 2022-08-22 15:38:09 +08:00
tianshujie eac40c40ca * Finish task #65781. 2022-08-22 15:33:06 +08:00
王怡栋 fbc06ff2e3 Merge branch 'master_liuhong_26203' into 'master'
* Fix bug#26203.

See merge request easycorp/zentaopms!5046
2022-08-22 07:24:08 +00:00
mayue 93c0360d42 * Add other language. 2022-08-22 14:50:33 +08:00
mayue 90068c5a8f * Fix bug #26638. 2022-08-22 14:45:51 +08:00
王怡栋 97fb666982 Merge branch 'sprint/master_zhouxudong' into 'master'
* Optimization task #64884.

See merge request easycorp/zentaopms!5032
2022-08-22 05:55:46 +00:00
tianshujie ef4cd6562a * Finish task #65781. 2022-08-22 13:34:10 +08:00
zhouxudong 183e45ec05 * Optimization task #64884. 2022-08-22 05:12:58 +00:00
liuhong d36e4d56a8 * Fix bug#26203. 2022-08-22 03:55:52 +00: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
zhouxudong c42f97c564 * Optimization task #64884. 2022-08-19 06:04:44 +00: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