Commit Graph
1171 Commits
Author SHA1 Message Date
mayue a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
孙广明 5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
chaideqing 74f7a95902 * optimize zentao buglist/storylist/tasklist show when in xuanxuan card 2021-11-29 14:55:14 +08:00
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
zhengrunyu b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
xieqiyu 763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
tianshujie 582f0e036d * Finish task #45043. 2021-11-27 18:14:41 +08:00
tianshujie 3bddd21087 * Finish task #45083. 2021-11-27 17:58:52 +08:00
tianshujie f4d1a727a7 * Finish task #45084,44994,44993. 2021-11-27 17:41:42 +08:00
tianshujie 066db150a4 * Solve the problem of plan creation and execution error. 2021-11-27 09:52:47 +08:00
zhengrunyu 9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
王怡栋 c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +08:00
zhengrunyu 07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu 119a3fab7d *Finish task #45151. 2021-11-26 08:48:26 +08:00
zhengrunyu 2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu 3340a383f1 *Finish task #45151. 2021-11-25 15:03:43 +08:00
朱金勇 293a375ec8 Merge branch 'sprint/174_mayue_16605' into 'master'
Fix bug #16605.

See merge request easycorp/zentaopms!616
2021-11-25 06:45:58 +00:00
mayue 1cf28e1120 * Fix bug #16605. 2021-11-25 13:20:54 +08:00
王怡栋 385cb41a0e * code for task #44938. 2021-11-25 11:35:46 +08:00
mayue c2c13a9079 * Fix bug #16605. 2021-11-25 09:53:49 +08:00
mayue c40360d556 * Fix bug #16605. 2021-11-25 09:43:34 +08:00
王怡栋 d9ee0bfbf7 Merge branch 'master' into 'sprint/170_package_bug'
# Conflicts:
#   module/mr/model.php
2021-11-25 00:32:52 +00:00
tianshujie 179e766478 * Modify function name. 2021-11-24 16:45:08 +08:00
zhouxin 2b3df26fd8 Fix bug 16564. 2021-11-23 18:47:56 +08:00
tianshujie 33e557cd18 * Fix bug #16577. 2021-11-23 15:07:07 +08:00
tianshujie ec5ca42e49 * Fix bug #16577. 2021-11-23 15:01:51 +08:00
hufangzhou c0d4264148 * Fix bug #16564. 2021-11-23 10:10:14 +08:00
王怡栋 74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
tianshujie 7802bc6a47 * Fix bug #16541. 2021-11-22 16:01:31 +08:00
孙广明 11a320555c Merge branch 'sprint/172_liyuchun_16384' into 'sprint/168'
* Adjust execution button name.

See merge request easycorp/zentaopms!578
2021-11-22 06:50:34 +00:00
hufangzhou 63bc9f80c4 * Fix bug #16509. 2021-11-22 14:11:13 +08:00
liyuchun da47c729d9 * Adjust execution button name. 2021-11-22 13:36:52 +08:00
zhengrunyu a6db2057d9 *Finish task #16521. 2021-11-22 11:12:15 +08:00
李玉春 8e7c536a8d Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
Modify the branch scope when creating and editing bugs.

See merge request easycorp/zentaopms!560
2021-11-22 01:00:45 +00:00
liyuchun 9502610ece * Fix error for task #44358. 2021-11-22 08:39:34 +08:00
tianshujie 0408f2f8ce * Modify the execution scope of creating and editing bugs. 2021-11-21 10:46:35 +08:00
xieqiyu 856afd0b76 * Fix bug#16471. 2021-11-21 02:23:33 +08:00
mayue 2b258a7665 * Modify style. 2021-11-19 15:11:07 +08:00
liyuchun 8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
tianshujie 70f8e0d320 * Fix execution and project linked product prompt issues. 2021-11-19 08:44:53 +08:00
李玉春 683b082095 Merge branch 'sprint/168_sunhao/task44357' into 'sprint/168'
* Task #44357, refactor executions kanban with kanban component and support dnd.

See merge request easycorp/zentaopms!497
2021-11-18 09:23:47 +00:00
李玉春 36e39591be Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503

See merge request easycorp/zentaopms!516
2021-11-18 09:19:19 +00:00
李玉春 15967171de Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.

See merge request easycorp/zentaopms!513
2021-11-18 06:33:49 +00:00
李玉春 3870f6f9e4 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.

See merge request easycorp/zentaopms!495
2021-11-18 06:30:03 +00:00
lizhiqiang e5653c5dd7 *Finish Bug #16371. 2021-11-18 14:21:34 +08:00
zhouxin b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
孙广明 8f2c87cae1 Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'
# Conflicts:
#   module/execution/view/create.html.php
2021-11-18 06:03:46 +00:00
李玉春 e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00