Commit Graph

644 Commits

Author SHA1 Message Date
tianshujie
6f72de9b65 * Modify query Kanban logic. 2021-10-27 15:34:59 +08:00
Hao Sun
f2cf07b71d Merge branch 'sprint/168_sunhao/kanban_refactor' into sprint/168
# Conflicts:
#	module/execution/js/kanban.js
2021-10-27 15:20:45 +08:00
Hao Sun
4afd15a4fe * Fix merge conflict. 2021-10-27 15:20:03 +08:00
李玉春
5822a06c7d Merge branch 'sprint/168' into 'sprint/167_sgm_kanbandata'
# Conflicts:
#   module/kanban/model.php
2021-10-27 07:05:51 +00:00
Hao Sun
e403896809 * avoid override window.kanbanDropRules settings in other place. 2021-10-27 15:03:51 +08:00
Hao Sun
81ad2610dc * refactor: alignment statements. 2021-10-27 14:53:15 +08:00
Hao Sun
37f88fdd83 * refactor: rename maxCount->limit, item -> card and comment. 2021-10-27 14:50:32 +08:00
孙广明
8bfa8d5a42 * Add get kanban group. 2021-10-27 14:50:13 +08:00
孙广明
0fc3731113 Merge branch 'sprint/168' into 'sprint/168_xiawenlong'
# Conflicts:
#   module/execution/js/kanban.js
2021-10-27 06:48:39 +00:00
孙广明
1d75b28c4d Merge branch 'sprint/168_sunhao/improve_kanban_ui' into 'sprint/168'
* Improve UI for kanban page, adjust page layout and support for dnd.

See merge request easycorp/zentaopms!175
2021-10-27 06:30:31 +00:00
xiawenlong
19d91de64c * Finish Task #43420 2021-10-27 14:23:28 +08:00
xiawenlong
f1fd0ee1db * Finish Task #43420 2021-10-27 14:14:50 +08:00
Hao Sun
b9ce9d697f * support for d-n-d in kanban. 2021-10-27 14:08:22 +08:00
Hao Sun
f3b29388f7 * adjust layout for kanban page. 2021-10-27 13:52:27 +08:00
xiawenlong
b571de52de add right actions 2021-10-27 11:46:54 +08:00
Hao Sun
14d45f2939 * move some code from kanban_demo. 2021-10-26 16:59:24 +08:00
Hao Sun
77d4073869 * improve avatar style in kanban. 2021-10-26 16:57:36 +08:00
孙广明
fb5687c6a4 Merge branch 'sprint/168' into 'sprint/168_sunhao/kanban_demo'
# Conflicts:
#   module/execution/js/kanban.js
#   module/execution/view/kanban.html.php
2021-10-26 07:53:38 +00:00
Hao Sun
0063ed7950 * replace kanban with kanbandemo. 2021-10-26 15:47:50 +08:00
Hao Sun
b6f3608ab4 * change kanban page width to full size. 2021-10-26 15:38:00 +08:00
李玉春
0458578361 Merge branch 'sprint/168_sgm_kanban' into 'sprint/168'
* Add kanban view.

See merge request easycorp/zentaopms!154
2021-10-26 07:16:12 +00:00
孙广明
ad05f1d4cf * Add kanban view. 2021-10-26 15:03:27 +08:00
Hao Sun
cc3fb38f50 * fix maxCount not show in kanban header. 2021-10-26 14:55:12 +08:00
Hao Sun
f5420202e2 * remove width limit in kanban page. 2021-10-26 14:54:57 +08:00
Hao Sun
43d52ddb9b * improve style for affixed header in kanban. 2021-10-26 14:54:16 +08:00
tianshujie
4d09ade9cb * Get card data of kanban column. 2021-10-26 14:37:39 +08:00
Hao Sun
920b8234a3 + add kanban demo files. 2021-10-26 11:42:23 +08:00
tianshujie
4a2b7dae24 * Add comment of kanban model.php 2021-10-26 10:49:42 +08:00
tianshujie
a71cacdaa8 * Refactoring the Kanban function. 2021-10-26 10:25:33 +08:00
tianshujie
546edae92a * Adjust code of kanban. 2021-10-25 16:11:36 +08:00
tianshujie
a72b84e257 * Get Kanban data. 2021-10-25 15:03:27 +08:00
tianshujie
3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
王怡栋
d8ac3d1950 Merge branch 'sprint/167_hufangzhou_package' into 'sprint/167'
* Check the code for upgrade.

See merge request easycorp/zentaopms!84
2021-10-18 05:14:44 +00:00
hufangzhou
c4824ba3d7 * Check the code for upgrade. 2021-10-18 13:11:07 +08:00
王怡栋
621eecf52c * adjust for execution action list. 2021-10-18 10:18:40 +08:00
xieqiyu
92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
tianshujie
ab662e5cf4 * Fix bug #15511. 2021-10-14 13:31:08 +08:00
hufangzhou
a80eca0ab5 * Fix bug #15477. 2021-10-12 15:42:58 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
朱金勇
ff09127219 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42846.

See merge request easycorp/zentaopms!41
2021-10-09 01:32:30 +00:00
王怡栋
a14fc4e7f9 * finish task #42848. 2021-09-30 15:49:24 +08:00
zenggang
f139f00e61 * Task 42862,previously committed to the master branch, now resubmit to the 165 branch 2021-09-30 11:19:05 +08:00
zenggang
5d37062ad6 * Fix bug#15359 2021-09-29 10:46:07 +08:00
朱金勇
8ef308be2f Merge branch 'sprint/165_zenggang' into 'sprint/165'
* Fix bug#15368

See merge request easycorp/zentaopms!35
2021-09-28 08:11:15 +00:00
朱金勇
79a020c0f5 Merge branch 'sprint/165_dingna_task42827' into 'sprint/165'
* Finish task 42827.

See merge request easycorp/zentaopms!36
2021-09-28 07:46:19 +00:00
朱金勇
aa86fdea50 Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!38
2021-09-28 07:37:30 +00:00
liyuchun
9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
dingna
5b5ae6dfdd * Finish task #42827. 2021-09-27 16:21:26 +08:00
zenggang
336a4e5951 * Fix bug#15368 2021-09-27 15:32:22 +08:00