Commit Graph
222 Commits
Author SHA1 Message Date
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
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
xieqiyu 22327a069c * Fix bug#25764. 2022-07-27 15:22:20 +08:00
wangyidong c820d66059 * fix bug #25557. 2022-07-22 11:37:12 +08:00
wangyidong 1e800bbb5c * fix bug #25600. 2022-07-22 08:53:27 +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
孙广明 a09f51348b * Fix lang. 2022-07-14 10:45:29 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
guofeilong 28c8b303da * add executionTable stage1 2022-07-07 05:24:57 +00:00
leiyong c85e72f4da * Adjust code. 2022-07-05 06:53:22 +00:00
leiyong 480f3f49a1 * Finish task#59523. 2022-07-05 06:32:05 +00:00
xieqiyu 678d8ae3d3 * Code for task#58578. 2022-06-30 10:33:20 +08:00
xieqiyu 38ba859322 * Code for task#58578. 2022-06-30 10:28:38 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
leiyong a87a9bc2fb * Edit comments. 2022-06-17 02:06:02 +00:00
leiyong 1706ec6a42 * Remove spaces. 2022-06-17 02:01:46 +00:00
leiyong ae55e2c31e * Fix bug#23841. 2022-06-17 01:30:09 +00:00
leiyong 80c03beea7 * Fix bug#23821. 2022-06-16 11:16:17 +00:00
leiyong fcd6f4c333 * Finish task#56932. 2022-06-15 10:57:05 +00:00