Commit Graph

449 Commits

Author SHA1 Message Date
tianshujie
0ef9b12a2c * Fix bug #19070. 2022-01-27 16:13:13 +08:00
zhouxin
e48be0c1db Fix s bug. 2022-01-27 03:11:36 +00:00
sgm0422
4f3c4dbdae * Fix bug #19048. 2022-01-27 08:32:36 +08:00
李玉春
8bff3489c8 Merge branch 'sgm_47983' into 'master'
* Fix bug #18972.

See merge request easycorp/zentaopms!1633
2022-01-26 02:39:03 +00:00
孙广明
2530d27f0b * Fix bug #18972. 2022-01-26 10:14:30 +08:00
tianshujie
8dcd1a0e4c * Fix the problem of error reporting and button dividing line. 2022-01-26 09:02:16 +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
孙广明
e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
liumengyi
571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
liumengyi
1353d674c7 * Fix bug #18883 and #18891. 2022-01-24 14:19:35 +08:00
liumengyi
80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
tianshujie
b22eed4a6d * Fix bug #18783,18780. 2022-01-20 11:15:33 +08:00
孙广明
f30562f520 Merge branch 'sprint/183_zhouxin_47980' into 'master'
Finish task #47980.

See merge request easycorp/zentaopms!1496
2022-01-19 09:32:28 +00:00
zhouxudong
a7fa427b91 *Finish task #47958. 2022-01-19 14:29:23 +08:00
zhouxin
919e91b029 Finish task #47980. 2022-01-19 05:51:01 +00:00
liumengyi
361d245ac6 * Remove useless variables. 2022-01-19 11:13:43 +08:00
liumengyi
2d10aedf4b * Remove useless code. 2022-01-19 09:04:11 +08:00
liumengyi
a1c6cfadcc * Modify required item judgment method. 2022-01-19 09:01:29 +08:00
liumengyi
8f924a7f05 * Fix bug #18481. 2022-01-18 17:23:54 +08:00
liumengyi
c587ac5863 * Fix bug #18671. 2022-01-18 14:46:38 +08:00
tianshujie
cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
liumengyi
deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
tianshujie
3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
孙广明
b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
liumengyi
b2324c3406 * Fix bug #18485,#18474. 2022-01-17 10:13:31 +08:00
liumengyi
cdba989f91 * Fix bug #18458,#18473. 2022-01-17 08:54:22 +08:00
liumengyi
0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00
liumengyi
f9d299efd2 * Finish task #47332. 2022-01-14 09:29:50 +08:00
tianshujie
b22160b3c7 * Add set swimlane height button. 2022-01-13 21:21:49 +08:00
tianshujie
2261371010 * Refactoring task kanban to view logic by group. 2022-01-13 21:11:23 +08:00
liumengyi
0f49102886 * Fix bug for execution kanban view. 2022-01-13 14:36:05 +08:00
孙广明
e82f0f5655 Merge branch 'sprint/182_tianshujie_47313' into 'kanban'
* Finish task #47333,47313.

See merge request easycorp/zentaopms!1374
2022-01-13 03:18:01 +00:00
孙广明
021d9d8b9a Merge branch 'sprint/182_liumengyi_kanban' into 'kanban'
* Finish task #47334.Add card view.

See merge request easycorp/zentaopms!1372
2022-01-13 03:06:47 +00:00
tianshujie
bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi
1ea0bb4760 * Finish task #47334.Add card view. 2022-01-13 10:35:04 +08:00
zhangrunyu
39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
tianshujie
940587e1ca * Finish task #47352. 2022-01-13 09:44:07 +08:00
tianshujie
8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
孙广明
5a8c11cb6e Merge branch 'kanban' into 'sprint/182_tianshujie_47336'
# Conflicts:
#   module/execution/control.php
2022-01-12 07:53:04 +00:00
tianshujie
c5bf8afbc2 * Modify the link judgment method. 2022-01-12 15:50:44 +08:00
tianshujie
4bca0680ab * Finish task #47335. 2022-01-12 15:44:44 +08:00
liumengyi
0b334a246f * Add column menu. 2022-01-12 15:39:33 +08:00
tianshujie
a0d61f9d2f * Working with Kanban Data. 2022-01-12 11:07:02 +08:00
liumengyi
adf53d8754 * Finish task #47334.Add default view of professional RD Kanban. 2022-01-12 10:08:15 +08:00
liumengyi
ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
liumengyi
203b97de5f * Finish task #47340. 2022-01-11 10:14:49 +08:00
liumengyi
ddb8a4037d * Finish task #47340, #47341. 2022-01-11 10:11:59 +08:00
liumengyi
b6ea0afcb4 * Finish task #47090 #47098. 2022-01-06 16:56:27 +08:00
mayue
a2765b7427 * Optimize code. 2022-01-06 13:50:43 +08:00
mayue
fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00