Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,622 Commits 2 Branches 292 Tags
41e62427363c6ca1b3ec4e832561be1aeb7f0fa2
Commit Graph
251 Commits
Author SHA1 Message Date
王怡栋 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
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +08:00
lanzongjun f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
lanzongjun b74f03c924 fix bug 2022-08-04 17:58:48 +08:00
lanzongjun aa3b287d38 fix bug 2022-08-04 15:34:41 +08:00
lanzongjun f09fd6d981 fix bug resize move 2022-08-04 14:07:02 +08:00
lanzongjun f2d0b3b3b3 resolve conflict 2022-08-04 13:51:27 +08:00
lanzongjun cff20cfe1f * fix bug 2022-08-04 13:50:52 +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
liuhong c44c768145 *Fix bug #25759 2022-08-04 02:11:40 +00:00
liuhong 2bd5412bb1 *Fix bug #25759 2022-08-04 02:05:07 +00:00
mayue da64ac5a50 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-04 09:57:07 +08:00
lanzongjun 8ce6a83819 * fix bug 2022-08-04 09:56:03 +08:00
liuhong b2f152d904 *Fix bug #25759 2022-08-04 01:40:59 +00:00
mayue 397c6d55b4 * Optimize code. 2022-08-04 09:38:01 +08:00
liuhong 868ee2d3fe *Fix bug #25759 2022-08-04 01:10:28 +00: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
lanzongjun 451bffdc26 * finish task #62892 2022-08-03 09:59:01 +08:00
lanzongjun 32edb1c34b Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-08-03 09:28:53 +08:00