Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,700 Commits 2 Branches 292 Tags
1471e7fbb9c5e24ff4cf34cefa16ecb77fbd8e3b
Commit Graph
1083 Commits
Author SHA1 Message Date
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
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
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
wangyidong 4769b92f0c * adjust for task #65271. 2022-08-22 11:13:42 +08:00
wangyidong 193b333c5e * add unit test for task. 2022-08-20 19:58:46 +08: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
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
wangyidong 6d987182a8 * change for multi task teams. 2022-08-17 16:01:41 +08:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
lanzongjun 5915e3189c add gantt move order 2022-08-12 17:04:49 +08:00
lanzongjun 886c392287 add cp gantt task move 2022-08-12 16:18:57 +08:00
lanzongjun 9fa80dcd94 add cp gantt task move 2022-08-12 16:15:08 +08:00
mayue b7310d4748 * Fix bug 25891. 2022-08-11 10:12:23 +08:00
liuyongkai fa4d37f1a2 * Fix bug #25249 2022-08-10 03:01:48 +00:00
王怡栋 2dec053c27 Merge branch 'sprint/221_dongli_bug63666' into 'master' 
* Fix bug #63666.

See merge request easycorp/zentaopms!4861
 2022-08-09 06:50:20 +00:00
dongli bec6a7c3bf * Fix bug #63666. 2022-08-09 06:09:17 +00:00
王怡栋 ed951dc12e Merge branch 'sprint/gantt_upgrade' into 'master' 
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4835
 2022-08-08 03:25:42 +00:00
mayue b338d96743 * Optimize code. 2022-08-08 10:41:26 +08:00
mayue fc13fad289 resolve conflict 2022-08-08 10:39:25 +08:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
孙广明 9f323c631a Merge branch 'lyk_26002_25249' into 'master' 
Lyk 26002 25249

See merge request easycorp/zentaopms!4816
 2022-08-05 03:34:42 +00:00
liuyongkai eef158bcb6 * Fix bug 26002,25249 2022-08-05 03:32:47 +00:00