Commit Graph
1057 Commits
Author SHA1 Message Date
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
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
liuyongkai 697ecffce7 * Fix bug #26002,25249 2022-08-05 03:29:29 +00:00
liuyongkai 8837c4c100 * Fix bug $26002,25249 2022-08-05 03:08:10 +00:00
mayue 02e14250d5 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-05 09:49:54 +08:00
mayue 27645f9b6b * Optimize code. 2022-08-05 09:48:53 +08:00
lanzongjun 6d52559fd3 fix 2022-08-05 09:26:49 +08:00
lanzongjun 4d1d86a898 fix 2022-08-05 09:05:36 +08:00
lanzongjun e6c7dc6986 remove ext 2022-08-05 09:01:04 +08:00
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +08:00
lanzongjun f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
liuyongkai 7ca2f66a28 * Fix bug #26002,25249 2022-08-04 10:26:46 +00:00
lanzongjun 43a2508122 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-08-04 15:34:50 +08:00
lanzongjun aa3b287d38 fix bug 2022-08-04 15:34:41 +08:00
mayue f12ce8a55b * Fix bug . 2022-08-04 14:46:28 +08:00
mayue 63c9e6a6c0 * Fix bug . 2022-08-04 14:08:43 +08:00
mayue 436cf26588 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-04 13:07:42 +08:00
lanzongjun 9baa2fba54 * fix bug 2022-08-04 13:06:17 +08:00
mayue 58567b28e7 * Finish task #62887. 2022-08-04 11:09:48 +08:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
mayue 37c49204e1 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-04 09:09:53 +08:00
mayue 0ab5b2956d * Finish task #62892. 2022-08-04 09:07:37 +08:00
liumengyi 1fe596b022 * Fix bug #25994. 2022-08-03 17:17:16 +08:00
liumengyi 5acd4b9127 * Fix bug #25994. 2022-08-03 17:12:07 +08:00
liuruogu a28d225da9 * Finish task #63381. 2022-08-03 08:21:44 +00:00
zenggang 3a9f4d8ada * Fix bug#25897,22882 2022-08-03 07:16:28 +00:00
liuruogu feb04dd1cd * Finish task #63384. 2022-08-03 06:48:05 +00:00