Commit Graph
101 Commits
Author SHA1 Message Date
孙广明 38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
liyuchun 36b10d3983 * Fix bug #16173. 2021-11-12 10:19:41 +08:00
liyuchun 7d4e1240cd * Fix bug #16174. 2021-11-12 09:12:20 +08:00
liyuchun cc75d05280 * Adjust lane name when update kanban lane. 2021-11-12 09:05:52 +08:00
孙广明 9eed12e7f4 Merge branch 'sprint/168_liyuchun_44216' into 'sprint/168'
* Finish task #44217,#44218,#44219,#44220.

See merge request easycorp/zentaopms!405
2021-11-11 08:46:24 +00:00
liyuchun 4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +08:00
liyuchun e79a153a1f * Adjust code for error name. 2021-11-11 09:19:05 +08:00
liyuchun bb426aaabe * Fix bug #16054. 2021-11-10 09:19:25 +08:00
liyuchun 743f03c2cf * Finish task #43929. 2021-11-08 13:35:49 +08:00
liyuchun e8f2b39833 * Finish task #43929. 2021-11-08 13:15:17 +08:00
liyuchun 67f485736e * Fix error of task #43935. 2021-11-04 16:32:51 +08:00
liyuchun a6483ab2dc * Finish task #43935. 2021-11-04 16:24:32 +08:00
liyuchun edd4f50a8e * Fix bug #43928. 2021-11-04 14:10:00 +08:00
liyuchun 380941f957 * Fix bug #43927. 2021-11-04 10:06:14 +08:00
liyuchun 410499dc9a * Fix bug #43931. 2021-11-03 17:04:50 +08:00
tianshujie e4a97a5687 * Fix bug card update logic. 2021-11-03 12:34:03 +08:00
zenggang b48c61becc * Fix bug#15929 2021-11-02 03:49:50 +00:00
tianshujie 40a2c67b6d * Fix bug #15909. 2021-11-02 12:29:30 +08:00
tianshujie 237b488504 * Fix bug #15904. 2021-11-02 08:57:47 +08:00
李玉春 cb3e573d30 Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.

See merge request easycorp/zentaopms!269
2021-11-02 00:34:38 +00:00
李玉春 e7c595df19 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
* Fix bug#15886.

See merge request easycorp/zentaopms!268
2021-11-02 00:33:07 +00:00
xieqiyu 47ee3885ba * Optimize the code. 2021-11-02 08:27:32 +08:00
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
李玉春 5cfaf07475 Merge branch 'sprint/168_hufangzhou_43423' into 'sprint/168'
* Code for task #43423.

See merge request easycorp/zentaopms!264
2021-11-01 08:41:04 +00:00
李玉春 38da2ef80d Merge branch 'sprint/168_tianshujie_15882' into 'sprint/168'
* Fix bug #15882.

See merge request easycorp/zentaopms!263
2021-11-01 08:40:07 +00:00
hufangzhou aadb69106d * Code for task #43423. 2021-11-01 16:32:28 +08:00
xieqiyu edc60704d5 * Add color to the lane. 2021-11-01 16:15:22 +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
李玉春 9ccc42efc0 更新module/kanban/model.php 2021-11-01 08:11:47 +00:00
tianshujie 201ee20f1e * Fix bug #15882. 2021-11-01 15:44:06 +08:00
李玉春 c72bde8698 Merge branch 'sprint/168_tianshujie_15878' into 'sprint/168'
* Fix bug #15878.

See merge request easycorp/zentaopms!257
2021-11-01 07:32:14 +00:00
tianshujie 6417119744 * Fix bug #15878. 2021-11-01 15:28:35 +08:00
tianshujie 9d1899e3ff * Fix bug #15876. 2021-11-01 14:39:21 +08:00
hufangzhou f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
hufangzhou 702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
xieqiyu c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
李玉春 b5532e7379 Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168'
* Add a default color to the kanban column.

See merge request easycorp/zentaopms!239
2021-10-29 07:15:20 +00:00
tianshujie 70349fe46a * Add a default color to the kanban column. 2021-10-29 15:05:33 +08:00
孙广明 06feb0f942 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix error of save WIP.

See merge request easycorp/zentaopms!240
2021-10-29 07:04:08 +00:00
孙广明 4c91b03239 Merge branch 'sprint/168_zenggang_tasks' into 'sprint/168'
* Finish task#43410,43411,43413

See merge request easycorp/zentaopms!227
2021-10-29 07:03:13 +00:00
tianshujie bf032684e4 * Add a default color to the kanban column. 2021-10-29 14:49:17 +08:00
liyuchun dfc29b5cb2 * Fix error of save WIP. 2021-10-29 14:48:38 +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
zenggang d84ffbd355 * Adjust code format 2021-10-29 05:31:26 +00:00
xieqiyu 0c5c8e2a42 * Modify code logic. 2021-10-29 11:33:19 +08:00
zenggang ce7c632045 * Change function name 2021-10-29 03:29:08 +00:00
zenggang 6bdf89c293 * Finish task#43410,43411,43413 2021-10-29 03:18:10 +00:00