Commit Graph
35992 Commits
Author SHA1 Message Date
tianshujie 0ea6aa7b27 * Finish task #63696. 2022-08-18 10:04:09 +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
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
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
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
王怡栋 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
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
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 50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
王怡栋 63dae91a00 Merge branch 'importExport' into 'master'
* Code for Import export

See merge request easycorp/zentaopms!4963
2022-08-15 00:14:35 +00:00
李玉春 bd3999375c Merge branch 'sprint/224_tianshujie_case' into 'master'
Sprint/224 tianshujie case

See merge request easycorp/zentaopms!4962
2022-08-15 00:13:45 +00:00
tanghucheng 2f5eaab58c * Format code for port module. 2022-08-14 16:21:16 +08:00
tanghucheng 087c4a37b1 * Code for lite story export. 2022-08-14 16:16:40 +08:00
tanghucheng 90f16b91ca * Fix bug for bug and story export. 2022-08-14 15:25:00 +08:00
tanghucheng 935cb51b5b * Fix bug for port showimport. 2022-08-14 13:14:48 +08:00
tanghucheng 9a4d97f7ed * Fix bug for bug import. 2022-08-14 10:40:40 +08:00
tanghucheng d3619ab1ad * Code for import and export datasource . 2022-08-13 17:27:01 +08:00
tianshujie ab19aa2d46 * Add a null judgment to the method. 2022-08-13 17:15:06 +08:00
tianshujie 51608525d2 * Modified testcase of block. 2022-08-13 13:43:15 +08:00
tanghucheng ec6c7dee79 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-12 17:28:20 +08:00
tanghucheng e91597d3e0 * Code for port. 2022-08-12 17:27:58 +08:00
孙广明 d2ad7b237d Merge branch 'lyk_26364' into 'master'
* Fix bug #26364

See merge request easycorp/zentaopms!4955
2022-08-12 09:18:25 +00:00
王怡栋 55ebeb33d2 Merge branch 'sprint/max41_mayue_bug#26395' into 'master'
* Fix bug #26395.

See merge request easycorp/zentaopms!4954
2022-08-12 09:06:52 +00:00
王怡栋 1f1242ca9c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
add cp gantt task move

See merge request easycorp/zentaopms!4953
2022-08-12 09:06:24 +00:00
lanzongjun 5915e3189c add gantt move order 2022-08-12 17:04:49 +08:00