Commit Graph
43673 Commits
Author SHA1 Message Date
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
sunguangming 7f69b62231 * Code for task #65278. 2022-08-17 16:51:28 +08:00
孙广明 583055fee3 Merge branch 'sgm_task' into 'sprint/zentaopms230'
* Code for task #65278.

See merge request easycorp/zentaopms!4995
2022-08-17 08:14:18 +00: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 28328da15c Merge branch 'sprint/zentaopms230' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms230 2022-08-17 13:07:52 +08:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
王怡栋 6d9ba865ba Merge branch '230' into 'sprint/zentaopms230'
* Code for weekly.

See merge request easycorp/zentaopms!4980
2022-08-16 06:06:38 +00:00
wangyidong 95ef309921 * code for task #65279. 2022-08-16 13:39:25 +08:00
sunguangming 749d5f7375 * Code for weekly. 2022-08-16 10:48:47 +08:00
wangyidong 97700ca723 * fix for MYISAM to InnoDB. 2022-08-16 08:27:17 +08:00
wangyidong ab83e773d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 17:57:14 +08:00
wangyidong 0d6be2f360 * fix for sql error when change table engine. 2022-08-15 17:56:30 +08:00
王怡栋 d1ccbe14ae Merge branch 'sprint/liuruogu_fixbug#26456' into 'master'
* Fix bug #26456.

See merge request easycorp/zentaopms!4974
2022-08-15 09:28:11 +00:00
liuruogu f488c11146 * Fix bug #26456. 2022-08-15 09:23:06 +00:00
孙广明 7a92f78f16 Merge branch 'importExport' into 'master'
* Fix bug for gantt menu.

See merge request easycorp/zentaopms!4973
2022-08-15 07:48:14 +00:00
tanghucheng 517fd4b79e * Fix bug for gantt menu. 2022-08-15 15:44:47 +08:00
王怡栋 2afc943171 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug gantt menu

See merge request easycorp/zentaopms!4972
2022-08-15 07:42:31 +00:00
孙广明 2251eb7aef Merge branch 'sprint/hufangzhou_26445' into 'master'
* Fix bug #26445.

See merge request easycorp/zentaopms!4971
2022-08-15 07:38:24 +00:00
lanzongjun c6ae545f36 * fix bug gantt menu 2022-08-15 15:37:30 +08:00
hufangzhou ed4dec3540 * Fix bug #26445. 2022-08-15 15:32:13 +08:00
wangyidong 474662047c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 15:11:37 +08:00
wangyidong cab10571b3 * adjust for after exec page. 2022-08-15 15:11:06 +08:00
孙广明 ffe9bb9815 Merge branch 'importExport' into 'master'
* Sort execution and project gantt menu .

See merge request easycorp/zentaopms!4970
2022-08-15 07:00:25 +00:00
孙广明 e0b470a476 Update gantt.html.php 2022-08-15 07:00:13 +00:00
tanghucheng af4bd538f1 * Fix bug for port. 2022-08-15 14:56:57 +08:00