Commit Graph

720 Commits

Author SHA1 Message Date
wangyidong
0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
xieqiyu
ea1b08905c * Fix bug#27124. 2022-09-09 08:19:44 +08:00
xieqiyu
80ff723165 * Code for task#67691. 2022-09-07 16:58:54 +08:00
wangyidong
6972110d54 * adjust for delete estimate. 2022-09-05 20:21:18 +08:00
wangyidong
86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
wangyidong
4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
wangyidong
c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
sunguangming
d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
wangyidong
d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
wangyidong
e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
wangyidong
39ce15c672 * fix bug #27092. 2022-08-31 16:11:54 +08:00
sunguangming
5463a7e62c * merge code. 2022-08-31 14:06:04 +08:00
wangyidong
11c3ef03cc * adjust for delete estimate. 2022-08-26 22:14:53 +08:00
tianshujie
eb6b6b061f * Fix bug #26950. 2022-08-26 15:34:18 +08:00
tianshujie
ae8f299b55 * Fix bug #26950. 2022-08-26 15:25:17 +08:00
王怡栋
3eaf146f25 Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
#   module/task/model.php
2022-08-26 06:52:24 +00:00
wangyidong
3a5f4201ed * adjust for multi task. 2022-08-26 14:50:48 +08:00
王怡栋
662f428288 Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
#   module/task/control.php
2022-08-26 06:39:53 +00:00
sunguangming
a27dc9a3f2 * Code for mulit task. 2022-08-26 14:33:50 +08:00
wangyidong
d9b1aa5e8d * adjust for finish. 2022-08-25 13:25:58 +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
c0467f2b7d * adjust for activate task. 2022-08-24 22:20:54 +08:00
sunguangming
01172dd284 * Code for muliple task. 2022-08-24 16:05:21 +08: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
wangyidong
fcc537bacc * code for task #65286. 2022-08-23 17:26:04 +08:00
liuhong
4d20bd7bf4 *Fix bug #26725. 2022-08-22 06:31:23 +00:00
王怡栋
97fb666982 Merge branch 'sprint/master_zhouxudong' into 'master'
* Optimization task #64884.

See merge request easycorp/zentaopms!5032
2022-08-22 05:55:46 +00:00
王怡栋
4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
liuhong
650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
wangyidong
5a61f56960 * adjust for start and finish linear task. 2022-08-19 15:47:24 +08:00
zhouxudong
c42f97c564 * Optimization task #64884. 2022-08-19 06:04:44 +00:00
liuhong
f0cdfea18a *Fix bug 2022-08-19 02:39:40 +00:00
liuhong
0ec7394ed8 *Fix bug #2622.8 2022-08-18 02:02:47 +00:00
wangyidong
ae326809cc * adjust for start, assignto, finish task in linear task. 2022-08-17 21:15:36 +08:00
sunguangming
7f69b62231 * Code for task #65278. 2022-08-17 16:51:28 +08:00
sunguangming
6a1bb3f756 * Code for task #65278. 2022-08-17 16:13:26 +08:00
周旭东
a3ebcf33d5 Update control.php 2022-08-17 07:18:11 +00:00
wangyidong
aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
zhouxudong
c322d1cea5 * Finish task #64877. 2022-08-15 12:59:27 +00:00
tianshujie
26085d7a41 * Operations type execution and story or design type stage do not display story field. 2022-08-12 14:56:27 +08:00
zhouxudong
b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
zhouxudong
9d5f891419 * Finish task #61441. 2022-07-21 01:40:43 +00:00
zhouxudong
1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
zhouxudong
c637a40725 * Finish task #61441. 2022-07-20 06:56:14 +00:00
zhouxudong
8e46671c20 * Finish task #61441. 2022-07-20 03:07:38 +00:00
zhouxudong
178ea59c4e * Finish task #61441. 2022-07-20 02:30:19 +00:00
zhouxudong
5688575ea9 * Fix bug. 2022-07-18 03:13:48 +00:00
孙广明
900e2342a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4582
2022-07-15 06:16:50 +00:00