Commit Graph

324 Commits

Author SHA1 Message Date
tianshujie
a7d66c5fae * Fix bug #20572. 2022-03-10 10:05:34 +08:00
tianshujie
b4c0fff8e0 * Fix bug #20531. 2022-03-09 14:55:04 +08:00
tianshujie
a349c5bfeb * Fix bug #20530. 2022-03-09 14:01:41 +08:00
王怡栋
fb22e1dcb0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368

See merge request easycorp/zentaopms!2128
2022-03-08 07:54:22 +00:00
tianshujie
54ac0f8c8e * Finish task #50380. 2022-03-08 13:52:34 +08:00
Zongjun Lan
b82a7e5f57 * fix bug 50368 2022-03-08 09:51:34 +08:00
xieqiyu
b455987346 * Fix bug. 2022-03-07 13:02:17 +08:00
孙广明
7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
Zongjun Lan
0512526c23 * fix bug 19713 2022-03-03 10:07:55 +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
李玉春
aeaf877933 Update kanban.js 2022-03-02 05:11:04 +00: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
孙华伟
a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
zhangzilong
2f38d907ee * Code for task #49297. 2022-03-02 09:07:15 +08:00
孙广明
5decf2cf6c Merge branch 'sprint/185_zhouxudong_19962' into 'pailei'
* Finish task #49696.

See merge request easycorp/zentaopms!1991
2022-03-02 00:31:17 +00:00
xieqiyu
daefe27bf5 * Delete unused code. 2022-03-01 17:33:45 +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
孙华伟
5b99190d32 * 2022-03-01 14:53:57 +08:00
孙华伟
af06215820 * 2022-03-01 14:20:06 +08:00
zhangzilong
aff8bf40ef * Finish task #49297. 2022-03-01 11:19:01 +08:00
zhangzilong
1777586537 * Finish task #49297. 2022-03-01 10:59:25 +08:00
zhangzilong
83bf7d564a * Finish task #49297. 2022-03-01 10:13:43 +08:00
zhangzilong
868a293324 * 2022-03-01 10:05:30 +08:00
zhangzilong
b4176af440 * Finish task #49297. 2022-02-28 15:31:43 +08:00
liumengyi
54fe05a303 * Fix bug #20103. 2022-02-28 15:16:36 +08:00
孙华伟
0ea4f15d4b * 2022-02-28 14:36:44 +08:00
zhangzilong
e30a8b1343 * Finish task #49297. 2022-02-28 14:27:55 +08:00
zhouxudong
8a9824bc98 * Fix bug . 2022-02-24 15:28:01 +08:00
zhouxudong
88163d846f * Fix bug . 2022-02-24 15:22:12 +08:00
zhengrunyu
9f6eb6c7a5 * Remove (). 2022-02-24 11:27:02 +08:00
zhengrunyu
172b62dbfb * Fixbug 19953. 2022-02-24 11:18:44 +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
周旭东
bc832bcf22 Update kanban.js 2022-02-23 09:20:20 +00:00
zhouxudong
6556130370 * Modify variable name. 2022-02-23 17:11:26 +08:00
李玉春
cbd1ec29ce Merge branch 'sprint/185_zhengrunyu_Fixbug_19932' into 'sprint/185'
*Fix bug 19932 .

See merge request easycorp/zentaopms!1924
2022-02-23 08:56:19 +00:00
zhouxudong
ad7d67071d * Fix bug #19917. 2022-02-23 16:50:08 +08:00
zhengrunyu
c07ca10dd7 *Fix bug 19932 . 2022-02-23 16:39:35 +08: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
周旭东
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
zhengrunyu
269ac9742e * Fix bug 19890 19891. 2022-02-23 10:37:23 +08:00
zhouxudong
eb3894a900 * Finish task #49693. 2022-02-23 09:58:03 +08:00
zhengrunyu
d04ff0a6d9 * Finish task 49306. 2022-02-23 09:00:37 +08: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