Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,572 Commits 2 Branches 292 Tags
6f72de9b65ad15322facfa6bf00a437680340ac8
Commit Graph

24480 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
7e8d65f34e * fix window.columnRenderers works with defaultCardType. 2021-10-27 14:53:45 +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
孙广明
e623a13cb2 Merge branch 'sprint/168_xiawenlong' into 'sprint/168' 
add right actions

See merge request easycorp/zentaopms!173
 2021-10-27 05:37:43 +00:00
xiawenlong
b571de52de add right actions 2021-10-27 11:46:54 +08:00
李玉春
0af76bd862 Merge branch 'sprint/168_sgm_43396' into 'sprint/168' 
* Add bind product action.

See merge request easycorp/zentaopms!166
 2021-10-27 02:55:51 +00:00
孙广明
15fcbf79e8 Merge branch 'sprint/168_liyuchun_43503' into 'sprint/168' 
Sprint/168 liyuchun 43503

See merge request easycorp/zentaopms!171
 2021-10-27 02:46:22 +00:00
liyuchun
d7868c41e3 * Code for task #43503. 2021-10-27 10:38:52 +08:00
liyuchun
c0502c85fd * Code for task #43503. 2021-10-27 10:35:51 +08:00
reneeteng
1b3e236f01 * Edit dept lang. 2021-10-27 10:19:25 +08:00
孙广明
ee28e0f7ef * Add bind product action. 2021-10-27 09:37:39 +08:00
孙广明
3a4933ef96 Merge branch 'sprint/168_zenggang_15488' into 'sprint/168' 
* Fix bug#15488

See merge request easycorp/zentaopms!163
 2021-10-27 01:27:09 +00:00
zenggang
51531e1e6b * Fix bug#15488 2021-10-26 09:39:25 +00: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
孙广明
7ad0747fd6 Merge branch 'sprint/168_zenggang' into 'sprint/168' 
* Fix menu pri judge

See merge request easycorp/zentaopms!159
 2021-10-26 07:57:05 +00: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
zenggang
1da7061d7a * Fix menu pri judge 2021-10-26 07:49:56 +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
孙广明
e2d368f251 Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168' 
Sprint/168 liyuchun 43519

See merge request easycorp/zentaopms!155
 2021-10-26 07:31:02 +00:00
liyuchun
c45866a3a3 * Code for task #43519. 2021-10-26 15:24:09 +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
liyuchun
0dc857f2bb * Code for task #43519. 2021-10-26 14:38:00 +08:00
tianshujie
4d09ade9cb * Get card data of kanban column. 2021-10-26 14:37:39 +08:00
tianshujie
83a1e66eab * Adjust code. 2021-10-26 13:35:02 +08:00
tianshujie
f8447c9825 * Correct Kanban data. 2021-10-26 11:46:33 +08:00
Hao Sun
920b8234a3 + add kanban demo files. 2021-10-26 11:42:23 +08:00
李玉春
ff8f020485 Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168' 
* Refactoring the Kanban function.

See merge request easycorp/zentaopms!145
 2021-10-26 02:51:13 +00: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
李玉春
86afd37ec1 Merge branch 'sprint/168_dingna_bug' into 'sprint/168' 
* Fix the bug that no navigation after clicking the subtask on the Work page.

See merge request easycorp/zentaopms!142
 2021-10-25 08:06:24 +00:00
王怡栋
c0cf35c191 Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' 
* Add project managed products lang.

See merge request easycorp/zentaopms!139
 2021-10-25 07:35:22 +00:00