Commit Graph
3790 Commits
Author SHA1 Message Date
xieqiyu 0b9e65b245 * Fix bug#18983. 2022-01-26 10:27:50 +08:00
liumengyi b6b895bb87 * Modify how the creator is appended to team members. 2022-01-24 17:20:38 +08:00
liumengyi 30236e6a94 * Remove empty line. 2022-01-24 17:11:25 +08:00
liumengyi ecc9e22867 * Finish task 18883,add project team. 2022-01-24 16:54:30 +08:00
zhouxudong d19df00d0b *Finish task #47958. 2022-01-21 09:07:28 +08:00
zhouxudong a7fa427b91 *Finish task #47958. 2022-01-19 14:29:23 +08:00
hufangzhou afe5025006 * Finish task #47308. 2022-01-18 10:59:28 +08:00
孙广明 fb8fd8b7de Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18584, #18594.

See merge request easycorp/zentaopms!1453
2022-01-18 01:32:19 +00:00
孙广明 139f1dbcac * Fix delay bug. 2022-01-18 09:18:13 +08:00
liumengyi c377f3b54c * Fix bug #18584, #18594. 2022-01-18 09:03:30 +08:00
孙广明 820993a452 * Add delay. 2022-01-18 08:52:13 +08:00
liumengyi 842ca07618 * Fix bug #18625. 2022-01-17 18:25:39 +08:00
孙广明 48473a63dc Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.

See merge request easycorp/zentaopms!1444
2022-01-17 08:31:47 +00:00
liumengyi 00f85a4ee8 * Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462. 2022-01-17 16:13:45 +08:00
孙广明 f82881b592 * Fix bugs. 2022-01-17 15:37:52 +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
孙广明 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
孙广明 5f58ada861 * Fix locate bug. 2022-01-17 10:20:06 +08: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
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +08:00
tianshujie a838e62257 * Fix bug #18475. 2022-01-14 15:12:29 +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 61590215c1 * Finish task #47359,47360. 2022-01-14 13:47:30 +08:00
孙广明 13e653f600 * Process kanban execution. 2022-01-14 13:34:47 +08:00
xieqiyu d4365afb0b * Add project test case. 2022-01-14 08:32:53 +08:00
liumengyi 92c3693650 * Fix bug #18419, #18414, #18411. 2022-01-13 17:20:21 +08:00
liumengyi 8850815c58 * Finish task #47339. 2022-01-13 14:13:03 +08:00
tianshujie bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
tianshujie a0d61f9d2f * Working with Kanban Data. 2022-01-12 11:07:02 +08:00
tianshujie e19602194a * Modify the editing project error problem. 2022-01-12 10:30:55 +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
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
王怡栋 9f778e38b5 Merge branch 'revert-3e9bcdb8' into 'master'
Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"

See merge request easycorp/zentaopms!1328
2022-01-11 00:43:35 +00:00
孙广明 1cae18380b Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
2022-01-11 00:39:37 +00:00
孙广明 b57562e99e Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
2022-01-11 00:35:04 +00:00
hufangzhou 0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +08:00
hufangzhou 075ac6efc5 * Adjust the lang item order. 2022-01-10 15:58:01 +08:00
hufangzhou 63226a2e84 * Finish task #47330. 2022-01-10 15:45:24 +08:00
tianshujie 85773e58cd * Fix bug #18280. 2022-01-07 11:01:47 +08:00
孙广明 069f119566 Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!1302
2022-01-07 01:20:56 +00:00
mayue 91ff44d32e * Optimize code. 2022-01-07 09:14:27 +08:00
xieqiyu 3186827004 * Modify name. 2022-01-07 08:53:18 +08:00
孙广明 d5efab2baf Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
#   module/project/config.php
2022-01-07 00:46:43 +00:00