Commit Graph
43698 Commits
Author SHA1 Message Date
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
孙广明 4884ee71ae Merge branch '230' into 'sprint/zentaopms230'
* Code for multi task.

See merge request easycorp/zentaopms!5172
2022-08-29 02:43:49 +00: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
孙广明 25614284ed Merge branch '230' into 'sprint/zentaopms230'
* Add openmethod.

See merge request easycorp/zentaopms!5156
2022-08-26 08:07:19 +00:00
sunguangming e4dd6f0356 * Add openmethod. 2022-08-26 16:06:45 +08:00
wangyidong 80330fc4d2 Merge branch '230' into sprint/zentaopms230 2022-08-26 14:52:44 +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
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
sunguangming f49d83f024 Merge branch '230' into sprint/zentaopms230 2022-08-25 09:59:07 +08: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
wangyidong 676c252581 * fix bug for print execution. 2022-08-24 14:16:51 +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 19a2ef4ac8 * fix bug #26741. 2022-08-22 16:58:47 +08:00
wangyidong 5ea9296c09 * fix for php8.1. 2022-08-22 15:08:34 +08: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
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
sunguangming 88ae33eaef * Code for import task bug and add sql. 2022-08-18 15:21:40 +08:00
sunguangming 830fc538ac * Code for taskteam table. 2022-08-18 14:09:52 +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
孙广明 e76905d033 Merge branch '230' into 'sprint/zentaopms230'
* Code for task #65278.

See merge request easycorp/zentaopms!4998
2022-08-17 08:53:11 +00:00