Commit Graph

781 Commits

Author SHA1 Message Date
zhengrunyu
e78c876216 *Finish task #45148. 2021-11-30 09:22:04 +08:00
zhengrunyu
b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
zhengrunyu
9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
zhengrunyu
07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu
2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu
3340a383f1 *Finish task #45151. 2021-11-25 15:03:43 +08:00
孙广明
11a320555c Merge branch 'sprint/172_liyuchun_16384' into 'sprint/168'
* Adjust execution button name.

See merge request easycorp/zentaopms!578
2021-11-22 06:50:34 +00:00
hufangzhou
63bc9f80c4 * Fix bug #16509. 2021-11-22 14:11:13 +08:00
liyuchun
da47c729d9 * Adjust execution button name. 2021-11-22 13:36:52 +08:00
liyuchun
9502610ece * Fix error for task #44358. 2021-11-22 08:39:34 +08:00
liyuchun
8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
李玉春
683b082095 Merge branch 'sprint/168_sunhao/task44357' into 'sprint/168'
* Task #44357, refactor executions kanban with kanban component and support dnd.

See merge request easycorp/zentaopms!497
2021-11-18 09:23:47 +00:00
hufangzhou
21faa0dc2a * Finish task #44361. 2021-11-18 11:30:28 +08:00
Hao Sun
5a7dbcbfd3 * change cursor to move for execution item in kanban. 2021-11-18 10:27:44 +08:00
hufangzhou
6e1f7dfbf7 * Finish task #44361. 2021-11-17 18:06:48 +08:00
Hao Sun
6ad007f06e * task #44357, refactor executions kanban with kanban component and support dnd. 2021-11-17 17:51:20 +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
李玉春
68653946e5 Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki

See merge request easycorp/zentaopms!435
2021-11-12 05:24:19 +00:00
孙广明
70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
liyuchun
fa1ffa32bb * Fix bug #16163. 2021-11-12 11:13:37 +08:00
liyuchun
4865431f22 * Fix bug #16166. 2021-11-12 10:36:57 +08:00
孙广明
a075c72531 * Fix execution update order. 2021-11-12 09:28:37 +08:00
liyuchun
4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +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
Hao Sun
a233ecdf4b * fix iframe modal show double times on click at second time. 2021-11-09 19:55:15 +08:00
liyuchun
00d9bc4d7f * Sort execution kanban. 2021-11-09 17:22:42 +08:00
孙广明
b4e9ab871d Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 08:57:01 +00:00
liyuchun
cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +08:00
孙广明
521a8e871d * Finish task #44139. 2021-11-09 14:39:07 +08:00
李玉春
60766cee16 Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.

See merge request easycorp/zentaopms!359
2021-11-09 06:36:52 +00:00
孙广明
21d6cbd160 * Fix logic error. 2021-11-09 14:24:49 +08:00
孙广明
a8ce426a32 Merge branch 'sprint/168' into 'sprint/168_liyuchun_43954'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 05:04:22 +00:00
孙广明
954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun
7589eca470 * Finish task #43954. 2021-11-09 09:50:00 +08:00
孙广明
72a6f47b38 Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168'
* Finish task #43933.

See merge request easycorp/zentaopms!353
2021-11-09 01:16:47 +00:00
孙广明
f9f26953aa * Adjust kanban details. 2021-11-09 09:10:07 +08:00
liyuchun
f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +08:00
李玉春
d66bd6f3d3 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Adjust kanban layout.

See merge request easycorp/zentaopms!278
2021-11-09 00:32:48 +00:00
李玉春
c97af049d8 Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug'
Sprint/171 sgm 43948

See merge request easycorp/zentaopms!346
2021-11-08 09:04:11 +00:00
liyuchun
bddeb2d5b2 * Remove more button in group lane. 2021-11-08 16:50:12 +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
holan20180123
30b0c8db07 * Finish task #43938,#43939. 2021-11-07 20:31:28 +08:00
liyuchun
28027af1b0 * Fix bug #43931. 2021-11-03 17:03:57 +08:00
liyuchun
ddc8fade9a * Fix bug #15869. 2021-11-03 16:51:14 +08:00
liyuchun
a25e86cb59 * Adjust error of kanban action. 2021-11-03 09:15:07 +08:00