Commit Graph
192 Commits
Author SHA1 Message Date
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
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
孙广明 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
xieqiyu d5914e8ffc * Conflict resolution. 2021-10-29 14:12:07 +08:00
李玉春 8ce1a694fc Merge branch 'sprint/168' into 'sprint/168_dingna_task_43401'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
#   module/kanban/lang/zh-cn.php
#   module/kanban/model.php
2021-10-29 05:50:12 +00:00
dingna 6369e0f7a3 * Fix an error. 2021-10-29 13:37:03 +08:00
liyuchun 4f56cc8c0f * Finish task #43407,#43406. 2021-10-29 12:37:59 +08:00
dingna 0fac3aa189 * Adjust Code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-10-29 11:33:47 +08:00
夏文龙 a0a4af4daa Update kanban.html.php 2021-10-29 02:33:45 +00:00
xiawenlong f74435a42d fix code style 2021-10-29 10:26:34 +08:00
xiawenlong 5397954f15 Finish permissionOC 2021-10-29 10:13:39 +08:00
xiawenlong 3dc8358434 Finish permissionOC 2021-10-29 10:09:07 +08:00
dingna 0b13f86812 * Code update for task * 43401,#43507,#43398. 2021-10-29 09:23:53 +08:00
xieqiyu 04b34ce724 * Adjust code style. 2021-10-29 08:56:58 +08:00
dingna 87c6365aee * Code for task#43401,#43507,#43398. 2021-10-29 08:43:06 +08:00
liyuchun 817178e93b * Add button of set WIP and column name. 2021-10-28 16:19:16 +08:00
孙广明 83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
孙广明 b6cc57c54e Merge branch 'spirnt/168_liyuchun_43409' into 'sprint/168'
* Finish task #43521.

See merge request easycorp/zentaopms!193
2021-10-27 09:27:49 +00:00
liyuchun 1981133d03 * Finish task #43521. 2021-10-27 17:17:45 +08:00
xiawenlong 5b0458b841 * Finish Task #43407,43420 2021-10-27 16:53:15 +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
孙广明 8bfa8d5a42 * Add get kanban group. 2021-10-27 14:50:13 +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
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
孙广明 ad05f1d4cf * Add kanban view. 2021-10-26 15:03:27 +08:00
Hao Sun 8de42e5bca * add space between icon and text. 2021-07-30 14:38:39 +08:00
leiyong d0e21dee63 * Fix bug. 2021-04-09 13:16:24 +03:00
Yagami 2ee08d06de * Fix code for execution. 2021-03-08 14:03:50 +08:00
zhujinyong 76baa276fd * Adjust program and project module. 2021-03-03 14:52:12 +08:00