Commit Graph
754 Commits
Author SHA1 Message Date
zhengrunyu 5108aab254 *Fix api . 2022-03-22 16:19:32 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
朱金勇 ec7c5022c8 Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
#   module/execution/control.php
2022-03-21 06:12:21 +00:00
李玉春 59850d5e8f Merge branch 'pailei2_sunhuawei_50728' into 'pailei2'
*Fix bug#19716

See merge request easycorp/zentaopms!2252
2022-03-17 05:36:01 +00:00
songchenxuan ed6e82f02f *Close a story. 2022-03-17 10:11:35 +08:00
孙华伟 8ac07ad424 更新module/story/control.php 2022-03-17 01:10:43 +00:00
孙广明 52193bd9ee Merge branch 'pailei_sunjun_50784' into 'pailei2'
fixbug #18669

See merge request easycorp/zentaopms!2304
2022-03-16 06:32:04 +00:00
sunjun ef285a4869 fixbug #18669 2022-03-16 14:27:49 +08:00
zhouxin f6a7577749 Fix bug #18306. 2022-03-16 01:39:05 +00:00
孙华伟 d73ce9b57a Optimize the code. 2022-03-15 08:56:43 +00:00
孙华伟 8c58e0ef16 *Fix bug#19716 2022-03-14 17:24:49 +08:00
hufangzhou c402f35eda * Fix bug #20704. 2022-03-14 10:08:25 +08:00
hufangzhou 57bbeeddd7 * Remove the unused code. 2022-03-10 11:01:21 +08:00
tianshujie a0e7c613f3 * Finish task #50370. 2022-03-10 10:11:56 +08:00
tianshujie ffd4850a9d * Finish task #20479. 2022-03-09 16:17:32 +08:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong 590ba16d6a * Code for task #49888. 2022-03-09 09:32:18 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
xieqiyu b68d3dda7e * Add selected lane when batch create story in kanban. 2022-03-08 21:14:06 +08:00
王怡栋 c753960b31 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #50357

See merge request easycorp/zentaopms!2147
2022-03-08 09:19:09 +00:00
Zongjun Lan d713bf7b1f * fix bug 50357 2022-03-08 17:11:52 +08:00
Zongjun Lan b7ba61136e * fix bug 50357 2022-03-08 16:32:29 +08:00
zhangzilong 110829f229 * Code for task #49888. 2022-03-08 13:09:45 +08:00
孙华伟 03e3f26ad5 * 2022-03-08 10:03:06 +08:00
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
tianshujie 4f17795ffd * Fix bug #20266. 2022-03-02 15:15:37 +08:00
tianshujie 30600fb7bb * Fix bug #20200. 2022-03-01 20:37:20 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
xieqiyu 74326a3331 * Optimize the code. 2022-03-01 14:40:00 +08:00
tanghucheng b99e04cab3 * Fix bug. 2022-03-01 09:56:19 +08:00
zhouxin 5dc91f9a30 Finish task #49886#49883. 2022-02-28 09:14:19 +00:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
liumengyi 9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +08:00
zhujinyong 49af622fd8 * Move exit to return. 2022-02-22 14:25:14 +08:00
zhujinyong 2b7820d317 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-22 14:15:18 +08:00
zhujinyong 408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tanghucheng f650bc44c7 * Finish task #49415,49418,49425. 2022-02-22 09:19:27 +08:00
zhouxudong ae2ad29753 * Finish task #49296. 2022-02-21 09:56:42 +08:00
孙广明 b52c8bbafd Merge branch 'sprint/185_zxd_49307' into 'sprint/185'
Sprint/185 zxd 49307

See merge request easycorp/zentaopms!1841
2022-02-17 07:31:29 +00:00
zhouxudong aae63736d3 *Finish task #49307. 2022-02-17 15:05:22 +08:00
孙广明 e8939e9826 * Fix export story bug. 2022-02-17 14:41:09 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tianshujie e22bd59961 * Fix bug #19306. 2022-02-16 09:57:17 +08:00
孙华伟 dfdb2f629e Fix bug #19247. 2022-02-15 11:22:31 +08:00
tianshujie bd99d3def9 * Realize the partial refresh function of the story card. 2022-01-20 17:35:49 +08:00