Commit Graph

559 Commits

Author SHA1 Message Date
tianshujie
ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00
wangyidong
e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
xieqiyu
ea98130180 * Fix bug#27010. 2022-08-29 15:35:01 +08:00
xieqiyu
95b7f73452 * Fix bug#26991. 2022-08-29 13:20:05 +08:00
tianshujie
db4a18e3bd * Methods to optimize execution modules. 2022-08-26 15:10:31 +08:00
sunguangming
f49d83f024 Merge branch '230' into sprint/zentaopms230 2022-08-25 09:59:07 +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
wangyidong
676c252581 * fix bug for print execution. 2022-08-24 14:16:51 +08: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
dongli
57528ecba5 * Finish task #64972,64973. 2022-08-23 06:59:18 +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
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
王怡栋
4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00: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
wangyidong
1a9905ec88 * adjust for add team status. 2022-08-18 16:28:37 +08:00
胡方舟
2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
sunguangming
88ae33eaef * Code for import task bug and add sql. 2022-08-18 15:21:40 +08: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
wangyidong
6d987182a8 * change for multi task teams. 2022-08-17 16:01:41 +08:00
wangyidong
aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
xieqiyu
7ecf79a163 * Fix bug#26545. 2022-08-16 16:36:03 +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
曾刚
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
liuyongkai
fd46c9fd62 * Fix bug of xiangmu 2022-08-10 09:15:36 +00:00
孙广明
26fe219145 Merge branch 'lyk_25249' into 'master'
* Fix bug #25249

See merge request easycorp/zentaopms!4884
2022-08-10 05:57:30 +00:00
xieqiyu
72f038d379 * Fix bug of edit execution can change closedDate. 2022-08-10 11:20:05 +08:00
liuyongkai
fa4d37f1a2 * Fix bug #25249 2022-08-10 03:01:48 +00:00
liumengyi
0ee1e4a63b * Finish task #63891. 2022-08-10 09:55:02 +08:00
xieqiyu
930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
王怡栋
6ba5f3bd67 Merge branch 'master_liuhong_35865' into 'master'
Master liuhong 35865

See merge request easycorp/zentaopms!4857
2022-08-09 05:34:18 +00:00
liuhong
a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
liumengyi
20a208f1f6 * Finish task #63691. 2022-08-08 13:43:16 +08:00
liuyongkai
697ecffce7 * Fix bug #26002,25249 2022-08-05 03:29:29 +00:00
liuyongkai
8837c4c100 * Fix bug $26002,25249 2022-08-05 03:08:10 +00:00
liuyongkai
7ca2f66a28 * Fix bug #26002,25249 2022-08-04 10:26:46 +00:00
李玉春
ed719f768f Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947

See merge request easycorp/zentaopms!4761
2022-08-03 06:52:24 +00:00
tianshujie
6661f80c81 * Fix bug #25984. 2022-08-03 14:19:00 +08:00
tianshujie
167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00