Commit Graph
355 Commits
Author SHA1 Message Date
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
zenggang 975be8529a * Adjust code. 2023-08-28 01:55:48 +00:00
songchenxuan 5f50a2ee3f * Fix bug #37074. 2023-08-04 13:51:17 +08:00
songchenxuan 01fd8cc08c * Add a param for story-getBySearch. 2023-08-04 11:05:59 +08:00
songchenxuan 752365514b * Add a new param for story-getExecutionStories. 2023-08-03 14:31:56 +08:00
tanghucheng 9a32c51020 * Fix bug #36089. 2023-06-28 14:05:36 +08:00
songchenxuan 85f56d8f74 * Fix bug #35627. 2023-05-26 09:57:32 +08:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08: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
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
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
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
liuhong 0dc5fbdb33 * Fix bug #30845. 2022-12-15 02:17:42 +00:00
xieqiyu fc17dfc949 * Code for task#79662. 2022-12-14 14:10:49 +08:00
孙广明 2fdb547f3e Merge branch 'master' into 'master_271_78665'
# Conflicts:
#   module/build/control.php
2022-12-09 08:58:55 +00:00
孙广明 a7d7ec312a Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30616

See merge request easycorp/zentaopms!6522
2022-12-09 08:55:12 +00:00
wangyidong 81d3403a20 * code for task #79279. 2022-12-09 16:54:17 +08:00
lanzongjun e6301a8ec3 * Fix Bug #30616 2022-12-09 16:03:32 +08:00
liuhong 94b3f9bfd5 * resolve conflict task #78665 2022-12-09 07:21:08 +00:00
liuhong dd13c3d947 * Adjust code task #78665. 2022-12-08 15:57:27 +00:00
liuhong 14d9f3a5eb * Ajdust code Task #78665. 2022-12-08 15:54:45 +00:00
liuhong 11ca786545 * Fix stories and bug when no associate. 2022-12-08 15:35:48 +00:00
liuhong 207c5c7117 * Adjust code task #78665. 2022-12-08 14:40:21 +00:00
liuhong 0d9f59c49b * Finish tash for Lang and multiple #78665. 2022-12-08 07:48:25 +00:00
liuhong 0094f902f5 * Finish Task #78665. 2022-12-08 06:55:05 +00:00
lanzongjun 47284dc742 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-08 14:45:33 +08:00
lanzongjun e6989dc17c * Finish Bug #30687 2022-12-08 14:32:27 +08:00
liuhong 8ad99f03a5 * Adjuct code #78665. 2022-12-08 04:24:10 +00:00
liuhong 35095aa0b4 * Adjust code #78665. 2022-12-08 02:06:21 +00:00
wangyidong e4b9ef4536 * fix bug #30585. 2022-12-08 09:56:31 +08:00
liuhong ec810545d5 * draft code for #78665. 2022-12-08 00:19:26 +00:00
lanzongjun e6df8be8a6 add default branch 2022-12-07 09:21:19 +08:00
lanzongjun a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
wangyidong 0f1de8b84f * code for task #78911 2022-12-06 13:43:17 +08:00
wangyidong 42e85ebbb8 * code for task #78384. 2022-12-05 10:10:59 +08:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
wangyidong df0997aa70 * change deletereleased param to noreleased. 2022-11-30 17:11:17 +08:00
王 于听 c96f03c532 Merge branch 'master' into 'zentaopms_266_bug#30341'
# Conflicts:
#   module/testtask/control.php
2022-11-30 07:38:45 +00:00
wangyuting 069565c265 * Fix bug. 2022-11-30 07:37:21 +00:00
wangyidong 8efd793e38 * adjust for getBuildPairs method. 2022-11-30 14:04:32 +08:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
wangyuting 40ef984250 * Optimize code. 2022-11-25 00:38:38 +00:00
wangyuting 3075732c2b * Fix bug #30033. 2022-11-24 05:01:52 +00:00