Commit Graph

308 Commits

Author SHA1 Message Date
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
tanghucheng
ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
xieqiyu
cb75585308 * Fix bug#30697. 2022-12-29 10:24:04 +08:00
xieqiyu
4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
xieqiyu
2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
chaideqing
c3bd48c366 * Fix feedback1821. 2022-12-23 16:00:54 +08:00
朱金勇
9f741a612a Merge branch 'sprint/sunhao/fix_gantt_export' into 'master'
* fix gantt export not work as expected, not include all rows

See merge request easycorp/zentaopms!6458
2022-12-11 13:58:26 +00:00
wangyidong
595ec286b6 * adjust for show build path. 2022-12-07 10:34:10 +08:00
Hao Sun
c5275fa460 * fix gantt export not work as expected, not include all rows 2022-12-02 08:35:54 +00:00
lanzongjun
1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
lanzongjun
57bd3ad304 * Fix Task #76458 2022-11-22 13:35:54 +08:00
tianshujie
37c83b3d36 * Fix bug #29714. 2022-11-18 14:58:10 +08:00
xieqiyu
67017be897 * Fix bug#29883. 2022-11-17 15:41:39 +08: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
曾刚
4fbadc7da8 * Fix bug#29383 2022-11-08 05:03:48 +00:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +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
孙广明
0d9425eb1f Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Fix bug #29078.

See merge request easycorp/zentaopms!5926
2022-10-28 02:49:14 +00:00
tanghucheng
d7e722f914 * Fix bug #29078. 2022-10-28 10:48:29 +08:00
孙广明
0f74d6a6c4 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Fix gantt style.

See merge request easycorp/zentaopms!5923
2022-10-27 08:29:52 +00:00
tanghucheng
e9d18a77fb * Fix gantt style. 2022-10-27 16:27:30 +08:00
Yagami
bce03159e7 * Code for code review. 2022-10-27 16:22:09 +08:00
zenggang
560a95f623 * Fix bug #28983 2022-10-27 05:27:32 +00:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +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
zenggang
f3f92631e3 * Fix bug#28983 2022-10-26 08:38:23 +00:00
孙广明
faa094ca72 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Code for task #73235.

See merge request easycorp/zentaopms!5886
2022-10-25 08:38:19 +00:00
tanghucheng
dc2745f5ba * Add view.html.php for gantt setting. 2022-10-25 16:35:26 +08:00
tanghucheng
e06a98bd09 * Code for task #73235. 2022-10-25 16:26:10 +08:00
Yagami
c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
hufangzhou
d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
leiyong
97393330f9 * Finish story#37168. 2022-10-12 02:28:12 +00:00
sunguangming
be849b6af8 * Fix bug #28390. 2022-10-11 14:14:08 +08:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liuruogu
75282f1334 * Fix bug #27576. 2022-09-20 02:52:54 +00:00
tanghucheng
c58ef703a4 * Finish task #69007. 2022-09-15 15:25:25 +08:00
wangyidong
e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
hufangzhou
e55c40278d * Add the new version. 2022-08-25 09:31:18 +08:00
王怡栋
f814ff44fa Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #65904

See merge request easycorp/zentaopms!5069
2022-08-23 08:25:06 +00:00
lanzongjun
a658491395 * fix bug #65904 2022-08-23 15:57:06 +08:00
mayue
bf9a6e4da8 * Fix bug #26054#26057. 2022-08-23 09:07:45 +08:00
tanghucheng
858f0c98ef * Code for bug #26677. 2022-08-19 11:26:24 +08:00