Commit Graph
3042 Commits
Author SHA1 Message Date
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
王怡栋 5d28a2973f Merge branch 'sprint/229' into 'master'
Sprint/229

See merge request easycorp/zentaopms!5018
2022-08-19 00:50:35 +00: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 c8497c2b78 Merge branch 'master_liuhong_26228' into sprint_liuhong 2022-08-18 02:55:01 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 0ec7394ed8 *Fix bug #2622.8 2022-08-18 02:02:47 +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
wangyidong 6d987182a8 * change for multi task teams. 2022-08-17 16:01:41 +08:00
王怡栋 dd1761b300 Merge branch 'sprint/229_zhouxudong_64884' into 'sprint/229'
* Finish task #64884.

See merge request easycorp/zentaopms!4992
2022-08-17 07:29:08 +00:00
周旭东 a3ebcf33d5 Update control.php 2022-08-17 07:18:11 +00:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
zhouxudong ab7e863b62 * Finish task #64884. 2022-08-17 01:03:45 +00:00