Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,580 Commits 2 Branches 292 Tags
ceefa34752fefcf9cfc5b92d36fe674dc00a5eea
Commit Graph
28580 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie ceefa34752 * Modify to get card data. 2021-10-27 17:14:37 +08:00
李玉春 e72ae4fa18 Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' 
* Finish task #43394, #43395, #43396.

See merge request easycorp/zentaopms!187
 2021-10-27 08:48:55 +00:00
孙广明 81603f04bd * Finish task #43394, #43395, #43396. 2021-10-27 16:40:30 +08:00
李玉春 2204b280f1 Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' 
* Modify query Kanban logic.

See merge request easycorp/zentaopms!183
 2021-10-27 07:51:25 +00:00
tianshujie af47fbde25 * Modify the parent swimlane column data. 2021-10-27 15:47:53 +08:00
孙广明 be167bcafb Merge branch 'sprint/168_liyuchun_43424' into 'sprint/168' 
* Finish task #43519,#43503.

See merge request easycorp/zentaopms!185
 2021-10-27 07:46:11 +00:00
tianshujie d6d04e1152 * Modify the parent lane column data. 2021-10-27 15:45:01 +08:00
liyuchun d0b9dda4d7 * Finish task #43519,#43503. 2021-10-27 15:41:36 +08:00
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
liyuchun 8997b3d141 Merge branch 'sprint/167_sgm_kanbandata' into sprint/168 2021-10-27 15:07:06 +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
孙广明 1dd7098228 Merge branch 'sprint/168_xiawenlong' into sprint/168 2021-10-27 14:51:12 +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
Hao Sun b4631b3665 * add drag and drop animation to kanban. 2021-10-27 14:28:03 +08: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
朱金勇 57995a6e7f Merge branch 'sprint/168_sunhao/refactor_avatar_helper' into 'sprint/168' 
* Refactor avatar helper, the $user param cannot be an avatar url now.

See merge request easycorp/zentaopms!161
 2021-10-27 03:01:59 +00: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
孙广明 90079cd4fb Merge branch 'sprint/tengfei_168_lang' into 'sprint/168' 
* Edit dept lang.

See merge request easycorp/zentaopms!169
 2021-10-27 02:26:14 +00:00
reneeteng 1b3e236f01 * Edit dept lang. 2021-10-27 10:19:25 +08:00
Hao Sun 36e71df8eb * support to limit kanban board width. 2021-10-27 10:04:29 +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
孙广明 2ae094b948 Merge branch 'sprint/168_sunhao/improve_kanban_ui' into 'sprint/168' 
* Fix last merge conflict from kanban_demo and improve avatar style.

See merge request easycorp/zentaopms!162
 2021-10-27 00:58:10 +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
Hao Sun a6e7949301 * refactor avatar helper, the $user param cannot be an avatar url now. 2021-10-26 16:39:44 +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
孙广明 d48c8c0d5a Merge branch 'sprint/168_sunhao/kanban_demo' into sprint/168 2021-10-26 15:56:09 +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
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