Commit Graph

131 Commits

Author SHA1 Message Date
孙华伟
d8bb8a903e * 2022-03-04 14:34:01 +08:00
孙华伟
c01323fdbb *Fix bug #20273 . 2022-03-03 09:40:43 +08:00
孙华伟
e0640737c2 *Fix bug #20273. 2022-03-03 09:34:41 +08:00
李玉春
a0da36e3f2 Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
2022-03-02 05:34:15 +00:00
孙华伟
e7d721af85 * 2022-03-02 13:15:04 +08:00
孙华伟
03b0221c99 * 2022-03-02 13:08:22 +08:00
孙华伟
fa34d9e024 * 2022-03-02 11:31:50 +08:00
孙华伟
51b7e615e0 * 2022-03-02 11:30:20 +08:00
孙华伟
5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟
abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙广明
b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
zhangzilong
92f4d32a68 * Finish task #49297. 2022-03-02 10:57:48 +08:00
孙华伟
f4bed0d0c6 * 2022-03-02 10:28:01 +08:00
孙华伟
a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
xieqiyu
06af0ff6c4 * Code for task#49696. 2022-03-01 17:28:57 +08:00
孙华伟
23511a0472 *Story #30528. 2022-03-01 15:37:05 +08:00
zhangzilong
d8178d01eb * Finish task #49297. 2022-03-01 14:27:16 +08:00
孙华伟
af06215820 * 2022-03-01 14:20:06 +08:00
孙华伟
8b79ae9c09 *Story #30528 2022-03-01 14:00:40 +08:00
zhangzilong
9150e9903b * Finish task #49297. 2022-03-01 11:00:08 +08:00
孙华伟
87db779922 * 2022-03-01 10:27:19 +08:00
zhangzilong
868a293324 * 2022-03-01 10:05:30 +08:00
孙华伟
40405cf7ec * 2022-03-01 08:42:43 +08:00
孙华伟
271e52a98c * 2022-02-28 15:46:06 +08:00
孙华伟
0ea4f15d4b * 2022-02-28 14:36:44 +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