Commit Graph
36030 Commits
Author SHA1 Message Date
liyuchun 6a4299917d * Fix bug #26413. 2022-08-16 08:53:41 +08:00
liyuchun af9287a7d7 Merge branch 'zenops_41' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_41 2022-08-16 08:53:06 +08:00
孙广明 5391d4a163 Merge branch 'liyuchun_fixbug_26301' into 'zenops_41'
* Fix bug #26301.

See merge request easycorp/zentaopms!4966
2022-08-15 07:02:26 +00:00
caoyanyi eb4a3d6d0a * Adjust codes. 2022-08-15 10:28:28 +08:00
liyuchun a4b8a6eba2 Merge branch 'master' into zenops_41 2022-08-15 09:38:48 +08:00
liyuchun 6ffac378bf * Fix bug #26301. 2022-08-15 09:33:00 +08:00
caoyanyi daaa4ffa82 * Modify jenkins required fields check. 2022-08-15 09:26:42 +08:00
caoyanyi 6afa13390f * Add tips when gitlab has not pipelines. 2022-08-15 09:14:50 +08:00
zhujinyong 50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
孙广明 d7a8b587db Merge branch 'liyuchun_64263' into 'zenops_41'
* Finish task #64263.

See merge request easycorp/zentaopms!4958
2022-08-15 00:22:26 +00: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
caoyanyi 9aa0c26324 * Modify branch delete. 2022-08-12 17:11:12 +08:00
liyuchun 32613a2045 * Finish task #64263. 2022-08-12 17:10:47 +08: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
mayue f9711bc443 * Optimize code. 2022-08-12 17:04:32 +08:00
caoyanyi 9d418966c7 * Modify browse check. 2022-08-12 17:04:29 +08:00
hufangzhou b1aa1f2ea6 * Add the xxc to changelog. 2022-08-12 17:00:53 +08:00
caoyanyi 04780426db * Add branch remove. 2022-08-12 16:56:58 +08:00
liuyongkai 4f60c73ab5 * Fix bug #26364 2022-08-12 08:52:29 +00:00
孙广明 e1b4cb821a Merge branch 'sprint/224_liumengyi_26325' into 'master'
* Fix bug #26358.

See merge request easycorp/zentaopms!4952
2022-08-12 08:52:29 +00:00
lanzongjun 0c117ef702 add gantt move order 2022-08-12 16:49:27 +08:00
王怡栋 71093a980c Merge branch 'sprint/224_dongli_bug26194' into 'master'
* Fix bug #26194.

See merge request easycorp/zentaopms!4950
2022-08-12 08:49:11 +00:00
caoyanyi 74874aa869 * Modify delete mr log. 2022-08-12 16:46:01 +08:00
caoyanyi 5181079636 * Modify branch locate. 2022-08-12 16:45:52 +08:00
caoyanyi 1779f04b4d * Modify mr save log. 2022-08-12 16:45:31 +08:00
wangyidong ab98851096 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:43:33 +08:00
wangyidong a7da22c833 Merge branch 'sprint/224_hufangzhou_doc' 2022-08-12 16:42:20 +08:00
hufangzhou f28a05f25b * Add the xuanxuan update sql to standard sql. 2022-08-12 16:40:51 +08:00
mayue 4dbf6940e6 * Fix bug #26395. 2022-08-12 16:39:07 +08:00
王怡栋 38f8f8c0ba Merge branch 'master_xieqiyu_26177' into 'master'
* Fix bug#26177.

See merge request easycorp/zentaopms!4946
2022-08-12 08:19:02 +00:00
lanzongjun 886c392287 add cp gantt task move 2022-08-12 16:18:57 +08:00
王怡栋 534b2540d2 Merge branch 'sprint224_26389' into 'master'
* Fix bug#26389,26333,26328

See merge request easycorp/zentaopms!4947
2022-08-12 08:17:54 +00:00
曾刚 de80b35803 * Fix bug#26389,26333,26328 2022-08-12 08:17:54 +00:00
lanzongjun 9fa80dcd94 add cp gantt task move 2022-08-12 16:15:08 +08:00
wangyidong ab06fa28ba Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-12 16:12:08 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00