Commit Graph
45868 Commits
Author SHA1 Message Date
tianshujie ca79d11271 * Finish task #72347. 2022-10-20 11:06:14 +08:00
tianshujie d55aedf3e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 11:04:27 +08:00
王怡栋 9ad259beb4 Merge branch 'master_28656' into 'master'
* Fix bug #28656.

See merge request easycorp/zentaopms!5822
2022-10-20 02:58:43 +00:00
王怡栋 50a3483775 Merge branch 'exportImg' into 'master'
* Remove \n for import bug.

See merge request easycorp/zentaopms!5821
2022-10-20 02:56:17 +00:00
liuhong 20b111f0e2 * Fix bug #28656. 2022-10-20 02:14:10 +00:00
Yagami 8b41edadbf * Show create testreport btn in waterfall project. 2022-10-20 10:11:09 +08:00
李玉春 916defc350 Merge branch 'sprint/247_wangzemei_fixwidth' into 'master'
* Solved the problem of calculating the width of the table header

See merge request easycorp/zentaopms!5817
2022-10-20 01:57:24 +00:00
李玉春 c266ba1006 Merge branch 'sprint/cyy_72375' into 'sprint/247'
Sprint/cyy 72375

See merge request easycorp/zentaopms!5818
2022-10-20 01:57:11 +00:00
李玉春 6745ac5845 Merge branch 'sprint/247_tianshujie_css' into 'master'
* Fixed style issues with multi task.

See merge request easycorp/zentaopms!5820
2022-10-20 01:51:33 +00:00
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
wangzemei 5233ec969c * Solved the problem of calculating the width of the table header 2022-10-20 08:58:49 +08:00
曹延义 6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义 fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +08:00
tianshujie cda753b5d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 08:54:08 +08:00
tianshujie 92688aeae6 Merge branch 'sprint/247' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 08:53:57 +08:00
王怡栋 5bed328848 Merge branch 'master_feedback_1133' into 'master'
* Adjust code format.

See merge request easycorp/zentaopms!5815
2022-10-20 00:30:53 +00:00
tanghucheng 21a17f9e0e * Remove \n for import bug. 2022-10-20 07:54:53 +08:00
liuhong f756b892d6 * Adjust code format. 2022-10-19 12:53:54 +00:00
曹延义 1b80975ac1 * Code for task #72375. 2022-10-19 17:21:35 +08:00
孙广明 563f523f9c Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28499.

See merge request easycorp/zentaopms!5810
2022-10-19 09:04:51 +00:00
孙广明 020fada011 Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5800
2022-10-19 09:04:21 +00:00
李玉春 45db98047c Merge branch 'cyy_bug' into 'master'
* Fix bug #28128.

See merge request easycorp/zentaopms!5814
2022-10-19 09:03:36 +00:00
李玉春 4aeb260282 Merge branch 'sprint/247_wangzemei_28395' into 'master'
* Solve width calculation problems

See merge request easycorp/zentaopms!5807
2022-10-19 09:02:52 +00:00
曹延义 e16a4eb765 * Fix bug #28128. 2022-10-19 17:01:56 +08:00
孙广明 ec22de682f Merge branch 'biz13_mayue_bug#28337' into 'master'
* Add the status column of Kanban import ticket.

See merge request easycorp/zentaopms!5812
2022-10-19 08:59:05 +00:00
王怡栋 7ed78a0b05 Merge branch 'master_feedback_420' into 'master'
* Adjust the code format.

See merge request easycorp/zentaopms!5806
2022-10-19 08:57:34 +00:00
王怡栋 e3f2bce7ca Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28684.

See merge request easycorp/zentaopms!5811
2022-10-19 08:55:39 +00:00
tianshujie bca37e86f6 Merge branch 'sprint/247' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-19 16:48:15 +08:00
mayue 06e4a05403 * Add the status column of Kanban import ticket. 2022-10-19 16:36:01 +08:00
tanghucheng c0a9e98cd1 * Fix bug #28684,28680. 2022-10-19 15:42:46 +08:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
曹延义 3ce6ca1f4f Merge branch 'master' into sprint/247 2022-10-19 15:21:14 +08:00
孙广明 af6634eaad Merge branch 'biz13_mayue_bug#28666' into 'master'
* Fix bug #28666.

See merge request easycorp/zentaopms!5809
2022-10-19 07:17:43 +00:00
孙广明 7746006ecf Merge branch 'sprint/hufangzhou_sql' into 'master'
* Adjust the type of fields.

See merge request easycorp/zentaopms!5808
2022-10-19 07:17:29 +00:00
mayue 1221260f0b * Fix bug #28666. 2022-10-19 15:13:16 +08:00
hufangzhou ee0a444bde * Adjust the type of fields. 2022-10-19 06:48:45 +00:00
wangzemei 84f1b64aae * remove useless class 2022-10-19 14:35:12 +08:00
wangzemei 25f8023fef * Solve width calculation problems 2022-10-19 14:31:55 +08:00
liuhong 6133c2ca58 * Adjust the code format. 2022-10-19 06:25:39 +00:00
王怡栋 171ad26855 Merge branch 'master_feedback_1133' into 'master'
* Adjust the code format.

See merge request easycorp/zentaopms!5805
2022-10-19 06:21:49 +00:00
liuhong a7765cfae8 * Adjust the code format. 2022-10-19 06:13:35 +00:00
王怡栋 cb645f4d50 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28639.

See merge request easycorp/zentaopms!5801
2022-10-19 06:11:24 +00:00
王怡栋 5b4be9a502 Merge branch 'sprint/hufangzhou_langItem' into 'master'
* Added empty row for alignment.

See merge request easycorp/zentaopms!5802
2022-10-19 06:10:49 +00:00
hufangzhou 10c07b964f * Added empty row for alignment. 2022-10-19 06:06:26 +00:00
tanghucheng 14f82baf7e * Fix bug #28639. 2022-10-19 13:57:00 +08:00
王怡栋 37671824c5 Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!5798
2022-10-19 05:49:17 +00:00
tianshujie 8eda9a7f8c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-19 13:46:43 +08:00
tianshujie 8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
hufangzhou d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
王怡栋 cdb458bb9f Merge branch 'master_feedback_1133' into 'master'
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.

See merge request easycorp/zentaopms!5796
2022-10-19 05:29:12 +00:00