Commit Graph
36635 Commits
Author SHA1 Message Date
tianshujie e655e4fad1 * Fix bug #18035. 2022-03-31 15:55:49 +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
zhengrunyu 2dc3d02da0 * Fix api for project. 2022-03-31 11:16:45 +08:00
孙广明 3d2de17fff Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
2022-03-31 03:08:50 +00:00
孙广明 e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
2022-03-31 03:08:33 +00:00
孙广明 df2cda6e8b Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083

See merge request easycorp/zentaopms!2653
2022-03-31 03:06:37 +00:00
zhouxudong 8efcc37f4b * Fix bug #18083. 2022-03-31 11:02:59 +08:00
孙广明 d15ba0e7f9 Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2660
2022-03-31 02:56:23 +00:00
liyang 2dc5aec422 update kanban data 2022-03-31 10:46:48 +08:00
王怡栋 325d7c99e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-31 10:44:20 +08:00
王怡栋 6e608e2911 * adjust code for update kanban. 2022-03-31 10:43:09 +08:00
王怡栋 d02b555d87 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20165

See merge request easycorp/zentaopms!2647
2022-03-31 02:41:12 +00:00
王怡栋 4dbbf89e05 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!2650
2022-03-31 02:40:07 +00:00
孙广明 5072b8929b Merge branch 'sprint/master_zhouxudong_18002' into 'master'
Sprint/master zhouxudong 18002

See merge request easycorp/zentaopms!2659
2022-03-31 02:37:33 +00:00
孙广明 4487902db3 Merge branch 'sprint/master_zhouxudong_18744' into 'master'
Sprint/master zhouxudong 18744

See merge request easycorp/zentaopms!2656
2022-03-31 02:36:13 +00:00
Zongjun Lan 8ff464a02c * fix bug add install lite version text 2022-03-31 10:34:12 +08:00
孙广明 2bf755a78d Merge branch 'dht_productplan' into 'master'
add unittest productplan and new productsunplan.yaml

See merge request easycorp/zentaopms!2548
2022-03-31 02:10:49 +00:00
liyang bc12fbdf60 update kanbancard 2022-03-31 10:08:52 +08:00
zhouxudong 16e62835ae * Fix bug #18002. 2022-03-31 10:06:58 +08:00
zhouxudong fb5a792fee * Fix bug #18002. 2022-03-31 10:05:31 +08:00
zhengrunyu 47fe27dfe7 * Add api for project. 2022-03-31 09:56:28 +08:00
qateam 62a286da2b add productplan unittest 2022-03-31 09:46:12 +08:00
zenggang 40f9a85a6f * Fix bug#21097,21096 2022-03-31 01:35:50 +00:00
tianshujie 1e43b5cbf1 * Fix bug #17523. 2022-03-31 09:33:59 +08:00