Commit Graph

489 Commits

Author SHA1 Message Date
孙广明
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
xieqiyu
afa1631a35 * Code for task#58578. Delete name. 2022-06-30 10:09:32 +08:00
leiyong
6f4e6390cb * It is judged that the project name cannot be empty. 2022-06-29 06:02:23 +00:00
leiyong
f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
tianshujie
bf7f947f72 * Finish task #58288. 2022-06-23 15:05:22 +08:00
liumengyi
c26c9dc110 * Optimize code for task #58288. 2022-06-23 09:39:29 +08:00
liumengyi
4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
liumengyi
b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
孙广明
dab3b7eab2 Merge branch 'sprint/207_mayue_bug#23765' into 'zentaopms_207'
* Fix bug #23765.

See merge request easycorp/zentaopms!4037
2022-06-21 07:24:12 +00:00
王怡栋
83ecf656d3 Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.

See merge request easycorp/zentaopms!4033

(cherry picked from commit beaddb012c)

f0c23584 * Code for feedback #397.
2022-06-21 06:28:13 +00:00
王怡栋
c30ba304ab Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
2022-06-21 06:25:45 +00:00
mayue
d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
孙广明
f0c23584e0 * Code for feedback #397. 2022-06-21 10:23:58 +08:00
tianshujie
33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
孙广明
3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
2022-06-16 09:28:33 +00:00
leiyong
f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
王怡栋
bd1dc044d1 Merge branch 'master_xieqiyu_23829' into 'master'
* Fix bug#23829.

See merge request easycorp/zentaopms!3972
2022-06-16 09:03:35 +00:00
liumengyi
e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +08:00
xieqiyu
e33c963505 * Fix bug#23829. 2022-06-16 13:33:23 +08:00
王怡栋
9f7840a2d7 Merge branch 'sprint/204_liumengyi_677' into 'master'
* Fix issue #677.

See merge request easycorp/zentaopms!3966
2022-06-16 03:28:18 +00:00
liumengyi
d369332447 * Fix issue #677. 2022-06-16 11:25:41 +08:00
tianshujie
b3e240eda5 * Finish task #57095. 2022-06-16 10:29:31 +08:00
孙广明
1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
tianshujie
1f0f1ff36e * Finish task #57095. 2022-06-15 16:52:26 +08:00