Commit Graph

89 Commits

Author SHA1 Message Date
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
王怡栋
9331b9856a Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
#   module/programplan/view/gantt.html.php
2023-02-08 08:30:14 +00:00
wangyuting2
ab16894c06 * Optimize page css. 2023-02-08 16:17:16 +08:00
xieqiyu
e00862dd0c * Code for bug#29159. 2023-02-08 16:16:33 +08:00
wangyuting2
afaa89f8fd * Fix bug #27242. 2023-02-08 16:03:35 +08:00
Yagami
c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
wangyuting2
809ba4b43e * Adjust modal width. 2023-02-01 08:26:08 +08:00
liuhong
b56ec5f7f5 * Finish story #41436. 2023-01-09 01:44:17 +00:00
tanghucheng
ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
xieqiyu
4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
Hao Sun
c5275fa460 * fix gantt export not work as expected, not include all rows 2022-12-02 08:35:54 +00:00
王怡栋
3c83b8dbcb Merge branch 'fixbug' into 'master'
* Add gantt icon.

See merge request easycorp/zentaopms!6109
2022-11-11 01:57:19 +00:00
tanghucheng
f017fddb67 * Add gantt icon. 2022-11-10 15:37:08 +08:00
mayue
fc2ebb5b61 * Fix bug #29466. 2022-11-10 13:53:32 +08:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
孙广明
3dc995919d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #29363

See merge request easycorp/zentaopms!6069
2022-11-07 08:52:12 +00:00
lanzongjun
1e16357fe3 * fix bug #29363 2022-11-07 16:50:51 +08:00
Yagami
6413f85918 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-07 16:37:35 +08:00
Yagami
7f1ac56f29 * Fix bug #29369. 2022-11-07 16:36:58 +08:00
liuyongkai
50e118bea4 * Resolve feedback #1380. 2022-11-07 07:16:14 +00:00
tanghucheng
d7e722f914 * Fix bug #29078. 2022-10-28 10:48:29 +08:00
tanghucheng
e9d18a77fb * Fix gantt style. 2022-10-27 16:27:30 +08:00
tanghucheng
74eb12d1b4 * Fix bug for gantt. 2022-10-27 11:18:09 +08:00
tanghucheng
d96d6bb803 * Finish task #73234,73242. 2022-10-27 08:09:26 +08:00
tanghucheng
e06a98bd09 * Code for task #73235. 2022-10-25 16:26:10 +08:00
leiyong
97393330f9 * Finish story#37168. 2022-10-12 02:28:12 +00: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
孙广明
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
mayue
f9711bc443 * Optimize code. 2022-08-12 17:04:32 +08:00
mayue
4dbf6940e6 * Fix bug #26395. 2022-08-12 16:39:07 +08: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
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
bbf28d9bc0 * Finish task #63794. 2022-08-09 14:24:01 +08:00
wangyidong
2769e53ea0 * adjust for task #63802. 2022-08-09 08:54:42 +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
408150ff5c debug 2022-08-05 15:40:25 +08:00
lanzongjun
8adc70569f fix 2022-08-05 14:21:04 +08:00
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