Commit Graph
4230 Commits
Author SHA1 Message Date
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
孙广明 f0d1c51bfe * Add comment. 2022-01-12 16:49:29 +08:00
孙广明 3706a60032 * Add comment. 2022-01-12 16:47:48 +08: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
孙广明 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
孙广明 ddc5b0cf1d Merge branch 'kanban' into 'sprint/182_liumengyi_kanban'
# Conflicts:
#   module/kanban/model.php
2022-01-12 07:45:15 +00: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
孙广明 0afb843ef5 * Refactor kanban code. 2022-01-12 11:23:05 +08:00
tianshujie 7870309514 * Modify create and execute jump app error. 2022-01-12 11:13:16 +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
孙广明 62b7f5eac1 Merge branch 'sprint/182_liumengyi_47340' into 'kanban'
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.

See merge request easycorp/zentaopms!1344
2022-01-11 07:53:14 +00:00
liumengyi ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
李玉春 8cf613ac6b Merge branch 'sgm_kanbanmodel' into 'kanban'
Add kanban to execution.

See merge request easycorp/zentaopms!1339
2022-01-11 06:14:15 +00:00
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
liumengyi 759841b3a5 * Fix bug for create execution. 2022-01-11 10:16:13 +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
tianshujie 85773e58cd * Fix bug #18280. 2022-01-07 11:01:47 +08:00
孙广明 15a142af8a Merge branch 'sprint/180_songchenxuan_realname' into 'master'
Sprint/180 songchenxuan realname

See merge request easycorp/zentaopms!1300
2022-01-06 09:26:55 +00:00
liumengyi b6ea0afcb4 * Finish task #47090 #47098. 2022-01-06 16:56:27 +08:00
liumengyi 42e9076e66 * Finish task #47081 #47092 #47093 #47111. 2022-01-06 15:25:09 +08:00
songchenxuan 9cae04c917 *Code review realname. 2022-01-06 14:59:14 +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
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
songchenxuan 9c41c46624 *Fix bug #18132. 2021-12-31 17:10:12 +08:00
朱金勇 24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
李玉春 b205ad5ba5 Merge branch 'sprint/180_mayue_46527' into 'sprint/180'
* Finish task #46527.

See merge request easycorp/zentaopms!1208
2021-12-30 09:05:11 +00:00
mayue 64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +08:00
songchenxuan 47c271d9f6 *Fix Closed name bug. 2021-12-30 16:40:53 +08:00
songchenxuan b32009a0ce *Fix execution kanban bug. 2021-12-30 15:34:44 +08:00
mayue 9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
songchenxuan ff16370bc6 *Finish task 46529. 2021-12-30 09:05:05 +08:00
songchenxuan 769f7cd58e *Finish task #46529. 2021-12-30 09:01:33 +08:00
songchenxuan 0d90eba4e5 *Finish task #46529. 2021-12-29 08:32:11 +08:00
hufangzhou 1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
songchenxuan 6f10323a82 *Finish task #46529. 2021-12-27 16:14:05 +08:00
xieqiyu 65aa1aebdf * Fix bug#17791. 2021-12-24 11:11:15 +08:00
zhujinyong 8efde58482 Merge branch 'sprint/178_songchenxuan_17682' 2021-12-23 17:01:30 +08:00
songchenxuan 2507b9ba75 *Fix bug 17682. 2021-12-23 16:24:11 +08:00
songchenxuan 47d7d7a92d *Fix bug #17682. 2021-12-23 15:24:23 +08:00
李玉春 3e1b811de9 Merge branch 'sgm_kanbanstyle' into 'master'
* Adjust kanban style.

See merge request easycorp/zentaopms!1106
2021-12-23 06:05:45 +00:00
孙广明 9622540b60 Merge branch 'sprint/178_songchenxuan_46099_fixbug' into 'master'
*Fix task #46099 bug.

See merge request easycorp/zentaopms!1102
2021-12-23 06:03:01 +00:00