Commit Graph
36657 Commits
Author SHA1 Message Date
tianshujie 52208fb2b3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-01 08:14:33 +08:00
孙广明 5cc345e666 Merge branch 'master_xieqiyu_19665' into 'master'
* Fix bug#19665.

See merge request easycorp/zentaopms!2676
2022-03-31 09:42:04 +00:00
孙广明 e93df1c520 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2683
2022-03-31 09:37:57 +00:00
liumengyi dd41fc9714 * Add auto test of kanban. 2022-03-31 17:37:07 +08:00
李玉春 2549143e76 Merge branch 'sunhuawei_fixbug_15288' into 'master'
Sunhuawei fixbug 15288

See merge request easycorp/zentaopms!2675
2022-03-31 09:23:25 +00:00
朱金勇 65501592bf Merge branch 'sgm_storytest' into 'master'
Sgm storytest

See merge request easycorp/zentaopms!2680
2022-03-31 09:05:32 +00:00
tianshujie a9c1c80aef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 17:01:33 +08:00
孙广明 d72c9123fa Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2679
2022-03-31 08:55:46 +00:00
tianshujie f8981467e4 * Fix bug #19714. 2022-03-31 16:44:45 +08:00
孙广明 d1074f74e2 Merge branch 'mayue_fix_bug#21345' into 'master'
* Fix bug #21345.

See merge request easycorp/zentaopms!2678
2022-03-31 08:43:43 +00:00
mayue f120ed912a * Fix bug #21345. 2022-03-31 16:40:47 +08:00
孙广明 0d78af8a8c * Add program test. 2022-03-31 16:35:13 +08:00
朱金勇 d5c93681f0 Merge branch 'sprint/scx_fixhelperbug' into 'master'
* Fix api helper bug.

See merge request easycorp/zentaopms!2677
2022-03-31 08:32:09 +00:00
songchenxuan 3ede5cca11 * Fix api helper bug. 2022-03-31 16:30:00 +08:00
zhujinyong 5427477839 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 16:27:36 +08:00
zhujinyong 8da5fe3c90 + Add api of ci result. 2022-03-31 16:27:11 +08:00
xieqiyu 2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
tianshujie deeced3e14 * Fix bug #21307. 2022-03-31 16:04:41 +08:00
tianshujie e655e4fad1 * Fix bug #18035. 2022-03-31 15:55:49 +08:00
孙华伟 0ed070fd28 Optimize the code. 2022-03-31 15:52:15 +08:00
孙华伟 5c9862a129 *Fix bug#15288. 2022-03-31 15:48:53 +08:00
孙广明 4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
2022-03-31 07:24:15 +00:00
xieqiyu 6551f617c6 * Modify review code. 2022-03-31 15:22:48 +08:00
孙广明 50f370f185 Merge branch 'sprint/tianshujie_bug21300' into 'master'
* Fix bug #21300.

See merge request easycorp/zentaopms!2673
2022-03-31 07:21:28 +00:00
孙广明 0a2abf6cb9 Merge branch 'master_xieqiyu_19197' into 'master'
* Fix bug#19197.

See merge request easycorp/zentaopms!2667
2022-03-31 07:18:21 +00:00
孙广明 1746814316 Merge branch 'sprint/master_zhouxudong_17123' into 'master'
* Fix bug #17123.

See merge request easycorp/zentaopms!2672
2022-03-31 07:18:02 +00:00
tianshujie b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
zhouxudong 2b69acf643 * Fix bug #17123. 2022-03-31 14:55:04 +08:00
孙广明 5e8b3f2249 Merge branch 'fixbugs_zhouxin_21333' into 'master'
* Fix bug #21333.

See merge request easycorp/zentaopms!2668
2022-03-31 06:33:31 +00:00
zhouxin 3c1789a534 * Fix bug #21333. 2022-03-31 06:29:45 +00:00
孙广明 d388d2bfe7 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2671
2022-03-31 06:26:21 +00:00
tianshujie 1d91f13687 * Fix bug #17551. 2022-03-31 14:22:35 +08:00
孙广明 034cef1679 Merge branch 'mayue_fix_bug#17342' into 'master'
* Fix bug #17342.

See merge request easycorp/zentaopms!2670
2022-03-31 06:19:25 +00:00
mayue ba263d1b90 * Fix bug #17342. 2022-03-31 14:14:36 +08:00
zhouxin bb47bfa04c * Fix bug #21333. 2022-03-31 06:02:31 +00:00
xieqiyu 4542ffb0e2 * Fix bug#19197. 2022-03-31 13:59:38 +08:00
王怡栋 33811f8b8d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 13:45:10 +08:00
王怡栋 2d437ae3af * fix bug #21217. 2022-03-31 13:44:45 +08:00
xieqiyu 2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
孙广明 d6d7af7fcc Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2664
2022-03-31 05:34:09 +00:00
liumengyi 33f46615df * Add auto test of kanban. 2022-03-31 13:33:00 +08:00
朱金勇 fb49f8ebbd Merge branch 'sgm_fixbug' into 'master'
* Fix my - preference bug.

See merge request easycorp/zentaopms!2663
2022-03-31 03:32:34 +00:00
孙广明 ce422e102f * Fix my - preference bug. 2022-03-31 11:31:38 +08:00
李玉春 510496e156 Merge branch 'devops24_21097' into 'master'
Fix bug#21097,21096

See merge request easycorp/zentaopms!2657
2022-03-31 03:28:15 +00:00
zenggang 3d5c425501 * Adjust code 2022-03-31 03:26:57 +00:00
朱金勇 fa1201fead Merge branch 'sprint/scx_api' into 'master'
* Fix taskbatchcreate API bug .

See merge request easycorp/zentaopms!2643
2022-03-31 03:23:59 +00:00
朱金勇 29abda11d5 Merge branch 'sprint/sunhao/bug18424' into 'master'
* bug #18424, optimize d-n-d UI for kanban, finish drag action when mouse leave document.

See merge request easycorp/zentaopms!2655
2022-03-31 03:23:38 +00:00
朱金勇 0992ce7fda Merge branch 'app_zry' into 'master'
* Add api for project.

See merge request easycorp/zentaopms!2658
2022-03-31 03:23:29 +00:00
孙广明 7211d2aa44 * Code for program. 2022-03-31 11:20:32 +08:00
zhengrunyu 2dc3d02da0 * Fix api for project. 2022-03-31 11:16:45 +08:00