Commit Graph
967 Commits
Author SHA1 Message Date
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +08:00
xieqiyu 19f0244fa1 * Rename getByList to getByIdList. 2023-05-04 05:18:12 +00:00
caoyanyi 44a0d56a01 * Fix bug #34753. 2023-04-24 23:30:35 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
朱金勇 0e619ba796 * Fix bug#34401. 2023-04-19 08:08:11 +00:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
朱金勇 ed55bb7980 * Fix type error. 2023-04-19 02:28:58 +00:00
朱金勇 dbb06251e2 * Fix bug#34330. 2023-04-19 01:10:13 +00:00
liumengyi 8b1a166a1b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 14:05:31 +08:00
朱金勇 cd7ec9ee47 * Fix bug#34249. 2023-04-17 05:35:10 +00:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
朱金勇 c7e37cba47 * Fix bug #34136. 2023-04-13 05:15:22 +00:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
wangyidong 812f4db7b1 * fix bug for can not select integrated build in create bug. 2023-04-06 16:11:49 +08:00
wangyidong 6ecac70d85 * fix bug #33172. 2023-03-21 15:44:47 +08:00
wangyidong b5127c2bb8 * fix bug #33100. 2023-03-21 13:15:17 +08:00
tianshujie 587ff87934 * Fix bug #29843. 2023-03-09 13:25:06 +08:00
caoyanyi e409352d47 * Code for bug #28726. 2023-03-08 17:09:27 +08:00
caoyanyi d3955d187a * Modify language for project to variable. 2023-03-06 15:29:53 +08:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
孙广明 db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
tianshujie 046187237e * Code for fix bug #32561. 2023-03-01 16:35:24 +08:00
liumengyi aac54b6978 * Fix bug #32157. 2023-03-01 07:12:48 +00:00
liumengyi 1b6f5422ec * Finish task #85640. 2023-03-01 02:04:33 +00:00
liumengyi a1c9148a6b * Finish task #85640. 2023-03-01 02:03:03 +00:00
liumengyi 1c3131e402 * Fix bug #32494. 2023-02-28 08:41:30 +00:00
liumengyi 36e9f275c9 * Fix bug #32183. 2023-02-23 02:47:31 +00:00
liuhong f5056eb802 * Adjust code for feedback #2274. 2023-02-21 09:50:19 +00:00
tianshujie 5aee651454 * Code for finish task #84575. 2023-02-18 18:39:07 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
wangyidong c724e74778 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-13 09:46:59 +08:00
wangyidong 11653a8914 * fix bug. 2023-02-13 09:45:43 +08:00
liumengyi d71abe0f43 * Fix bug #32043. 2023-02-10 16:25:49 +08:00
wangyidong de07d90b19 * fix bug #32016. 2023-02-10 11:22:34 +08:00
zhujinyong 5b4fe30491 * Filter stages. 2023-02-07 11:29:05 +08:00
zhujinyong 26c0c5e9dc * Finish task #83938. 2023-02-07 11:06:24 +08:00
孙广明 eb7dce8e88 * Fix code style. 2022-12-29 15:21:59 +08:00
孙广明 c893ac76d8 Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907

See merge request easycorp/zentaopms!6567
2022-12-15 08:20:12 +00:00
liuhong cc631b6e4f * Adjust code #30907. 2022-12-15 08:15:03 +00:00
liuhong a08eff199f * Fix bug #30907. 2022-12-15 08:12:15 +00:00
lanzongjun a8551febe5 * Fix Bug #30909 2022-12-15 15:54:33 +08:00
lanzongjun b4dd6cb307 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-15 13:54:20 +08:00
孙广明 7e7ec61d7e Merge branch 'master_liuhong_30845' into 'master'
* Fix bug #30845.

See merge request easycorp/zentaopms!6552
2022-12-15 05:28:23 +00:00
lanzongjun 057bfe77e2 * Finish Task #79453 2022-12-15 10:55:08 +08:00
liuhong 0dc5fbdb33 * Fix bug #30845. 2022-12-15 02:17:42 +00:00
wangyidong 6391ddfe1e * adjust style. 2022-12-15 10:11:25 +08:00
孙广明 8d8696b1e4 Merge branch 'master_xieqiyu_79662' into 'master'
* Code for task#79662.

See merge request easycorp/zentaopms!6548
2022-12-14 06:14:08 +00:00