Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,948 Commits 2 Branches 292 Tags
fd30e0a0062bb94de6cf1dba4af552da316bbc71
Commit Graph
3282 Commits
Author SHA1 Message Date
孙广明 c97f2057ed Merge branch '230' into 'sprint/zentaopms230' 
* Fix bug #27023.

See merge request easycorp/zentaopms!5221
 2022-09-01 00:42:23 +00:00
liuyongkai 161f19e15a * Finish task #67403. 2022-09-01 00:40:48 +00:00
sunguangming ed3dec4d5f * Fix bug #27023. 2022-09-01 08:40:23 +08:00
liuhong 4aff831a07 *Fix bug #66217. 2022-08-31 11:20:09 +00: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 39ce15c672 * fix bug #27092. 2022-08-31 16:11:54 +08:00
wangyidong 1471e7fbb9 * fix bug #27011. 2022-08-31 15:38:22 +08:00
liuhong 83639aaa07 *Fix bug 66217 2022-08-31 06:58:11 +00:00
liuhong b0c1f7c868 *Fix bug #66217. 2022-08-31 06:16:09 +00:00
liuhong 18d6ed7f2d *Fix bug #66217. 2022-08-31 06:13:31 +00:00
sunguangming 5463a7e62c * merge code. 2022-08-31 14:06:04 +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
wangyidong 82fa2a5ddb * fix bug #27067. 2022-08-31 10:18:27 +08:00
liuhong 3dfd3ecfca *Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619. 2022-08-30 04:08:38 +00:00
tianshujie cf56fd3c55 * Fix bug #26758. 2022-08-29 11:12:50 +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
王怡栋 69674273fe Merge branch 'sprint/231_tianshujie_bug' into 'master' 
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5154
 2022-08-26 07:45:42 +00: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
xieqiyu edfb5c538c * Fix bug#26898. 2022-08-26 15:16:50 +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
tianshujie 44e31923f7 * Fix bug #26918. 2022-08-26 10:12:12 +08:00
tianshujie 7aeaaeb573 * Fix bug #26888. 2022-08-26 09:43:50 +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
wangyidong d9b1aa5e8d * adjust for finish. 2022-08-25 13:25:58 +08:00
wangyidong 232c669a4e * adjust for check remove item. 2022-08-25 12:01:52 +08:00
tianshujie c6220519b1 * Modify the required fields on the page for creating a task are incorrect. 2022-08-25 10:40:26 +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
王怡栋 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 1ac7743874 * fix for change task mode. 2022-08-24 23:19:19 +08: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