Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,673 Commits 2 Branches 292 Tags
cb35891df17c87d5fffa99d10dff21649ce78fd1
Commit Graph
1114 Commits
Author SHA1 Message Date
liyuchun 5f04a8d798 Merge branch 'master' into zenops_44 2022-09-05 09:29:53 +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 db217f9ffe * fix bug #27056. 2022-09-01 14:30:18 +08:00
liyuchun 2fa11c196e * Fix bug #27041. 2022-09-01 13:31:51 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
孙广明 da43a0c083 Merge branch '230' into 'sprint/zentaopms230' 
* Fix bug #27110.

See merge request easycorp/zentaopms!5235
 2022-09-01 05:17:18 +00:00
sunguangming 09a0f1c420 * Fix bug #27110. 2022-09-01 13:16:38 +08:00
wangyidong 2b237ea8e3 * fix bug for assignTo for linea task. 2022-09-01 11:23:12 +08:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master' 
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
 2022-09-01 03:05:12 +00:00
xieqiyu 16094e64d4 * Optimize code. 2022-09-01 11:04:08 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
wangyidong 81197fe961 * fix bug #26744 2022-09-01 10:20:53 +08:00
lanzongjun 07c97f4072 modify processed 2022-09-01 09:40:57 +08:00
lanzongjun 71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun 1a65713332 * finish task #66992 2022-09-01 09:11:10 +08:00
孙广明 c97f2057ed Merge branch '230' into 'sprint/zentaopms230' 
* Fix bug #27023.

See merge request easycorp/zentaopms!5221
 2022-09-01 00:42:23 +00:00
sunguangming ed3dec4d5f * Fix bug #27023. 2022-09-01 08:40:23 +08:00
xieqiyu e6bc611d14 * Finish task#66955. 2022-08-31 19:20:02 +08:00
xieqiyu b026b7c494 * Code for task#66955. 2022-08-31 18:27:42 +08:00
wangyidong 0095192c32 * fix bug for record estimate. 2022-08-31 16:49:21 +08:00
wangyidong cfec41de06 * fix bug #27014. 2022-08-31 11:25:24 +08:00
wangyidong 49700f4923 * fix bug #27016. 2022-08-31 11:20:31 +08:00
wangyidong 4f478a3ec8 * fix bug #27065. 2022-08-31 10:30:42 +08:00
孙广明 8c278d9f59 * Code for multi task. 2022-08-29 10:38:22 +08:00
wangyidong 5f4f284a2b * add for unit test. 2022-08-29 09:07:54 +08:00
wangyidong 7891d77342 * adjust for edit effort. 2022-08-26 22:26:26 +08:00
wangyidong 11c3ef03cc * adjust for delete estimate. 2022-08-26 22:14:53 +08:00
wangyidong f95bca8e7a * adjust for multi task. 2022-08-26 17:47:04 +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 098e89233d * fix bug. 2022-08-26 11:29:21 +08:00
wangyidong b27b2c08fa * adjust for change estimate. 2022-08-26 09:14:49 +08:00
wangyidong 66e188605f * adjust code. 2022-08-25 23:10:18 +08:00
wangyidong d53b19e3a9 * adjust for delete estimate for multi task. 2022-08-25 22:34:39 +08:00
wangyidong d59db04332 * fix bug. 2022-08-25 20:36:29 +08:00
wangyidong 4a50ba5737 * fix for finish task. 2022-08-25 16:14:22 +08:00
wangyidong 00c7f7520d * merge from git stash. 2022-08-25 13:44:08 +08:00
sunguangming f49d83f024 Merge branch '230' into sprint/zentaopms230 2022-08-25 09:59:07 +08:00
王怡栋 589934c524 Merge branch 'sprint/231_zg_65806' into 'master' 
* Finish task#65806

See merge request easycorp/zentaopms!5077
 2022-08-25 00:47:26 +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
王怡栋 cc010cb7f6 Merge branch 'master_liuhong_66233' into 'master' 
*Fix bug #66233.

See merge request easycorp/zentaopms!5074
 2022-08-24 02:56:12 +00:00
zenggang 7dd9fd6e25 * Finish task#65806 2022-08-24 01:10:51 +00:00
liuhong 4e574b0a67 *Fix bug #66233. 2022-08-24 00:57:41 +00:00
liuhong 8afa885e52 *Fix bug #66233. 2022-08-24 00:44:54 +00:00
wangyidong 313a594232 * code for task #65286. 2022-08-23 17:47:30 +08:00
wangyidong fcc537bacc * code for task #65286. 2022-08-23 17:26:04 +08:00