Commit Graph
43662 Commits
Author SHA1 Message Date
tianshujie 2851fd4c2c * Resolve issue #720. 2022-08-18 16:24:43 +08:00
tianshujie 9f468e6d24 * Finish task #64976. 2022-08-18 14:35:19 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
王怡栋 c586a24d50 Merge branch 'sprint/228_liumengyi_65551' into 'sprint/228'
* Finish task #65551.

See merge request easycorp/zentaopms!5014
2022-08-18 05:05:08 +00:00
liumengyi 62d465d047 * Finish task #65551. 2022-08-18 11:22:16 +08:00
tianshujie 8287baa6dc * Finish task #63696. 2022-08-18 10:45:58 +08:00
tianshujie 46071ffaec * Finish task #63696. 2022-08-18 10:42:06 +08:00
tianshujie 9cd4212ef7 i* Finish task #63696. 2022-08-18 10:23:41 +08:00
tianshujie 0ea6aa7b27 * Finish task #63696. 2022-08-18 10:04:09 +08:00
liumengyi a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
王怡栋 fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
tianshujie 64c7f8dc23 * Finish task #63687. 2022-08-17 13:15:35 +08:00
tianshujie f9e9d52fdc * Finish task #63687. 2022-08-17 09:16:15 +08:00
tianshujie da87f21a39 * Finish task #63687. 2022-08-16 19:24:24 +08:00
孙广明 349686d619 Merge branch 'sprint/228_tianshujie_code' into 'sprint/228'
Sprint/228 tianshujie code

See merge request easycorp/zentaopms!4975
2022-08-16 08:59:31 +00:00
wangyidong 97700ca723 * fix for MYISAM to InnoDB. 2022-08-16 08:27:17 +08:00
tianshujie 2e8cc2c19f * Restore code. 2022-08-15 19:37:05 +08:00
tianshujie 6bd27a7aeb * Finish task #63687. 2022-08-15 19:33:12 +08:00
tianshujie 396673bd6d * Refactor the getStats method under the project. 2022-08-15 18:57:50 +08:00
wangyidong ab83e773d9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 17:57:14 +08:00
wangyidong 0d6be2f360 * fix for sql error when change table engine. 2022-08-15 17:56:30 +08:00
王怡栋 d1ccbe14ae Merge branch 'sprint/liuruogu_fixbug#26456' into 'master'
* Fix bug #26456.

See merge request easycorp/zentaopms!4974
2022-08-15 09:28:11 +00:00
liuruogu f488c11146 * Fix bug #26456. 2022-08-15 09:23:06 +00:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
孙广明 7a92f78f16 Merge branch 'importExport' into 'master'
* Fix bug for gantt menu.

See merge request easycorp/zentaopms!4973
2022-08-15 07:48:14 +00:00
tanghucheng 517fd4b79e * Fix bug for gantt menu. 2022-08-15 15:44:47 +08:00
王怡栋 2afc943171 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug gantt menu

See merge request easycorp/zentaopms!4972
2022-08-15 07:42:31 +00:00
孙广明 2251eb7aef Merge branch 'sprint/hufangzhou_26445' into 'master'
* Fix bug #26445.

See merge request easycorp/zentaopms!4971
2022-08-15 07:38:24 +00:00
lanzongjun c6ae545f36 * fix bug gantt menu 2022-08-15 15:37:30 +08:00
hufangzhou ed4dec3540 * Fix bug #26445. 2022-08-15 15:32:13 +08:00
wangyidong 474662047c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 15:11:37 +08:00
wangyidong cab10571b3 * adjust for after exec page. 2022-08-15 15:11:06 +08:00
孙广明 ffe9bb9815 Merge branch 'importExport' into 'master'
* Sort execution and project gantt menu .

See merge request easycorp/zentaopms!4970
2022-08-15 07:00:25 +00:00
孙广明 e0b470a476 Update gantt.html.php 2022-08-15 07:00:13 +00:00
tanghucheng af4bd538f1 * Fix bug for port. 2022-08-15 14:56:57 +08:00
tanghucheng 2bc6e7a1e8 * Sort execution and project gantt menu . 2022-08-15 14:28:31 +08:00
王怡栋 704901e7e0 Merge branch 'sprint/hufangzhou_BI' into 'master'
* Add the BI sql to standard sql.

See merge request easycorp/zentaopms!4969
2022-08-15 06:01:01 +00:00
王怡栋 3aff3d70b5 Merge branch 'importExport' into 'master'
* Fix bug #26419,26417.

See merge request easycorp/zentaopms!4968
2022-08-15 06:00:38 +00:00
wangyidong e891a32291 * File ui.flow.html.hook.php can not delete. 2022-08-15 13:50:39 +08:00
hufangzhou 81c1e5b6e7 * Add the BI sql to standard sql. 2022-08-15 13:24:04 +08:00
wangyidong 811c1d2ad6 * adjust for change table engine. 2022-08-15 13:04:24 +08:00
tanghucheng c816179a08 * Fix bug #26419,26417. 2022-08-15 12:26:44 +08:00
zhujinyong b6dcbaa519 + Add libraries for bi. 2022-08-15 12:02:11 +08:00
zhujinyong d21ed6a72f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 11:10:46 +08:00
zhujinyong 7e67e54fe9 * Define table. 2022-08-15 11:10:09 +08:00
wangyidong 1e5558d383 * adjust for search. 2022-08-15 11:06:34 +08:00
王怡栋 a84ae59d3b Merge branch 'sprint/hufangzhou_xuansql' into 'master'
* Add the xuan update sql to zentao.sql.

See merge request easycorp/zentaopms!4967
2022-08-15 02:55:05 +00:00
hufangzhou f98716d88f * Add the xuan update sql to zentao.sql. 2022-08-15 10:53:56 +08:00
tianshujie 4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08:00
zhujinyong 9ebd84ddcb + Add bi sql. 2022-08-15 10:09:32 +08:00