Commit Graph
136 Commits
Author SHA1 Message Date
zhengrunyu c6e92fb035 *add padding for finish label. 2022-01-27 15:45:49 +08:00
zhengrunyu 3f9410f28c *Fix bug for card. 2022-01-27 14:58:08 +08:00
孙广明 2993776ce2 Merge branch 'master' into 'Fixbug'
# Conflicts:
#   module/kanban/js/view.js
2022-01-27 03:02:56 +00:00
zhengrunyu 5b1a0f4b87 *change finished card and add status default 2022-01-27 10:35:33 +08:00
hufangzhou dce9ca9f0e * Set the min height of import modal. 2022-01-26 18:14:22 +08:00
xieqiyu e398afaf88 * Modify pop-up style. 2022-01-26 17:18:54 +08:00
孙广明 3317e04ce6 Merge branch 'sprint/183_mayue_18961' into 'master'
* Fix bug #18961.

See merge request easycorp/zentaopms!1635
2022-01-26 02:37:02 +00:00
mayue cf8da1955d * Fix bug #18961. 2022-01-26 10:21:28 +08:00
孙广明 141a624806 Merge branch 'sprint/183_xieqiyu_fixbug' into 'master'
Sprint/183 xieqiyu fixbug

See merge request easycorp/zentaopms!1621
2022-01-26 01:08:41 +00:00
孙广明 9db830389b Merge branch 'sprint/183_tianshujie_kanban' into 'master'
* Fix kanban style issues.

See merge request easycorp/zentaopms!1620
2022-01-26 00:29:08 +00:00
xieqiyu 065bea5ddd * Fix bug#18968. 2022-01-25 17:27:25 +08:00
tianshujie 03d3855aae * Fix kanban style issues. 2022-01-25 17:26:55 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
孙广明 d243960742 Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug #18804.

See merge request easycorp/zentaopms!1615
2022-01-25 08:57:58 +00:00
liumengyi 1bc4f4c408 * Fix bug #18804. 2022-01-25 16:55:19 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
hufangzhou 7115724593 * Fix bug #18958. 2022-01-25 16:30:01 +08:00
xieqiyu 7feffbdcfa * Modify test problem. 2022-01-25 14:57:15 +08:00
孙广明 cac8eaa104 Merge branch 'sprint/183_tianshujie_bug' into 'master'
Sprint/183 tianshujie bug

See merge request easycorp/zentaopms!1596
2022-01-25 05:38:26 +00:00
tianshujie 363af0483b * Remove useless code. 2022-01-25 13:37:33 +08:00
tianshujie 4185f88f29 * Fix bug #18948,18836,18804. 2022-01-25 13:27:38 +08:00
孙广明 5fec7d3964 Merge branch 'sprint/183_mayue_18875' into 'master'
* Fix bug #18875.

See merge request easycorp/zentaopms!1595
2022-01-25 05:20:04 +00:00
mayue 5ee2825c26 * Fix bug #18875. 2022-01-25 13:15:18 +08:00
xieqiyu 5d0f26bb46 * Modify the mutual test problem. 2022-01-25 13:04:32 +08:00
孙广明 df75841d5b Merge branch 'sprint/183_xt_card' into 'master'
Sprint/183 xt card

See merge request easycorp/zentaopms!1587
2022-01-25 03:19:35 +00:00
liumengyi 571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
tianshujie 14c68e0cf7 * Modify card style. 2022-01-25 09:29:43 +08:00
xieqiyu 1801b1e783 * Add pending future to the product plan. 2022-01-25 09:10:26 +08:00
xieqiyu 053985fb05 * Code for task#47988. 2022-01-24 23:12:40 +08:00
tianshujie 7a7ad37f3c * Finish task #47990. 2022-01-24 18:16:28 +08:00
tianshujie 331e00ab2b * Modify area style. 2022-01-24 17:04:07 +08:00
tianshujie 281885f598 * Fix bug #18848. 2022-01-24 16:24:52 +08:00
孙广明 72de0a1b9c Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/js/view.js
#   module/kanban/model.php
2022-01-24 07:28:48 +00:00
xieqiyu 7570801b1d * Modify the review code. 2022-01-24 14:34:37 +08:00
孙广明 3550c592ad Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug#18841, #18865, #18876, #18877, #18879 and #18891.

See merge request easycorp/zentaopms!1556
2022-01-24 06:00:27 +00:00
liumengyi 7633710cfa * Fix bug#18841, #18865, #18876, #18877, #18879 and #18891. 2022-01-24 13:31:12 +08:00
zhouxin b519ac8607 Fix bug #18847#18846 and add ditto for batchcreatecard.html.php. 2022-01-24 05:12:33 +00:00
tianshujie 0b8535a885 * Finish task #47994. 2022-01-24 12:30:30 +08:00
王怡栋 a8457f1665 Merge branch 'master' into 'sprint/183_hufangzhou_47986'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2022-01-20 08:04:32 +00:00
hufangzhou 9aee0590c5 * Finish task #47986. 2022-01-20 15:52:18 +08:00
mayue bc20febdb0 * Optimize style. 2022-01-20 10:39:38 +08:00
mayue 65df68d61e * Finish task. 2022-01-20 10:04:44 +08:00
tianshujie 6992338a0e * Finish task #47358. 2022-01-14 10:46:54 +08:00
Hao Sun fa29706187 * Task #47358, support for setting kanban lane height with option "displayCards". 2022-01-13 13:10:15 +08:00
tianshujie 0601474a78 * Fix bug #18289. 2022-01-10 15:41:24 +08:00
liumengyi 4979f04de9 * Modify style for create card. 2021-12-24 13:31:12 +08:00
孙广明 a28772a3f6 Merge branch 'sprint/179_liumengyi_17927' into 'master'
* Fix bug #17927.

See merge request easycorp/zentaopms!1136
2021-12-24 05:21:55 +00:00
liumengyi 8be143a091 * Fix bug #17927. 2021-12-24 13:20:15 +08:00
zhengrunyu e0b585354d *change position of icon-required. 2021-12-24 13:18:54 +08:00
liumengyi 6863cd05b8 * Fix bug #17920. 2021-12-24 11:11:33 +08:00