Commit Graph
46317 Commits
Author SHA1 Message Date
zenggang 26e4e6b282 * Fix bug #29171 2022-11-03 01:01:44 +00:00
孙广明 1a963f09c6 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #29192.

See merge request easycorp/zentaopms!6000
2022-11-03 00:38:08 +00:00
孙广明 82b5a43150 Merge branch 'sprint/254_tianshujie_kanban' into 'master'
* Refactor.

See merge request easycorp/zentaopms!5998
2022-11-03 00:37:46 +00:00
王怡栋 99de19889b Merge branch 'sprint/hufangzhou_sql' into 'master'
* Add the sql in confirm page.

See merge request easycorp/zentaopms!5999
2022-11-03 00:37:46 +00:00
朱金勇 5ef17447fd Merge branch 'sprint/format-api' into 'master'
* Remove use exit for api.

See merge request easycorp/zentaopms!5962
2022-11-03 00:32:42 +00:00
鲁飞 e0cd779954 * Remove use exit for api. 2022-11-03 00:32:42 +00:00
liyuchun b60ba43c37 * Fix bug #29192. 2022-11-02 16:51:46 +08:00
hufangzhou d095daee76 * Add the sql in confirm page. 2022-11-02 08:33:05 +00:00
tianshujie af0be6c87a * Merge. 2022-11-02 16:28:26 +08:00
王怡栋 5e7e6161fb Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix an error.

See merge request easycorp/zentaopms!5997
2022-11-02 08:08:14 +00:00
hufangzhou b08746ca3c * Fix an error. 2022-11-02 08:06:59 +00:00
tianshujie 27d340e1db * Refactor. 2022-11-02 15:55:42 +08:00
孙广明 acf5a57b8f Merge branch 'sprint/254_tianshujie_kanban' into 'master'
Sprint/254 tianshujie kanban

See merge request easycorp/zentaopms!5991
2022-11-02 07:53:05 +00:00
王怡栋 1acb214a9e Merge branch 'flash_zhouxin_bugs' into 'master'
* Adjust testcase to bug.

See merge request easycorp/zentaopms!5993
2022-11-02 07:52:54 +00:00
zhouxin 66fef9275a * Adjust code. 2022-11-02 15:50:38 +08:00
tianshujie 5e495264df * Fix bug #29188. 2022-11-02 15:47:29 +08:00
zhouxin 73e1c524c8 * Adjust testcase to bug. 2022-11-02 15:42:21 +08:00
tianshujie 3ee6f1c348 * Fix bug #28199. 2022-11-02 15:36:58 +08:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
王怡栋 70c83db1d3 Merge branch 'sprint/178_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!5986
2022-11-02 06:25:28 +00:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
王怡栋 c1b6c8228a Merge branch 'master_feedback_1302' into 'master'
* Resolved feedback #1302.

See merge request easycorp/zentaopms!5983
2022-11-02 06:23:25 +00:00
liuhong ad6ee6377b * Resolved feedback #1302. 2022-11-02 05:51:09 +00:00
孙广明 da8e317c4b Merge branch 'cyy_bug' into 'master'
* Fix bug #29094.

See merge request easycorp/zentaopms!5981
2022-11-02 05:34:00 +00:00
caoyanyi ae1d4976f4 * Fix bug #29094. 2022-11-02 13:19:05 +08:00
孙广明 f924c6a1e5 Merge branch 'lyk_feedback_1334' into 'master'
* Resovle feedback #1334.

See merge request easycorp/zentaopms!5978
2022-11-02 02:29:44 +00:00
liuyongkai 738b1d8d57 * Resovle feedback #1334. 2022-11-02 02:25:46 +00:00
朱金勇 03737c95f4 Merge branch 'sprint/fix-install' into 'master'
* Fix install and upgrade locate error.

See merge request easycorp/zentaopms!5976
2022-11-02 00:18:57 +00:00
Lufei 3970bc226d * Fix install and upgrade locate error. 2022-11-01 19:22:40 +08:00
朱金勇 ca778ca1d5 Merge branch 'sprint/fix-install' into 'master'
* Fix install error.

See merge request easycorp/zentaopms!5973
2022-11-01 08:15:15 +00:00
孙广明 589187146e Merge branch 'feedback_lyk_1318' into 'master'
* Resolve feedback #1318.

See merge request easycorp/zentaopms!5972
2022-11-01 07:59:08 +00:00
liuyongkai 2dd466f1fe * Resolve feedback #1318. 2022-11-01 07:57:50 +00:00
liuyongkai 431db60769 * Resolve feedback #1318. 2022-11-01 07:53:39 +00:00
Lufei ac363b3df7 * Fix install error. 2022-11-01 15:44:49 +08:00
liuyongkai 3c0c0c3c73 * Resolve feedback #1318. 2022-11-01 07:43:35 +00:00
liuyongkai 9685f4b186 * Resolve feedback #1318. 2022-11-01 07:31:11 +00:00
李玉春 314f82091d Merge branch 'cyy_project' into 'master'
* Modify project icon.

See merge request easycorp/zentaopms!5960
2022-11-01 07:09:55 +00:00
李玉春 3f00e3ef70 Merge branch 'sprint/254_tianshujie_fixbug' into 'master'
Sprint/254 tianshujie fixbug

See merge request easycorp/zentaopms!5969
2022-11-01 07:09:24 +00:00
王怡栋 90e5ea69f5 Merge branch 'ticket_zhouxin_fixdb' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5970
2022-11-01 07:06:09 +00:00
zhouxin 8159742756 * Fix bug. 2022-11-01 15:04:29 +08:00
caoyanyi e6559ea155 * Fix bug #28181. 2022-11-01 14:35:02 +08:00
caoyanyi 13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
tianshujie 4ea862f2ee * Fix bug #28222. 2022-11-01 14:20:20 +08:00
tianshujie 2879079ec6 * Fix bug #29113. 2022-11-01 14:11:48 +08:00
李玉春 b4fbb4f928 Merge branch 'sprint/wangzemei/themeblue' into 'master'
* Solve unpacked problems

See merge request easycorp/zentaopms!5965
2022-11-01 05:55:49 +00:00
wangzemei 735633530d * Solve unpacked problems 2022-11-01 13:47:58 +08:00
王怡栋 707df59e48 Merge branch 'master_bug_26228' into 'master'
* Adjust code for bug #26228.

See merge request easycorp/zentaopms!5961
2022-11-01 05:33:20 +00:00
王怡栋 afd87a2364 Merge branch 'sprint/hufangzhou_feedback_1304' into 'master'
* Handle feedback #1304.

See merge request easycorp/zentaopms!5957
2022-11-01 05:32:32 +00:00
王怡栋 b7247e2652 Merge branch 'master_feedback_1267' into 'master'
* Resolved feedback #1267.

See merge request easycorp/zentaopms!5955
2022-11-01 05:31:51 +00:00
王怡栋 11fa395ed1 Merge branch 'master_feedback_1049' into 'master'
Master feedback 1049

See merge request easycorp/zentaopms!5944
2022-11-01 05:31:20 +00:00