Commit Graph

109 Commits

Author SHA1 Message Date
zhangzilong
d8178d01eb * Finish task #49297. 2022-03-01 14:27:16 +08:00
zhangzilong
9150e9903b * Finish task #49297. 2022-03-01 11:00:08 +08:00
zhangzilong
868a293324 * 2022-03-01 10:05:30 +08:00
zhouxudong
88163d846f * Fix bug . 2022-02-24 15:22:12 +08:00
tianshujie
22147a542c * Fix Kanban import bug menu error. 2022-02-24 11:02:55 +08:00
李玉春
9b4fe955ea Merge branch 'sprint/185_zhouxudong_19917' into 'sprint/185'
Sprint/185 zhouxudong 19917

See merge request easycorp/zentaopms!1923
2022-02-23 09:26:48 +00:00
zhouxudong
97e5aab33c * Fix bug #19917. 2022-02-23 16:37:44 +08:00
李玉春
322c9c2b54 Merge branch 'sprint/185_zxd_49696' into 'sprint/185'
* Finish task #49696.

See merge request easycorp/zentaopms!1908
2022-02-23 08:11:28 +00:00
zhengrunyu
599e94d578 * Fixbug 19911. 2022-02-23 14:12:39 +08:00
周旭东
8b494a429d Update kanban.html.php 2022-02-23 05:27:17 +00:00
周旭东
ede11fedbe Update kanban.html.php 2022-02-23 05:21:05 +00:00
周旭东
f134c0d63b Merge branch 'sprint/185' into 'sprint/185_zxd_49696'
# Conflicts:
#   module/execution/view/kanban.html.php
2022-02-23 05:17:54 +00:00
李玉春
e637d830ee Merge branch 'sprint/185' into 'sprint/185_zxd_49693'
# Conflicts:
#   module/execution/js/kanban.js
#   module/execution/view/kanban.html.php
2022-02-23 05:08:23 +00:00
zhouxudong
d3d29e78b1 * Finish task #49693. 2022-02-22 17:41:44 +08:00
zhengrunyu
c9685d4441 *Finish task 49694 49695. 2022-02-22 15:52:32 +08:00
zhouxudong
15ea32151f * Finish task #19696. 2022-02-21 14:22:17 +08:00
周旭东
117a240287 Update kanban.html.php 2022-02-15 05:13:13 +00:00
zhouxudong
bc31a203ae *Fix bug #19343. 2022-02-15 10:45:33 +08:00
tianshujie
0ef9b12a2c * Fix bug #19070. 2022-01-27 16:13:13 +08:00
zhouxin
e48be0c1db Fix s bug. 2022-01-27 03:11:36 +00:00
李玉春
8bff3489c8 Merge branch 'sgm_47983' into 'master'
* Fix bug #18972.

See merge request easycorp/zentaopms!1633
2022-01-26 02:39:03 +00:00
孙广明
2530d27f0b * Fix bug #18972. 2022-01-26 10:14:30 +08:00
tianshujie
8dcd1a0e4c * Fix the problem of error reporting and button dividing line. 2022-01-26 09:02:16 +08:00
李玉春
bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
孙广明
e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
liumengyi
571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
liumengyi
80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
tianshujie
b22eed4a6d * Fix bug #18783,18780. 2022-01-20 11:15:33 +08:00
zhouxin
919e91b029 Finish task #47980. 2022-01-19 05:51:01 +00:00
tianshujie
cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
liumengyi
deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
tianshujie
3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
liumengyi
0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00
liumengyi
f9d299efd2 * Finish task #47332. 2022-01-14 09:29:50 +08:00
tianshujie
2261371010 * Refactoring task kanban to view logic by group. 2022-01-13 21:11:23 +08:00
liumengyi
0f49102886 * Fix bug for execution kanban view. 2022-01-13 14:36:05 +08:00
孙广明
e82f0f5655 Merge branch 'sprint/182_tianshujie_47313' into 'kanban'
* Finish task #47333,47313.

See merge request easycorp/zentaopms!1374
2022-01-13 03:18:01 +00:00
孙广明
021d9d8b9a Merge branch 'sprint/182_liumengyi_kanban' into 'kanban'
* Finish task #47334.Add card view.

See merge request easycorp/zentaopms!1372
2022-01-13 03:06:47 +00:00
tianshujie
bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi
1ea0bb4760 * Finish task #47334.Add card view. 2022-01-13 10:35:04 +08:00
tianshujie
940587e1ca * Finish task #47352. 2022-01-13 09:44:07 +08:00
tianshujie
8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
孙广明
5a8c11cb6e Merge branch 'kanban' into 'sprint/182_tianshujie_47336'
# Conflicts:
#   module/execution/control.php
2022-01-12 07:53:04 +00:00
tianshujie
4bca0680ab * Finish task #47335. 2022-01-12 15:44:44 +08:00
liumengyi
0b334a246f * Add column menu. 2022-01-12 15:39:33 +08:00
liumengyi
adf53d8754 * Finish task #47334.Add default view of professional RD Kanban. 2022-01-12 10:08:15 +08:00
孙广明
197a1bceea * Finish task #46165. 2021-12-22 09:41:39 +08:00
孙广明
87c12c800a * Fix code details. 2021-12-17 15:43:19 +08:00
孙广明
9f7eecf9c6 * Finish task #46164. 2021-12-17 15:25:59 +08:00
Hao Sun
5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00