Commit Graph

149 Commits

Author SHA1 Message Date
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
Hao Sun
6ad007f06e * task #44357, refactor executions kanban with kanban component and support dnd. 2021-11-17 17:51:20 +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
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
Hao Sun
a233ecdf4b * fix iframe modal show double times on click at second time. 2021-11-09 19:55:15 +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
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
liyuchun
bddeb2d5b2 * Remove more button in group lane. 2021-11-08 16:50:12 +08:00
holan20180123
30b0c8db07 * Finish task #43938,#43939. 2021-11-07 20:31:28 +08:00
liyuchun
a25e86cb59 * Adjust error of kanban action. 2021-11-03 09:15:07 +08:00
李玉春
f011907e1f Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.

See merge request easycorp/zentaopms!281
2021-11-02 06:13:46 +00:00
孙广明
90b6253107 * Fix var name. 2021-11-02 14:12:18 +08:00
李玉春
86c7464aca Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168'
* Assign btn check priv.

See merge request easycorp/zentaopms!282
2021-11-02 06:09:04 +00:00
孙广明
cc321393f6 * Change var name. 2021-11-02 14:05:53 +08:00
孙广明
c7f0e74517 * Assign btn check priv. 2021-11-02 13:59:41 +08:00
Hao Sun
f786d077e4 * improve layout of execution kanban. 2021-11-02 11:17:12 +08:00
liyuchun
59364de4d8 * Fix bug #15851. 2021-11-02 10:18:44 +08:00
liyuchun
fcce47b768 * Fix bug #15852. 2021-11-02 09:48:49 +08:00
liyuchun
84de930ed1 * Fix bug #15853. 2021-11-02 09:27:06 +08:00
李玉春
cb3e573d30 Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.

See merge request easycorp/zentaopms!269
2021-11-02 00:34:38 +00:00
tianshujie
5fc96f394c * Modify format. 2021-11-02 08:19:10 +08:00
tianshujie
5444d35cde * Fix bug #15902. 2021-11-01 17:34:25 +08:00
孙广明
1c98dbd28b Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15887,#15877,#15874.

See merge request easycorp/zentaopms!266
2021-11-01 09:18:16 +00:00
liyuchun
1631791368 * Fix bug #15887,#15877. 2021-11-01 16:54:02 +08:00
孙广明
065b0d04c9 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15867.

See merge request easycorp/zentaopms!260
2021-11-01 08:30:11 +00:00
xieqiyu
19fca33fa3 * Delete the unused code. 2021-11-01 16:20:01 +08:00
liyuchun
d8c96a6430 * Fix bug #15867. 2021-11-01 16:13:13 +08:00
李玉春
16b6f5786e Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423'
# Conflicts:
#   module/execution/js/kanban.js
#   module/kanban/model.php
2021-11-01 08:12:58 +00:00
李玉春
c118bfe048 更新module/execution/js/kanban.js 2021-11-01 08:05:08 +00:00
孙广明
2b2ec6f202 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15861.

See merge request easycorp/zentaopms!252
2021-11-01 08:02:42 +00:00
hufangzhou
f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
孙广明
4099ac4a20 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
Sprint/168 xieqiyu kanban

See merge request easycorp/zentaopms!253
2021-11-01 05:53:00 +00:00
hufangzhou
702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
liyuchun
7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
dingna
c28e4c1b61 * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-11-01 13:26:57 +08:00
xieqiyu
c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
liyuchun
970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08:00
孙广明
4c91b03239 Merge branch 'sprint/168_zenggang_tasks' into 'sprint/168'
* Finish task#43410,43411,43413

See merge request easycorp/zentaopms!227
2021-10-29 07:03:13 +00:00
李玉春
188d3fa8d9 Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
fix fullscreen bug

See merge request easycorp/zentaopms!233
2021-10-29 06:15:26 +00:00
李玉春
619b95257c 更新module/execution/js/kanban.js 2021-10-29 06:15:03 +00:00