Commit Graph
32733 Commits
Author SHA1 Message Date
songchenxuan 80ce2a3d03 *Case. 2022-01-18 09:59:54 +08:00
王怡栋 97ba199eeb Merge branch 'sgm_upgrade' into 'master'
* Add upgrade logic.

See merge request easycorp/zentaopms!1429
2022-01-17 02:44:01 +00:00
孙广明 fff984acf4 * Add upgrade logic. 2022-01-17 10:42:02 +08:00
朱金勇 dce7ddc20c Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu

See merge request easycorp/zentaopms!1426
2022-01-17 02:35:38 +00:00
孙广明 b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
孙广明 94e62d0a55 Merge branch 'sprint/182_tianshujie_18496' into 'kanban'
* Fix bug.

See merge request easycorp/zentaopms!1428
2022-01-17 02:27:20 +00:00
王怡栋 7b7d9f545d Merge branch 'sgm_upgrade' into 'kanban'
* Fix locate bug.

See merge request easycorp/zentaopms!1427
2022-01-17 02:23:56 +00:00
tianshujie a42faa10f1 * Fix bug. 2022-01-17 10:22:51 +08:00
孙广明 fd288aafc4 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug #18485,#18474.

See merge request easycorp/zentaopms!1424
2022-01-17 02:22:05 +00:00
孙广明 5f58ada861 * Fix locate bug. 2022-01-17 10:20:06 +08:00
孙广明 6f02c1e384 Merge branch 'sprint/182_hufangzhou_18407' into 'kanban'
* Fix bug #18407.

See merge request easycorp/zentaopms!1425
2022-01-17 02:17:06 +00:00
hufangzhou a49076b0d8 * Fix bug #18407. 2022-01-17 10:14:50 +08:00
xieqiyu 809d34a266 * example. 2022-01-17 10:14:10 +08:00
liumengyi b2324c3406 * Fix bug #18485,#18474. 2022-01-17 10:13:31 +08:00
孙广明 717ebf0004 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug #18470.

See merge request easycorp/zentaopms!1423
2022-01-17 01:22:44 +00:00
liumengyi fd20384534 * Fix bug #18470. 2022-01-17 09:21:11 +08:00
孙广明 66515d7ed8 Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* FIx bug #18489,#18478,#18466.

See merge request easycorp/zentaopms!1420
2022-01-17 00:57:03 +00:00
liumengyi cdba989f91 * Fix bug #18458,#18473. 2022-01-17 08:54:22 +08:00
孙广明 e177702c23 Merge branch 'sprint/182_tianshujie_18475' into 'kanban'
*Fix bug #18475.

See merge request easycorp/zentaopms!1422
2022-01-17 00:50:20 +00:00
tianshujie 58c2fe04af *Fix bug #18475. 2022-01-17 08:48:42 +08:00
王怡栋 a5459c40ed Merge branch 'sgm_kanban' into 'kanban'
* Add kanban type in query.

See merge request easycorp/zentaopms!1421
2022-01-17 00:44:13 +00:00
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
孙广明 30b2d61c71 Merge branch 'sprint/182_tianshujie_18475' into 'kanban'
* Fix bug #18475.

See merge request easycorp/zentaopms!1416
2022-01-17 00:35:57 +00:00
liumengyi d45ff40e16 * Add code annotation. 2022-01-16 19:33:52 +08:00
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
孙广明 4d174414d3 Merge branch 'sprint/182_hufangzhou_47307' into 'kanban'
* Finish task #47307.

See merge request easycorp/zentaopms!1417
2022-01-14 07:30:08 +00:00
hufangzhou 59df7f51f6 * Finish task #47307. 2022-01-14 15:29:07 +08:00
tianshujie 53fbf25f17 * Adjust css of kanban view. 2022-01-14 15:18:56 +08:00
tianshujie 1097e61db8 * Adjust css of kanban view. 2022-01-14 15:14:53 +08:00
tianshujie a838e62257 * Fix bug #18475. 2022-01-14 15:12:29 +08:00
孙广明 8707d80112 Merge branch 'sprint/182_tianshujie_47350' into 'kanban'
* Finish task #47350.

See merge request easycorp/zentaopms!1414
2022-01-14 07:07:40 +00:00
孙广明 af155a32f1 Merge branch 'sprint/182_liumengyi_movecard' into kanban 2022-01-14 15:06:32 +08:00
tianshujie 947c9586f5 * Finish task #47350. 2022-01-14 15:06:22 +08:00
孙广明 b01e1901a0 Merge branch 'kanban' into 'sprint/182_liumengyi_movecard'
# Conflicts:
#   module/execution/control.php
2022-01-14 07:06:18 +00:00
liumengyi 0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00
tianshujie a241dc5b11 * Finish task #47350. 2022-01-14 14:51:48 +08:00
王怡栋 1383c34cd5 Merge branch 'sprint/182_hufangzhou_hideOtherProduct' into 'master'
* Hide the other products.

See merge request easycorp/zentaopms!1413
2022-01-14 06:50:15 +00:00
hufangzhou bf119b5cb8 * Hide the other products. 2022-01-14 14:48:24 +08:00
李玉春 d36e3212e1 Merge branch 'sprint/182_tianshujie_column' into 'kanban'
* Modify the problem of creating a bug lane and reporting an error.

See merge request easycorp/zentaopms!1412
2022-01-14 06:44:35 +00:00
tianshujie 8399a61753 * Modify the problem of creating a bug lane and reporting an error. 2022-01-14 14:41:13 +08:00
王怡栋 25d152f63d Merge branch 'sgm_kanban' into 'kanban'
* Fix details and add upgrade logic.

See merge request easycorp/zentaopms!1411
2022-01-14 06:37:28 +00:00
孙广明 19aaf9740c * Fix details and add upgrade logic. 2022-01-14 14:31:59 +08:00
孙广明 31492d118b Merge branch 'sprint/182_tianshujie_kanban' into 'kanban'
* Finish task #47359,47360.

See merge request easycorp/zentaopms!1410
2022-01-14 05:53:56 +00:00
tianshujie 62b9d82679 * Modify default value. 2022-01-14 13:53:04 +08:00
tianshujie 61590215c1 * Finish task #47359,47360. 2022-01-14 13:47:30 +08:00
王怡栋 b7b03e641f Merge branch 'sgm_kanban' into 'kanban'
* Process kanban execution.

See merge request easycorp/zentaopms!1408
2022-01-14 05:38:14 +00:00
王怡栋 3e7d58df4b Merge branch 'sprint/182_hufangzhou_bug' into 'master'
* Fix the bugs of upgrade.

See merge request easycorp/zentaopms!1409
2022-01-14 05:37:02 +00:00
hufangzhou eb71ea3d2d * Fix the bugs of upgrade. 2022-01-14 13:35:35 +08:00
孙广明 13e653f600 * Process kanban execution. 2022-01-14 13:34:47 +08:00
孙广明 5ecba2a5da Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'
* Fix bug for task#47355 #47346.

See merge request easycorp/zentaopms!1407
2022-01-14 05:11:33 +00:00