Commit Graph

272 Commits

Author SHA1 Message Date
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
zenggang
f3f92631e3 * Fix bug#28983 2022-10-26 08:38:23 +00:00
hufangzhou
d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
leiyong
97393330f9 * Finish story#37168. 2022-10-12 02:28:12 +00:00
sunguangming
be849b6af8 * Fix bug #28390. 2022-10-11 14:14:08 +08:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liuruogu
75282f1334 * Fix bug #27576. 2022-09-20 02:52:54 +00:00
tanghucheng
c58ef703a4 * Finish task #69007. 2022-09-15 15:25:25 +08:00
wangyidong
e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
hufangzhou
e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
王怡栋
f814ff44fa Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #65904

See merge request easycorp/zentaopms!5069
2022-08-23 08:25:06 +00:00
lanzongjun
a658491395 * fix bug #65904 2022-08-23 15:57:06 +08:00
mayue
bf9a6e4da8 * Fix bug #26054#26057. 2022-08-23 09:07:45 +08:00
tanghucheng
858f0c98ef * Code for bug #26677. 2022-08-19 11:26:24 +08:00
tanghucheng
8898465485 * Fix bug #26677. 2022-08-19 11:11:29 +08:00
tanghucheng
d6e5496108 * Code for project gantt full. 2022-08-18 09:11:52 +08:00
wangyidong
aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +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
lanzongjun
c6ae545f36 * fix bug gantt menu 2022-08-15 15:37:30 +08:00
孙广明
e0b470a476 Update gantt.html.php 2022-08-15 07:00:13 +00:00
tanghucheng
2bc6e7a1e8 * Sort execution and project gantt menu . 2022-08-15 14:28:31 +08:00
王怡栋
55ebeb33d2 Merge branch 'sprint/max41_mayue_bug#26395' into 'master'
* Fix bug #26395.

See merge request easycorp/zentaopms!4954
2022-08-12 09:06:52 +00:00
mayue
f9711bc443 * Optimize code. 2022-08-12 17:04:32 +08:00
lanzongjun
0c117ef702 add gantt move order 2022-08-12 16:49:27 +08:00
mayue
4dbf6940e6 * Fix bug #26395. 2022-08-12 16:39:07 +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
王怡栋
ce74ee1f30 Merge branch 'sprint/max41_mayue_bug#26242' into 'master'
Sprint/max41 mayue bug#26242

See merge request easycorp/zentaopms!4911
2022-08-11 02:14:55 +00:00
mayue
f2824517be * Add column min width. 2022-08-11 09:25:13 +08:00
mayue
28b14dd33d * Fix bug #26242. 2022-08-11 09:15:35 +08:00
mayue
04efd2cf2d * Fix bug #26247. 2022-08-10 17:17:18 +08:00
mayue
0a83b068a0 * Fix bug #26252. 2022-08-10 15:26:44 +08:00
mayue
8f39557d0b * Optimize code. 2022-08-10 14:37:17 +08:00
mayue
7a3f67b1e0 * Finish task #63796. 2022-08-10 14:32:29 +08:00
tanghucheng
39c3c2a53f * Code for stage gantt. 2022-08-10 08:34:21 +08:00
tanghucheng
2b1046d40b * Finish task #63793. 2022-08-09 17:34:51 +08:00
tanghucheng
bbf28d9bc0 * Finish task #63794. 2022-08-09 14:24:01 +08:00
王怡栋
b1c4645857 Merge branch 'fix_code_error' into 'master'
* Fix code error.

See merge request easycorp/zentaopms!4853
2022-08-09 01:56:11 +00:00
mayue
6c8cdaad1f * Fix code error. 2022-08-09 09:50:37 +08:00
wangyidong
2769e53ea0 * adjust for task #63802. 2022-08-09 08:54:42 +08:00
lanzongjun
5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
wangyidong
4bf7706d23 * code for task #63802. 2022-08-08 17:35:28 +08:00
mayue
fc0a0b2d61 * Optimize code. 2022-08-08 10:56:43 +08:00
mayue
fc13fad289 resolve conflict 2022-08-08 10:39:25 +08:00
lanzongjun
8429ff7062 realbegin date fix 2022-08-05 16:04:10 +08:00
lanzongjun
9c6356fded debug 2022-08-05 15:50:24 +08:00
lanzongjun
408150ff5c debug 2022-08-05 15:40:25 +08:00
lanzongjun
8adc70569f fix 2022-08-05 14:21:04 +08:00
lanzongjun
7e0c2a23ba fix 2022-08-05 09:56:28 +08:00
lanzongjun
6d52559fd3 fix 2022-08-05 09:26:49 +08:00