Commit Graph

512 Commits

Author SHA1 Message Date
李玉春
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
liumengyi
fc60a3f503 * Fix bug #25964. 2022-08-03 13:16:42 +08:00
zenggang
8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
王怡栋
6a7e5939e3 Merge branch 'leiyong_fix_bug' into 'master'
* Fix bug#25807.

See merge request easycorp/zentaopms!4716
2022-07-28 07:59:29 +00:00
leiyong
4d63e9fc36 * Fix bug#25807. 2022-07-28 07:56:15 +00:00
zenggang
dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
mayue
12fa7ecaec * Fix cfd issue. 2022-07-28 11:01:24 +08:00
liumengyi
5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
tianshujie
a84a4098e9 * Fix bug #25721. 2022-07-26 17:18:35 +08:00
tianshujie
a2f203990e * Fixed burnout chart display in execution list. 2022-07-26 17:05:13 +08:00
liumengyi
30b7ecbee7 * Fix bug #24009. 2022-07-26 16:02:47 +08:00
liumengyi
e3d090d917 * Fix bug for task #61975. 2022-07-26 11:18:34 +08:00
liumengyi
c12d5d1da6 * Finish task #61975. 2022-07-25 13:38:49 +08:00
liumengyi
ba16cfa637 * Fix bug #61971. 2022-07-25 13:15:28 +08:00
zenggang
5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
tianshujie
72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie
e8603eef32 * Finish task #61181. 2022-07-19 15:25:43 +08:00
tianshujie
5a56b7bb21 * Fix bug #25400. 2022-07-18 08:50:45 +08:00
孙广明
aedab5c784 Merge branch 'sprint/216_mayue_bug#25358' into 'master'
* Fix bug #25358.

See merge request easycorp/zentaopms!4571
2022-07-15 03:14:57 +00:00
孙广明
c04d08210a * Code for php error. 2022-07-15 10:56:52 +08:00
mayue
e31f207b0b * Fix bug #25358. 2022-07-15 10:45:23 +08:00
孙广明
6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
tianshujie
711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
孙广明
083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08:00
孙广明
327cc16810 * Parent stage don't have link. 2022-07-14 10:53:08 +08:00
孙广明
383a864001 * Add disabled to unclikable btn. 2022-07-14 08:39:56 +08:00
孙广明
d7999be8bf * Remove sprint create child btn. 2022-07-13 10:09:14 +08:00
孙广明
28f6cefe13 * Add burn to execution list. 2022-07-13 09:00:16 +08:00
孙广明
032f5e963a * Add space to execution list. 2022-07-13 08:51:09 +08:00
孙广明
105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明
5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
zenggang
6a84cd7469 * Code for task#60640 2022-07-12 07:15:13 +00:00
xieqiyu
658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
mayue
5bedd02491 * Fix bug #25031. 2022-07-11 09:54:58 +08:00
孙广明
4049441bbe * Fix linkcase bug. 2022-07-08 11:24:09 +08:00
孙广明
1f1b0b1bda * Fix linkcase error. 2022-07-08 11:19:51 +08:00
孙广明
bcd51ec9df * For code error. 2022-07-08 11:13:54 +08:00
mayue
f6d94ad4cb * Fix bug #24848#24817. 2022-07-08 09:06:39 +08:00
孙广明
f6ed1804b3 Merge branch 'sprint213_zg_24761' into 'master'
* Fix bug#24761,Adjuct cfd stat

See merge request easycorp/zentaopms!4414
2022-07-08 01:05:07 +00:00
zenggang
24b36766fb * Adjuct cfd stat 2022-07-07 09:14:30 +00:00
tianshujie
105304ce57 * Fix bug #24946. 2022-07-07 16:18:22 +08:00
mayue
fbb92627b8 * Fix bug #24832. 2022-07-06 15:51:28 +08:00
zenggang
8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
孙广明
9a6689837b * Add date to cfd. 2022-07-06 09:16:36 +08:00
孙广明
cbe74dd653 * Code for cfd details. 2022-07-06 08:44:57 +08:00
孙广明
781259ee6f * Code for CFD. 2022-07-05 21:11:03 +08:00
孙广明
837c796c32 * Fix code details. 2022-07-05 15:07:31 +08:00
孙广明
25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00