Commit Graph

237 Commits

Author SHA1 Message Date
lanzongjun
0a492b61fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-13 09:08:08 +08:00
lanzongjun
d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
Yagami
27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
Yagami
e5b21b632e * Change execution link stories lang. 2022-12-07 09:10:37 +08:00
lanzongjun
7bef1eaf28 * Finish Task #78670 2022-12-05 11:22:24 +08:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
chaideqing
756a9dc5a5 * Add vi lang. 2022-12-01 10:25:28 +08:00
chaideqing
6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing
bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
lanzongjun
9eebd0051d * Finish Task #77799 2022-11-30 13:44:25 +08:00
lanzongjun
ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
wangyidong
5f0355999c * adjust for link for de lang. 2022-11-29 16:55:40 +08:00
lanzongjun
d671be8b02 project link plan tips 2022-11-29 16:22:24 +08:00
wangyuting
6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
Yagami
a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
xieqiyu
f86b9b0b17 * Fix bug#29440. 2022-11-15 09:51:31 +08:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
tanghucheng
df2e70c0cb * Fix bug #29031. 2022-11-03 14:56:05 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyuting2
ce602cc78e * Finish task #73061. 2022-10-24 08:00:00 +00:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
曹延义
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
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
tianshujie
23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
wangyidong
154023878a * code for task #69248. 2022-09-19 11:29:40 +08:00
wangyidong
ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +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