Commit Graph
100 Commits
Author SHA1 Message Date
lanzongjun 5915e3189c add gantt move order 2022-08-12 17:04:49 +08:00
lanzongjun 0c117ef702 add gantt move order 2022-08-12 16:49:27 +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
lanzongjun 47de689c2e remove image 2022-08-11 15:47:48 +08:00
lanzongjun 5f34fa4706 * fix bug #26159 2022-08-10 14:49:20 +08:00
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun 15cce6ebfa fix cp project 2022-08-08 18:18:09 +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 5da0f2df54 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-08-05 09:56:38 +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 4d1d86a898 fix 2022-08-05 09:05:36 +08:00
lanzongjun e6c7dc6986 remove ext 2022-08-05 09:01:04 +08:00
lanzongjun aca14bafc6 remove ext 2022-08-05 08:50:17 +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 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
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
lanzongjun 9baa2fba54 * fix bug 2022-08-04 13:06:17 +08:00
lanzongjun 8ce6a83819 * fix bug 2022-08-04 09:56:03 +08:00
lanzongjun bc0d121150 * fix bug 2022-08-03 10:13:22 +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
lanzongjun f47ab8a359 * finish task #62889 2022-08-02 17:18:24 +08:00
lanzongjun 245aaf0b14 add dhtmlx 2022-08-02 17:14:33 +08:00
lanzongjun 5f5d893546 add plugins 2022-08-02 08:33:50 +08:00
lanzongjun f745e21839 delete code 2022-07-28 16:45:49 +08:00
lanzongjun 3351911caa delete gantt ext 2022-07-28 14:47:26 +08:00
lanzongjun f661dd7678 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gantt_upgrade 2022-07-28 14:07:17 +08:00
lanzongjun f866342fd2 * upgrade 2022-07-28 13:26:09 +08:00
lanzongjun 007462353c * fix bug #25750 2022-07-28 10:21:16 +08:00
lanzongjun 5e28cbed0a fix bug #25756 2022-07-28 09:45:28 +08:00
lanzongjun 2f168fea73 remove css 2022-07-26 16:35:20 +08:00
lanzongjun e6eff527d2 move code 2022-07-26 14:56:50 +08:00
lanzongjun e1068f2387 fix bug kanban project enter 2022-07-26 08:37:30 +08:00
lanzongjun 5d3bd547e0 * finish task #62245 2022-07-25 16:12:22 +08:00
lanzongjun 74f2ca3bed add css 2022-07-25 13:22:49 +08:00
lanzongjun 274c1a0c9b remove code 2022-07-22 13:18:12 +08:00
lanzongjun 7fe505f4b2 add css 2022-07-22 13:14:51 +08:00
lanzongjun ffa0bbe650 add js notes 2022-07-21 13:12:38 +08:00
lanzongjun f2310c30dd tmp 2022-07-20 18:21:02 +08:00
lanzongjun e5c2184bab tmp 2022-07-20 18:06:34 +08:00
lanzongjun 658eedc2d5 tmp 2022-07-20 15:30:47 +08:00
lanzongjun 3c24e61b69 tmp 2022-07-19 17:24:52 +08:00
lanzongjun 59a4a28b44 add model save 2022-07-19 16:58:53 +08:00
lanzongjun 32eef59eaf * add standard sql 2022-07-14 09:05:46 +08:00
lanzongjun eac15cf70a * fix bug #25172 2022-07-13 16:04:15 +08:00
lanzongjun 818bd7085c * fix task #60360 2022-07-13 11:11:57 +08:00
lanzongjun 175b5c0669 * fix task #60360 2022-07-13 11:09:24 +08:00
lanzongjun 7637e225d4 * fix task #60360 2022-07-13 11:08:30 +08:00
lanzongjun 47aed9058f * fix task #60360 2022-07-13 10:16:07 +08:00
lanzongjun 5c95d9fd18 * fix bug #25016 2022-07-08 14:52:46 +08:00
lanzongjun 31109d6519 * fix task #60100 2022-07-07 16:36:24 +08:00
lanzongjun f51027b090 * fix bug #24280 2022-07-07 16:06:48 +08:00
lanzongjun 6555c7a30a * fix bug #24937 2022-07-07 15:40:38 +08:00
lanzongjun ec9c9f2a0e * fix bug #24937 2022-07-07 13:32:34 +08:00
lanzongjun d664bc44b0 * fix bug #24785 2022-07-06 15:39:33 +08:00
lanzongjun d6a387935f * fix bug #24813 2022-07-06 14:44:36 +08:00
lanzongjun 5f468b66a7 test 2022-07-06 11:28:47 +08:00
lanzongjun a7410f7986 * fix bug #24806-2 2022-07-06 11:23:31 +08:00
lanzongjun 42e8032269 * fix bug #24806-2 2022-07-06 11:20:32 +08:00
lanzongjun f63542faf3 * fix bug #24806 2022-07-06 11:18:06 +08:00
lanzongjun 305ea3d502 * fix bug #24806 2022-07-06 11:17:12 +08:00
lanzongjun 4fd0e3bcfe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-07-06 11:16:01 +08:00
lanzongjun fbc4db545c * fix bug #24806 2022-07-06 11:07:39 +08:00
lanzongjun dd30f6354b * fix bug #24071 2022-07-01 11:28:58 +08:00
lanzongjun 8bc8979c20 * fix bug #24071 2022-07-01 10:59:06 +08:00
lanzongjun 7caab2be4d * fix bug #23996 2022-06-30 16:11:31 +08:00
lanzongjun 76b79da0c1 * fix bug #23996 2022-06-30 15:20:38 +08:00
lanzongjun adbefcd261 Merge branch 'sprint/zentaomax35' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-30 15:08:09 +08:00
lanzongjun f73072e6de * fix bug #23729 2022-06-30 15:07:31 +08:00
lanzongjun b953f00253 * fix bug #23954 2022-06-30 11:28:00 +08:00
lanzongjun a8358b6ba5 * fix bug #23954 2022-06-30 11:27:04 +08:00
lanzongjun 2885fa3fe7 Merge branch 'sprint/zentaomax35' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-30 10:27:34 +08:00
lanzongjun 66ea6430cf * fix bug #24382 2022-06-30 08:52:59 +08:00
lanzongjun 694410817a * fix bug #24382 2022-06-30 08:50:31 +08:00
lanzongjun d5afe20770 * fix bug #23766 2022-06-20 15:46:10 +08:00
lanzongjun 6786b4d08c * fix bug #23932 2022-06-20 11:17:34 +08:00
lanzongjun 2c49643589 * fix bug #23766 2022-06-20 09:40:46 +08:00
lanzongjun 898bb949c1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-20 09:30:53 +08:00
lanzongjun 3b7adad82e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-17 15:29:36 +08:00
lanzongjun cdaf6b5ce0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-17 09:06:39 +08:00
lanzongjun 0786156bc0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-16 08:45:29 +08:00
lanzongjun a5f7253785 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-14 13:58:52 +08:00
lanzongjun a4756d1cd5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-14 08:17:56 +08:00
lanzongjun 8d77a381a3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-13 08:35:08 +08:00
lanzongjun 7c6b288878 * recover user 2022-06-10 17:26:57 +08:00
lanzongjun b31b45c11f * finish task #56023 2022-06-08 15:44:50 +08:00
lanzongjun c25d199878 * finish bug #23282 2022-06-06 14:20:34 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00