Commit Graph
2185 Commits
Author SHA1 Message Date
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun 39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
孙广明 801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
hufangzhou 4736e3a01c * Solve the problem of mutual testing for task #45085. 2021-11-30 09:59:14 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
tianshujie adb2c12935 * Modify the code. 2021-11-29 15:54:48 +08:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
tianshujie 8bf6c34acd * Modify the logic of planning related stories and bugs. 2021-11-26 13:37:15 +08:00
tianshujie 774ee347f5 * Translate modified code. 2021-11-25 17:57:24 +08:00
zhujinyong e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +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
朱金勇 8cdf02366c Merge branch 'sprint/174_hufangzhou_45079' into 'master'
* Add the branch switcher in tree browse page.

See merge request easycorp/zentaopms!614
2021-11-25 05:05:20 +00:00
hufangzhou e431847c58 * Add the branch switcher in tree browse page. 2021-11-25 12:22:56 +08:00
tianshujie 4f4a1f990b * Modify the logic of changing branches in stories. 2021-11-25 11:28:50 +08:00
tianshujie 1d93fa0cd9 * Modify the scope of the linked plan when creating and editing stories. 2021-11-25 10:30:22 +08:00
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +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
xieqiyu 501e80ddf2 * Fix bug#16606. 2021-11-24 10:03:09 +08:00
zhouxin 2b3df26fd8 Fix bug 16564. 2021-11-23 18:47:56 +08:00
tianshujie 600e4fdbba * Fix bug #16576,16576. 2021-11-23 14:45:20 +08:00
hufangzhou 5ac4cfe9f9 * Code for bug #16559. 2021-11-23 14:13:44 +08:00
王怡栋 c7d94a770e * add lang for mobile api. 2021-11-23 11:21:02 +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
hufangzhou 984aa6b1e7 * Fix bug #16559. 2021-11-23 09:27:08 +08:00
王怡栋 90a913ca4b Merge branch 'sprint/170' 2021-11-22 16:59:40 +08:00
zhouxin 1f47ec43c9 . 2021-11-22 16:15:37 +08:00
zhouxin 1d2ce49b24 Add comment. 2021-11-22 15:58:14 +08:00
zhouxin cf29cfdca7 Delete a kongge. 2021-11-22 15:23:52 +08:00
zhouxin 72f57c6f01 Fix bug 16468. 2021-11-22 15:19:22 +08:00
zhouxin 7ec2b00493 Fix bug 16468. 2021-11-22 14:48:19 +08:00
xieqiyu 1fe78e5771 * Fix bug#16489. 2021-11-21 00:55:33 +08:00
wangjianhua fa32609ca0 * Fix bug #16477和#16485 2021-11-19 08:31:58 +00:00
liumengyi 4ffbc120a0 * Fix bug #16467. 2021-11-19 10:14:47 +08:00
liumengyi c38383ad40 * Fix bug #16467. 2021-11-19 10:08:40 +08:00
liumengyi 5d7ae6a71b * Fix bug #16467. 2021-11-19 10:06:56 +08:00
王怡栋 eb63a17885 * code for task #44313. 2021-11-19 09:08:03 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
liyuchun a240c9aa23 * Fix bug #16426,#16393. 2021-11-18 23:17:15 +08:00
Hao Sun c2b944d7e9 * adjust table layout for english environment. 2021-11-18 17:08:02 +08:00
李玉春 936f56e325 Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
* finish task 44491

See merge request easycorp/zentaopms!505
2021-11-18 08:47:29 +00:00
Hao Sun 759533f592 * task #44364, improve layout for page product/all. 2021-11-18 16:45:11 +08:00
Hao Sun 2a3c7922ab * improve UI for product table list. 2021-11-18 15:21:55 +08:00
孙广明 6085ad3089 Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496

See merge request easycorp/zentaopms!511
2021-11-18 06:59:45 +00:00
liumengyi 091f931cda * Finish task #44363. 2021-11-18 14:23:50 +08:00
liumengyi e9d03af319 * Finish task #44363. 2021-11-18 13:40:22 +08: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