Commit Graph

2477 Commits

Author SHA1 Message Date
wangyidong
8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
tianshujie
e45c8da5c8 * Fix bug #26954. 2022-08-26 15:32:33 +08:00
孙广明
3fde178457 Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case

See merge request easycorp/zentaopms!5151
2022-08-26 07:12:18 +00:00
tianshujie
db4a18e3bd * Methods to optimize execution modules. 2022-08-26 15:10:31 +08:00
liumengyi
3da9fdd18c * Fix bug #26916. 2022-08-26 09:49:54 +08:00
tianshujie
db036c9172 * Fix bug #26879. 2022-08-25 15:31:31 +08:00
tianshujie
ad240eab61 * Fix bug #26889. 2022-08-25 15:28:47 +08:00
李玉春
9acdb61b77 Merge branch 'cyy_api' into 'master'
* Modify api param and app error.

See merge request easycorp/zentaopms!5107
2022-08-25 05:53:31 +00:00
caoyanyi
d764b13971 * Modify api param and app error. 2022-08-25 10:08:36 +08:00
王怡栋
1092812a40 Merge branch 'master_liuhong_26725' into 'master'
*Fix bug #26725.

See merge request easycorp/zentaopms!5049
2022-08-25 01:05:32 +00:00
王怡栋
297a416762 Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
#   module/story/control.php
2022-08-25 00:51:00 +00:00
王怡栋
638be2116b Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5065
2022-08-25 00:46:17 +00:00
liuhong
11c2730361 *Fix bug #26725. 2022-08-24 03:28:26 +00:00
zenggang
73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
王怡栋
03ea51fe76 Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
liuhong
d9c174f921 *Fix bug #26725. 2022-08-24 01:09:11 +00:00
liuhong
8b12d60a3b *Fix bug #26275. 2022-08-23 20:29:32 +00:00
李玉春
3e487df2b3 Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
2022-08-23 08:26:36 +00:00
liumengyi
c95ecbd1a6 * Optimize code for task #65808. 2022-08-23 16:19:20 +08:00
dongli
57528ecba5 * Finish task #64972,64973. 2022-08-23 06:59:18 +00:00
liumengyi
545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
liumengyi
617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
zhouxudong
7ed184a915 * Fix bug. 2022-08-23 03:26:11 +00:00
王怡栋
5c3a2b5ddc Merge branch 'sprint/hufangzhou_26743' into 'master'
* Fix bug #26743. And modify the unit case of batch edit under the execution module.

See merge request easycorp/zentaopms!5056
2022-08-23 01:55:40 +00:00
王怡栋
b688c564f5 Merge branch 'sprint/master_zhouxudong_66231' into 'master'
* Finish task #66231.

See merge request easycorp/zentaopms!5061
2022-08-23 01:50:26 +00:00
dongli
cedf77727b * Finish task #64972,64973. 2022-08-22 13:03:04 +00:00
xieqiyu
99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
hufangzhou
33324f758f * Fix bug #26743. 2022-08-22 16:32:48 +08:00
hufangzhou
c34766a68d * Fix bug #26743. And modify the unit case of batch edit under the execution module. 2022-08-22 16:09:39 +08:00
zhouxudong
cc6d27636f * Finish task #66231. 2022-08-22 08:06:41 +00:00
tianshujie
d8a419798d * Fix bug #26728. 2022-08-22 14:47:40 +08:00
xieqiyu
f47daae589 * Modify story review and other about story. 2022-08-22 14:34:37 +08:00
王怡栋
4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
tianshujie
5eb41bedef * Fixed bug where Kanban prompts for newline under execution. 2022-08-19 15:53:08 +08:00
曾刚
caed6b27cd Fix bug#26664 2022-08-19 05:10:19 +00:00
liuhong
f0cdfea18a *Fix bug 2022-08-19 02:39:40 +00:00
胡方舟
2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
曾刚
3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
liuhong
0ec7394ed8 *Fix bug #2622.8 2022-08-18 02:02:47 +00:00
王怡栋
fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
xieqiyu
7ecf79a163 * Fix bug#26545. 2022-08-16 16:36:03 +08:00
tianshujie
2e8cc2c19f * Restore code. 2022-08-15 19:37:05 +08:00
tianshujie
396673bd6d * Refactor the getStats method under the project. 2022-08-15 18:57:50 +08:00
tianshujie
72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
tianshujie
4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08:00
zhujinyong
50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
liuyongkai
4f60c73ab5 * Fix bug #26364 2022-08-12 08:52:29 +00:00
曾刚
de80b35803 * Fix bug#26389,26333,26328 2022-08-12 08:17:54 +00:00
xieqiyu
17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
liumengyi
f540e58388 * Fix bug. 2022-08-12 14:25:29 +08:00