Commit Graph

267 Commits

Author SHA1 Message Date
chaideqing
de1a9ddd9b Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857 2021-12-01 10:35:47 +08:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
chaideqing
74f7a95902 * optimize zentao buglist/storylist/tasklist show when in xuanxuan card 2021-11-29 14:55:14 +08:00
hufangzhou
63bc9f80c4 * Fix bug #16509. 2021-11-22 14:11:13 +08:00
hufangzhou
21faa0dc2a * Finish task #44361. 2021-11-18 11:30:28 +08:00
hufangzhou
6e1f7dfbf7 * Finish task #44361. 2021-11-17 18:06:48 +08:00
hufangzhou
0d39951950 * Code for task #44361. 2021-11-17 16:14:53 +08:00
tanghucheng
939023de6d * Finish task #44023 for max. 2021-11-15 10:19:35 +08:00
孙广明
70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
孙广明
a075c72531 * Fix execution update order. 2021-11-12 09:28:37 +08:00
李玉春
900de67361 Merge branch 'sprint/171_sgm_43998' into 'sprint/168'
* Finish task #43998.

See merge request easycorp/zentaopms!376
2021-11-10 02:35:22 +00:00
孙广明
6d625bb597 * Finish task #43998. 2021-11-10 09:43:04 +08:00
liyuchun
00d9bc4d7f * Sort execution kanban. 2021-11-09 17:22:42 +08:00
liyuchun
cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +08:00
孙广明
870b311f06 * Fix errors. 2021-11-08 16:32:18 +08:00
孙广明
3d00ecc5b0 * Fix an error. 2021-11-08 15:48:58 +08:00
孙广明
1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +08:00
holan20180123
3f01755d1b * Fix error of kanban session. 2021-11-07 20:48:04 +08:00
liyuchun
28027af1b0 * Fix bug #43931. 2021-11-03 17:03:57 +08:00
xieqiyu
a91d1f3f98 * Code for bug#15888. 2021-11-02 09:45:53 +08:00
xieqiyu
68c4026e14 * Fix bug#15888. 2021-11-02 09:38:02 +08:00
tianshujie
7af3f622c0 * Fix bug #15871. 2021-11-01 16:26:50 +08:00
孙广明
4099ac4a20 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
Sprint/168 xieqiyu kanban

See merge request easycorp/zentaopms!253
2021-11-01 05:53:00 +00:00
xieqiyu
c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
liyuchun
970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08:00
xieqiyu
d5914e8ffc * Conflict resolution. 2021-10-29 14:12:07 +08:00
李玉春
8ce1a694fc Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php
2021-10-29 05:50:12 +00:00
dingna
5217e0dfc2 * Adjust code style. 2021-10-29 10:44:28 +08:00
dingna
0b13f86812 * Code update for task * 43401,#43507,#43398. 2021-10-29 09:23:53 +08:00
dingna
87c6365aee * Code for task#43401,#43507,#43398. 2021-10-29 08:43:06 +08:00
xieqiyu
6035a7f700 * Add data to the Kanban lane table. 2021-10-28 17:24:20 +08:00
孙广明
83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
liyuchun
f361a97721 * Fix error of kanban. 2021-10-28 08:35:21 +08:00
liyuchun
1981133d03 * Finish task #43521. 2021-10-27 17:17:45 +08:00
tianshujie
6f72de9b65 * Modify query Kanban logic. 2021-10-27 15:34:59 +08:00
孙广明
8bfa8d5a42 * Add get kanban group. 2021-10-27 14:50:13 +08:00
李玉春
0458578361 Merge branch 'sprint/168_sgm_kanban' into 'sprint/168'
* Add kanban view.

See merge request easycorp/zentaopms!154
2021-10-26 07:16:12 +00:00
孙广明
ad05f1d4cf * Add kanban view. 2021-10-26 15:03:27 +08:00
tianshujie
4d09ade9cb * Get card data of kanban column. 2021-10-26 14:37:39 +08:00
tianshujie
4a2b7dae24 * Add comment of kanban model.php 2021-10-26 10:49:42 +08:00
tianshujie
a71cacdaa8 * Refactoring the Kanban function. 2021-10-26 10:25:33 +08:00
tianshujie
546edae92a * Adjust code of kanban. 2021-10-25 16:11:36 +08:00
tianshujie
a72b84e257 * Get Kanban data. 2021-10-25 15:03:27 +08:00
tianshujie
3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
王怡栋
621eecf52c * adjust for execution action list. 2021-10-18 10:18:40 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
zenggang
336a4e5951 * Fix bug#15368 2021-09-27 15:32:22 +08:00
zenggang
6798a9cb46 * Fix bug#15280 2021-09-26 17:10:11 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
hufangzhou
85ad745929 * Add the recall in project story list, add the review and recall in execution story list. 2021-09-06 13:06:33 +08:00