Commit Graph
24548 Commits
Author SHA1 Message Date
zenggang 6bdf89c293 * Finish task#43410,43411,43413 2021-10-29 03:18:10 +00:00
李玉春 e618b57d12 Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
add permission

See merge request easycorp/zentaopms!223
2021-10-29 02:43:44 +00:00
liyuchun 54bb24823f * Delete unused code. 2021-10-29 10:42:27 +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
孙广明 cdfb230005 * Add link to assignto. 2021-10-29 10:07:59 +08:00
李玉春 2e6faf1373 Merge branch 'sprint/168_tianshujie_43416' into 'sprint/168'
* Increase the card sorting judgment of the parent lane column.

See merge request easycorp/zentaopms!221
2021-10-29 01:54:48 +00:00
tianshujie 726529bdb9 * Modify the sort logic of the lane column by field. 2021-10-29 09:49:56 +08:00
孙广明 37e96eebe7 Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168'
* Finish task #43519.

See merge request easycorp/zentaopms!219
2021-10-29 01:42:47 +00:00
liyuchun 7a208ad404 * Adjust task $43519. 2021-10-29 09:41:09 +08:00
tianshujie 7f9f5e5649 * Increase the card sorting judgment of the parent lane column. 2021-10-29 09:32:56 +08:00
孙广明 3b11423f2f Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Add button of set WIP and column name.

See merge request easycorp/zentaopms!216
2021-10-29 00:39:22 +00:00
李玉春 2da2792c0a Merge branch 'sprint/168_tianshujie_43416' into 'sprint/168'
* Add card sorting logic.

See merge request easycorp/zentaopms!218
2021-10-28 09:20:16 +00:00
tianshujie 8ae7fec1de * Edit comment of kanban control. 2021-10-28 17:18:33 +08:00
tianshujie ac5bda3929 * Revert conflicting codes. 2021-10-28 17:16:42 +08:00
tianshujie 4472d176d9 * Add comment of kanban control. 2021-10-28 17:10:54 +08:00
tianshujie 34d7a4eb00 * Add card sorting logic. 2021-10-28 17:00:51 +08:00
李玉春 936ae57bff Merge branch 'sprint/168_sgm_fix_detail' into 'sprint/168'
* Fix create story action error.

See merge request easycorp/zentaopms!214
2021-10-28 08:52:44 +00:00
孙广明 97f883c3b2 Merge branch 'sprint/168_zenggang_15773' into 'sprint/168'
* Fix bug#15773

See merge request easycorp/zentaopms!198
2021-10-28 08:36:36 +00:00
liyuchun 817178e93b * Add button of set WIP and column name. 2021-10-28 16:19:16 +08:00
zenggang c061aac0e1 * Adjust code style 2021-10-28 07:56:24 +00:00
孙广明 faeef62b5c * Fix create story action error. 2021-10-28 15:15:17 +08:00
tianshujie 3de0e1d319 * Modify variables. 2021-10-28 15:14:55 +08:00
李玉春 dc5697803d Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168'
* Update Kanban cards.

See merge request easycorp/zentaopms!207
2021-10-28 07:07:59 +00:00
tianshujie 4edfddbc52 * Modify the variable name of the kanban column. 2021-10-28 15:03:02 +08:00
tianshujie 6fefaaaead * Modify the variable name of the kanban column. 2021-10-28 14:56:58 +08:00
tianshujie ded3d0551a * Adjust and update card logic. 2021-10-28 14:52:54 +08:00
李玉春 f9b40d2887 Merge branch 'sprint/168' into 'sprint/168_sgm_43393'
# Conflicts:
#   module/execution/js/kanban.js
2021-10-28 06:47:11 +00:00
孙广明 0036787aac * Add en lang. 2021-10-28 14:43:55 +08:00
李玉春 f6be40b764 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Support for using context menu in kanban.

See merge request easycorp/zentaopms!201
2021-10-28 06:38:44 +00:00
hufangzhou 5377de8a81 * Fix bug #15817. 2021-10-28 14:24:36 +08:00
tianshujie 1b8db9c500 * Update Kanban cards. 2021-10-28 14:18:18 +08:00
xiawenlong ab99aaf886 add delete files 2021-10-28 13:38:33 +08:00
xiawenlong 1b117b4793 add delete files 2021-10-28 13:25:56 +08:00
liyuchun 31a12238ee * Finish task #43519. 2021-10-28 13:06:12 +08:00
Hao Sun 4dadfbd558 * add actions button to cards. 2021-10-28 11:49:27 +08:00
Hao Sun 34064d70b0 * support for using contextmenu in kanban. 2021-10-28 11:34:46 +08:00
孙广明 6c32c9a397 Merge branch 'sprint/tengfei_168_lang' into 'sprint/168'
Sprint/tengfei 168 lang

See merge request easycorp/zentaopms!192
2021-10-28 03:32:04 +00:00
Hao Sun 7cf59f0e13 * support for using iframe modal in kanban page. 2021-10-28 11:31:50 +08:00
Hao Sun e26a26f934 * show deadline on task and bug card. 2021-10-28 11:30:58 +08:00
孙广明 83f3079804 * Finish task #43393. 2021-10-28 11:01:50 +08:00
zenggang 9096f80059 * Fix bug#15773 2021-10-28 02:34:20 +00:00
reneeteng cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
李玉春 6a8f69b524 Merge branch 'sprint/168_sgm_adjustcode' into 'sprint/168'
* Adjust code style.

See merge request easycorp/zentaopms!196
2021-10-28 01:37:15 +00:00
李玉春 1632e807af Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
fix unique lane column name

See merge request easycorp/zentaopms!195
2021-10-28 01:33:59 +00:00
xiawenlong 1520ef7ddf fix code style 2021-10-28 09:32:40 +08:00
xiawenlong 6767ddb22f fix code style 2021-10-28 09:32:07 +08:00
孙广明 ef415555ef * Adjust code style. 2021-10-28 09:29:34 +08:00