Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
69,410 Commits 2 Branches 292 Tags
e77db07eb2c4bcde646bbd8f8cce94de5e62bee8
Commit Graph
1499 Commits
Author SHA1 Message Date
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
wangyidong 05d5d0054d * code for task #65274. 2022-08-23 15:19:35 +08:00
liuhong 148fa1f91f 0timization task #64879. 2022-08-22 08:05:25 +00:00
wangyidong 4769b92f0c * adjust for task #65271. 2022-08-22 11:13:42 +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
wangyidong 1a9905ec88 * adjust for add team status. 2022-08-18 16:28:37 +08:00
sunguangming a603c45685 * Code for mulit task assigedTo display. 2022-08-18 16:22:51 +08:00
wangyidong 426423881e * code for task #65270. 2022-08-18 12:33:18 +08:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
wangyidong 8d123ee9ff * code for task #65268. 2022-08-18 08:37:40 +08: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