Commit Graph

291 Commits

Author SHA1 Message Date
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
zhouxudong
15ea32151f * Finish task #19696. 2022-02-21 14:22:17 +08:00
zhujinyong
d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
tanghucheng
8104870b83 * code for task #49080. 2022-02-16 15:11:44 +08:00
tianshujie
0ef9b12a2c * Fix bug #19070. 2022-01-27 16:13:13 +08:00
孙广明
7f6a737d82 * Fix details. 2022-01-26 10:26:52 +08:00
孙广明
2530d27f0b * Fix bug #18972. 2022-01-26 10:14:30 +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
tianshujie
f7d58603fa * Fix bug #18944,18947,18946. 2022-01-25 14:05:23 +08:00
liumengyi
571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
tianshujie
67e57e26b7 * Modify the format. 2022-01-24 16:27:57 +08:00
tianshujie
281885f598 * Fix bug #18848. 2022-01-24 16:24:52 +08:00
tianshujie
3f15a1e016 * Fix bug #18806. 2022-01-21 15:04:25 +08:00
孙广明
c40034f942 Merge branch 'master' into 'sprint/183_liumengyi_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-01-21 05:57:10 +00:00
liumengyi
80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
tianshujie
fe23db6218 * Finish task #48012. 2022-01-21 12:23:38 +08:00
孙广明
8c2bd2386d Merge branch 'sprint/183_liumengyi_48012_bug' into 'master'
* Finish task #48012.

See merge request easycorp/zentaopms!1535
2022-01-21 02:52:33 +00:00
liumengyi
02c47ead7c * Finish task #48012. 2022-01-21 10:39:54 +08:00
孙广明
9011d2f61b Merge branch 'sprint/183_tianshujie_48012' into 'master'
Sprint/183 tianshujie 48012

See merge request easycorp/zentaopms!1528
2022-01-21 01:16:16 +00:00
liumengyi
3ec206f626 * Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve. 2022-01-20 17:07:03 +08:00
tianshujie
25ee419afc * Implement the partial refresh function of the task card. 2022-01-20 15:31:10 +08:00
liumengyi
df8366e1ad * Modify code format. 2022-01-20 14:55:06 +08:00
liumengyi
e2e794c27f * Finish task #48011. 2022-01-20 14:49:16 +08:00
tianshujie
7383bb566d * Modify the question. 2022-01-20 13:49:21 +08:00
tianshujie
ee15a96157 * Achieve smooth refresh of completed tasks. 2022-01-20 13:41:20 +08:00
孙广明
fdac2458cb Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18481.

See merge request easycorp/zentaopms!1490
2022-01-19 03:17:59 +00:00
liumengyi
a1c6cfadcc * Modify required item judgment method. 2022-01-19 09:01:29 +08:00
tianshujie
bb1d4c3839 * Adjust code of kanban. 2022-01-19 09:01:12 +08:00
tianshujie
f7d97ebe33 * Fix bug #18692. 2022-01-19 08:49:09 +08:00
liumengyi
eb31aac6a1 * Encapsulation function for bug #18481. 2022-01-18 17:29:52 +08:00
liumengyi
8f924a7f05 * Fix bug #18481. 2022-01-18 17:23:54 +08:00
tianshujie
29e8966c33 * Fix drag sort issue. 2022-01-18 16:18:15 +08:00
tianshujie
daf29be42b * Fix bug #18520. 2022-01-18 16:01:25 +08:00