Commit Graph
44 Commits
Author SHA1 Message Date
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +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 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
mayue 397c6d55b4 * Optimize code. 2022-08-04 09:38:01 +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
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
lanzongjun 1ae1352f11 * finish task #62889 2022-08-03 09:28:39 +08:00
mayue 733385c430 * Merge code . 2022-08-02 17:38:48 +08:00
mayue 6ebb39755a * Add some code. 2022-08-02 17:36:44 +08:00
lanzongjun f47ab8a359 * finish task #62889 2022-08-02 17:18:24 +08:00
wangyidong c820d66059 * fix bug #25557. 2022-07-22 11:37:12 +08:00
wangyidong b9eca6ff93 * fix bug #25557. 2022-07-22 08:30:10 +08:00
wangyidong 6576f0ccc4 * fix bug #25531,25536,25541,25550,25552,25561 2022-07-21 16:56:14 +08:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
wangyidong fbbbd58cbc * code for task #61200. 2022-07-19 15:36:03 +08:00
wangyidong a61f6a9cc1 * code for task #61189. 2022-07-19 13:34:38 +08:00
wangyidong 837c8f7ec2 * code for task #61188. 2022-07-19 13:10:26 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tanghucheng f67e77e4e6 * Fix bug for gantt. 2022-04-29 13:17:26 +08:00
tanghucheng ebde9241cf * Fix bug. 2022-04-28 16:49:03 +08:00
tanghucheng 44fe7084c0 * Fix bug #10877. 2022-04-26 10:35:50 +08:00
王怡栋 7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
王怡栋 54040e5777 * code for bug #16770. 2022-04-20 17:19:07 +08:00
zhujinyong 489be02f3f * Fix review. 2022-03-16 12:11:09 +08:00
hufangzhou 59181566ff * Move the gantt extension file to common/view. 2022-03-02 13:22:53 +08:00
tanghucheng b64b4cfc6f * Code for task #45806. 2021-12-13 09:37:38 +08:00
tanghucheng d556f52381 * Finish task #45806. 2021-12-10 16:11:06 +08:00
孙广明 75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
Yagami 774eceaf1d * Merge code. 2021-02-25 13:28:21 +08:00
leiyong 61365c9f78 * Adjusting the programplan module code. 2020-10-22 09:09:48 +08:00
Yagami ac8bb689b7 * Change realStarted to realBegan. 2020-09-16 08:28:47 +08:00
tianshujie98 5ac6d0540e * Add programplan comment. 2020-08-27 13:50:54 +08:00
Catouse a6828eaa07 * typo. 2020-08-26 11:15:35 +08:00
Catouse 295238a203 * fix js object difinition error. 2020-08-26 11:15:35 +08:00
holan20180123 5ab40d872f * Move programplan from qc to zentaopms. 2020-08-17 13:50:12 +08:00