Commit Graph
135 Commits
Author SHA1 Message Date
孙广明 69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
孙广明 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 876c9e3877 * Finish task #43941. 2021-11-09 17:04:31 +08:00
liyuchun cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +08:00
liyuchun f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +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
孙广明 b8c16619cc Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15907.

See merge request easycorp/zentaopms!273
2021-11-02 01:48:08 +00:00
liyuchun 84de930ed1 * Fix bug #15853. 2021-11-02 09:27:06 +08:00
liyuchun 4936056465 * Fix bug #15907. 2021-11-02 09:15:53 +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
李玉春 a3e3b5a7fd Merge branch 'sprint/168_tianshujie_15881' into 'sprint/168'
* Fix bug #15881.

See merge request easycorp/zentaopms!258
2021-11-01 08:14:47 +00: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
李玉春 353b9bbb33 更新module/kanban/control.php 2021-11-01 08:12:17 +00:00
李玉春 9ccc42efc0 更新module/kanban/model.php 2021-11-01 08:11:47 +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 200801ebee * Add the dynamic for moving swimlane. 2021-11-01 15:51:30 +08:00
tianshujie 201ee20f1e * Fix bug #15882. 2021-11-01 15:44:06 +08:00
dingna 4450c96453 * Fix lang for select menu. 2021-11-01 15:38:34 +08:00
tianshujie 5d438c910e * Fix bug #15881. 2021-11-01 15:38:08 +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
孙广明 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