Commit Graph
213 Commits
Author SHA1 Message Date
曹延义 20a77c4811 * Modify language. 2022-10-10 11:05:49 +08:00
李玉春 7f1d674a73 Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
2022-10-09 06:50:04 +00:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
曹延义 84e1f0295d * Code for task #71876. 2022-10-09 11:15:44 +08:00
liuhong 0f9ee29fec *Fix bug #28214. 2022-09-30 07:20:17 +00:00
liuhong 55700db5f3 *Fix bug #27970. 2022-09-26 13:39:56 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
mayue b9efaee057 * Optimize code. 2022-08-31 13:39:59 +08:00
wangyidong 8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
xieqiyu f47daae589 * Modify story review and other about story. 2022-08-22 14:34:37 +08:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
王怡栋 896f7d2fb1 Merge branch 'master_liuhong_63775' into 'master'
*Finish task #63775

See merge request easycorp/zentaopms!4873
2022-08-10 01:31:10 +00:00
tanghucheng d4fb654e5a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_task 2022-08-10 08:26:32 +08:00
tanghucheng 2b1046d40b * Finish task #63793. 2022-08-09 17:34:51 +08:00
王怡栋 65ed4e9ecb Merge branch 'tanghucheng_task' into 'master'
* Finish task #63794.

See merge request easycorp/zentaopms!4863
2022-08-09 08:27:21 +00:00
tanghucheng fb0cf8c0bb * Code for gantt language. 2022-08-09 14:31:05 +08:00
tanghucheng bbf28d9bc0 * Finish task #63794. 2022-08-09 14:24:01 +08:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
xieqiyu 5d422ab3cb * Code for task#63775. 2022-08-09 10:07:45 +08:00
liuhong bd88264c46 *Finish task #63775 2022-08-08 08:08:02 +00:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
wangyuting2 f477e3cf1c * Add execution bug approval menu. 2022-08-04 14:48:51 +08:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
tianshujie 167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
liumengyi 5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
liumengyi 1284608659 * Fix bug #25700. 2022-07-26 16:06:57 +08:00
liumengyi ba16cfa637 * Fix bug #61971. 2022-07-25 13:15:28 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
mayue a21626979e * Fix bug #25081. 2022-07-12 14:25:58 +08:00
zenggang 5d116c16c9 * Finish task#60640 2022-07-12 02:29:20 +00:00
mayue 9248adc1af * Finish task #60639. 2022-07-11 18:10:09 +08:00
mayue 7ff031bc5f * Finish task #59710. 2022-07-08 11:13:30 +08:00
zenggang 4c0375925c * Adjust code 2022-07-06 06:58:25 +00:00
zenggang 8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
孙广明 c4d5027b86 Merge branch 'fixbug_lang' into 'master'
Fixbug lang

See merge request easycorp/zentaopms!4271
2022-06-30 07:10:37 +00:00
sunjun eb1d78fd11 fixbug_lang 2022-06-30 06:45:58 +00:00
xieqiyu afa1631a35 * Code for task#58578. Delete name. 2022-06-30 10:09:32 +08:00
leiyong f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
2022-06-22 09:21:12 +00:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 34ddc497ba Merge branch 'zentaopms_207' 2022-06-22 08:33:17 +08:00
hufangzhou adad8ea3ae * Finish task #57882, #57874, #57873, #57855. 2022-06-21 17:30:36 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
leiyong 725f37fcd0 * Finish task#57868. 2022-06-20 09:55:19 +00:00
liumengyi e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +08:00