Commit Graph
1767 Commits
Author SHA1 Message Date
王怡栋 f8e0c430cd * adjust for kanban in lite. 2022-01-19 13:41:29 +08:00
王怡栋 03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +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
王怡栋 d8577f7d28 * adjust for project kanban. 2022-01-17 17:25:20 +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
liumengyi fc5ad0f893 * FIx bug #18489,#18478,#18466. 2022-01-16 17:11:40 +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
孙广明 13e653f600 * Process kanban execution. 2022-01-14 13:34:47 +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 e19602194a * Modify the editing project error problem. 2022-01-12 10:30:55 +08:00
孙广明 54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
孙广明 1cae18380b Revert "Merge branch 'sprint/182_hufangzhou_47330' into 'master'"
This reverts merge request !1324
2022-01-11 00:39:37 +00:00
hufangzhou 63226a2e84 * Finish task #47330. 2022-01-10 15:45:24 +08:00
孙广明 d5efab2baf Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
#   module/project/config.php
2022-01-07 00:46:43 +00:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +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
hufangzhou 4d78e4b9d3 * Compatible with Firefox browser. 2022-01-05 10:54:34 +08:00
mayue 15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
zhujinyong e944c4a428 Merge branch 'sprint/180_sunhao/task46524' into sprint/180 2021-12-31 11:21:25 +08:00
Hao Sun 1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
Hao Sun dff300cf88 * Task #46524, refactor user selector for page "project/managemembers". 2021-12-30 17:02:32 +08:00
mayue 64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +08:00
孙广明 355665690b Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674

See merge request easycorp/zentaopms!1195
2021-12-30 08:15:39 +00:00
zhouxin 344682bf7b Delete createguide of kanban,change cmmi to waterfall. 2021-12-30 06:25:22 +00:00
zhouxin 05a75e7039 Finish task #46674. 2021-12-30 05:50:50 +00:00
mayue 9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
songchenxuan c560dc7048 *Delete swp file. 2021-12-30 09:41:33 +08:00
zhouxin 2e79c5f869 Finish task #46679 and fix a bug. 2021-12-29 03:49:17 +00:00
songchenxuan 4b3404983f *Finish task #46531. 2021-12-28 09:36:31 +08:00
孙广明 84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
tianshujie 9ad591fc93 * Realize the function of sub-molecules. 2021-12-17 09:27:50 +08:00
Hao Sun 2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
朱金勇 f1e97497a3 Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!903
2021-12-13 00:46:27 +00:00
xieqiyu 46ed4772cf * Delete unused code. 2021-12-11 14:39:19 +08:00
xieqiyu 5472859d6e * Code for task#45536. 2021-12-11 14:28:45 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
hufangzhou 1517a800e2 * Fix an error for lang item. 2021-12-09 10:34:47 +08:00
tianshujie 2030bbd11c * Fix bug #17173. 2021-12-09 10:34:47 +08:00