Commit Graph
3408 Commits
Author SHA1 Message Date
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
liyuchun 33e0de2cdc Merge branch 'zenops_44' into liyuchun_65983 2022-08-26 14:28:47 +08:00
liyuchun 61c88f627c * Finish task #65979,65978,65977. 2022-08-26 14:06:01 +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
王怡栋 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 d9c174f921 *Fix bug #26725. 2022-08-24 01:09:11 +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
liuhong 8b12d60a3b *Fix bug #26275. 2022-08-23 20:29:32 +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
liumengyi 6f187e3a23 * Correct the translation. 2022-08-23 17:16:49 +08:00
wangyidong 05d5d0054d * code for task #65274. 2022-08-23 15:19:35 +08:00
wangyidong 19a2ef4ac8 * fix bug #26741. 2022-08-22 16:58:47 +08:00
liuhong 148fa1f91f 0timization task #64879. 2022-08-22 08:05:25 +00: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
zhouxudong 183e45ec05 * Optimization task #64884. 2022-08-22 05:12:58 +00:00
wangyidong c8211237af * code for task #65272. 2022-08-22 11:29:07 +08:00
wangyidong 4769b92f0c * adjust for task #65271. 2022-08-22 11:13:42 +08:00
wangyidong 8ac2f02a8e * code for task #65270. 2022-08-22 10:11:17 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
wangyidong 193b333c5e * add unit test for task. 2022-08-20 19:58:46 +08: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