Commit Graph
173 Commits
Author SHA1 Message Date
liumengyi 80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
liumengyi d0739e40e3 * Fix bug for task #47976. 2022-01-21 12:16:16 +08:00
刘梦艺 d980d5132d Update control.php 2022-01-21 00:46:28 +00:00
liumengyi 04f89dd9ba * Fix bug for edit kanban. 2022-01-21 08:44:11 +08:00
liumengyi ec1f0876aa * Fix bug for create kanban. 2022-01-21 08:38:38 +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
liumengyi e2e794c27f * Finish task #48011. 2022-01-20 14:49:16 +08:00
王怡栋 abf1d172a6 Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #48006, #48007.

See merge request easycorp/zentaopms!1512
2022-01-20 03:22:28 +00:00
liumengyi 083e006c38 * Remove empty line. 2022-01-20 11:11:08 +08:00
liumengyi b371c22842 * Finish task #48006, #48007. 2022-01-20 11:05:35 +08:00
孙广明 6d2212e7e0 Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #47977.

See merge request easycorp/zentaopms!1503
2022-01-19 09:32:12 +00:00
mayue 7cb8fa1912 * Optimize code. 2022-01-19 17:23:27 +08:00
mayue 29bedc7b1f * Optimize code. 2022-01-19 17:10:09 +08:00
liumengyi e02ec415c4 * Remove useless code. 2022-01-19 17:04:54 +08:00
liumengyi c8b5ceed87 * Finish task #47977. 2022-01-19 16:58:34 +08:00
mayue 39b7da7355 * Finish task #47996. 2022-01-19 16:50:40 +08:00
tianshujie 1c60beb471 * Finish task #48005. 2022-01-19 16:02:34 +08:00
tianshujie 0adde5be67 * Remove useless code. 2022-01-19 13:56:50 +08:00
tianshujie caf4e77f84 * Finish task #47981. 2022-01-19 13:32:39 +08:00
孙广明 b09d6a161b Merge branch 'sprint/182_tianshujie_18663' into 'master'
* Fix bug #18663.

See merge request easycorp/zentaopms!1475
2022-01-18 06:05:34 +00:00
tianshujie 0c1ebe9beb * Fix bug #18663. 2022-01-18 14:04:42 +08:00
孙广明 820993a452 * Add delay. 2022-01-18 08:52:13 +08:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
liumengyi 0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00
hufangzhou 97308d9d09 * Adjust the moveCards function. 2022-01-14 08:14:54 +08:00
tianshujie b8321c127a * Finish task #47353. 2022-01-13 10:10:30 +08:00
孙广明 ff650dd8fb Merge branch 'sprint/182_tianshujie_47352' into 'kanban'
* Finish task #47352.

See merge request easycorp/zentaopms!1369
2022-01-13 01:47:50 +00:00
tianshujie 940587e1ca * Finish task #47352. 2022-01-13 09:44:07 +08:00
王怡栋 69ca909802 Merge branch 'sgm_kanban' into 'kanban'
Sgm kanban

See merge request easycorp/zentaopms!1365
2022-01-12 08:50:10 +00:00
孙广明 16b6264a75 * Refactor kanban code. 2022-01-12 16:34:01 +08:00
tianshujie 8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
tianshujie e19602194a * Modify the editing project error problem. 2022-01-12 10:30:55 +08:00
tianshujie d20ba7265b * Modify the code logic. 2022-01-11 21:23:16 +08:00
tianshujie 9faee43d47 * Modify default value. 2022-01-11 17:07:40 +08:00
tianshujie aca23db346 * Finish task #47358. 2022-01-11 17:02:17 +08:00
tianshujie 378abd8527 * Modify variable name. 2022-01-11 10:09:40 +08:00
tianshujie 4a5ec8d84b * Modify variable name. 2022-01-11 10:06:47 +08:00
tianshujie fc081f1d21 * Modify the code logic. 2022-01-11 10:03:22 +08:00
tianshujie eac960afe5 * Fix bug #47314. 2022-01-11 09:38:21 +08:00
liumengyi 8425897a08 * Fix bug #17939. 2021-12-24 17:25:16 +08:00
tianshujie ff3a24fdbb * Fix bug #17928. 2021-12-24 11:18:22 +08:00
孙广明 9bfb3c1377 Merge branch 'master' into 'sprint/179_tianshujie_bug'
# Conflicts:
#   module/kanban/js/view.js
2021-12-23 05:06:50 +00:00
tianshujie 63210497d3 * Fix bug #17785,#17743. 2021-12-23 11:43:04 +08:00
李玉春 6eda721a3b Merge branch 'master' into 'sgm_fixbug'
# Conflicts:
#   module/kanban/model.php
#   module/kanban/view/view.html.php
2021-12-23 03:23:07 +00:00
孙广明 75f14ac945 * Fix bugs. 2021-12-23 10:56:33 +08:00
孙广明 c9c8dd72eb Merge branch 'sprint/179_tianshuje_46242' into 'master'
Sprint/179 tianshuje 46242

See merge request easycorp/zentaopms!1089
2021-12-23 02:38:16 +00:00
tianshujie 25a2e79f43 * Finish task #46242. 2021-12-23 09:59:34 +08:00
liumengyi 04c61d1205 * Fix the bug caused by personnel deletion. 2021-12-23 09:39:37 +08:00