Commit Graph
77 Commits
Author SHA1 Message Date
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
liuhong 55700db5f3 *Fix bug #27970. 2022-09-26 13:39:56 +00:00
wangyidong 154023878a * code for task #69248. 2022-09-19 11:29:40 +08:00
mayue b9efaee057 * Optimize code. 2022-08-31 13:39:59 +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
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
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 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 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
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
songchenxuan 2507b9ba75 *Fix bug 17682. 2021-12-23 16:24:11 +08:00
孙广明 0036787aac * Add en lang. 2021-10-28 14:43:55 +08:00
tianshujie ab662e5cf4 * Fix bug #15511. 2021-10-14 13:31:08 +08:00
dingna 5b5ae6dfdd * Finish task #42827. 2021-09-27 16:21:26 +08:00
xieqiyu 7fffa6c380 * Code for bug#15148. 2021-09-14 10:33:48 +08:00
xieqiyu fbf6b37c23 * Finish task#42128. 2021-09-03 10:48:17 +08:00
qiyu-xie 00e47922e0 * Delete unused language items. 2021-08-19 09:19:54 +08:00
qiyu-xie 920ab4050f * Finish task#41432. 2021-08-16 14:05:25 +08:00
qiyu-xie 40f1d0e5d7 * Finish task#41427. 2021-08-16 13:40:46 +08:00
tianshujie98 18fd529d8e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-11 15:04:46 +08:00
tianshujie98 201285215b * Finish task #41244. 2021-08-11 15:04:29 +08:00
holan20180123 487662ad62 * Finish task #41237. 2021-08-11 10:58:03 +08:00
qiyu-xie 685b270170 * Finish task#40313. 2021-07-16 11:29:29 +08:00