Commit Graph
222 Commits
Author SHA1 Message Date
hufangzhou 5154d3bc0d * Finish task#7764. 2020-08-31 17:16:44 +08:00
leiyong 77d8f2255f * Finish task#7736. 2020-08-31 16:52:09 +08:00
holan20180123 521cea2844 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-31 15:04:28 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
Yagami 116a7e43b3 * Finish task #7721. 2020-08-31 13:34:32 +08:00
Yagami bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
Yagami 49316f308b * Rename program method name. 2020-08-29 13:20:27 +08:00
Yagami 283acfe49f * Fix code style. 2020-08-28 11:37:40 +08:00
Yagami cde9e66616 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-28 08:55:21 +08:00
Yagami f6db670dbc * Fix block code style. 2020-08-28 08:55:02 +08:00
leiyong 969e3cfb5d * Adjust code. 2020-08-28 08:54:36 +08:00
leiyong 4da6d4bfff * Adjust code. 2020-08-28 08:33:27 +08:00
Catouse 269b33eb13 * fix data error in cmmigantt block. 2020-08-27 15:31:32 +08:00
leiyong 3d44a40267 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 14:43:26 +08:00
leiyong 2d3947e441 * Fix bug. 2020-08-27 14:41:27 +08:00
z 505ed7c1bf Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-27 13:54:46 +08:00
z 4f47220347 * finish task #7698. 2020-08-27 13:54:23 +08:00
holan20180123 22f5c0b363 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 13:48:23 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b3e27f70b3 * Mv milestone to qc. 2020-08-27 11:17:22 +08:00
Yagami eb47645a67 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-27 10:14:12 +08:00
Yagami 84cdafa606 * Fix block weekly. 2020-08-27 10:13:31 +08:00
Catouse a5f004beab Merge branch '20.x'
# Conflicts:
#	module/program/view/create.html.php
2020-08-27 09:33:00 +08:00
Catouse 3712145ff9 * only show programs which status is doing in programteam block. 2020-08-27 09:02:38 +08:00
leiyong 9062b7e438 * Adjust issue module code. 2020-08-26 18:24:35 +08:00
Yagami 2d290973e9 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-26 16:11:48 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
leiyong 0ba1cf2d4c * Adjust code. 2020-08-26 14:49:50 +08:00
Catouse e0cd53d4cf * task #7660, improve UI for cmmigantt block. 2020-08-26 13:52:25 +08:00
Catouse 543e58ada0 * fix task not show in cmmigantt block sometimes. 2020-08-26 11:15:35 +08:00
hufangzhou fe6c181224 * Finish task#7652. 2020-08-26 10:42:31 +08:00
leiyong aa6f7b5d5f * Finish task#7654. 2020-08-26 10:11:20 +08:00
leiyong 22ab2f9599 * Adjust code. 2020-08-25 16:41:40 +08:00
z 1eb3af2a6d * fix error. 2020-08-25 16:40:31 +08:00
hufangzhou 943cb2a8fa * Add scrum overview block. 2020-08-25 16:37:52 +08:00
Catouse 79c2decff2 * task #7660, add UI for cmmigantt block. 2020-08-25 15:52:13 +08:00
holan20180123 02794ed5c4 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 15:12:28 +08:00
holan20180123 c2f4b9a9fb * Edit Programstatistic block. 2020-08-25 15:11:09 +08:00
Yagami e94501758c Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 15:00:16 +08:00
Yagami 4e0a3d0da5 * Fix block details. 2020-08-25 14:59:24 +08:00
leiyong cf5c7e507c * Finish task#7654. 2020-08-25 14:12:35 +08:00
holan20180123 ee92307425 * Fix bug Assigned to me block. 2020-08-25 14:06:08 +08:00
Yagami 5885a75c2e * Code for program mothod. 2020-08-25 13:15:56 +08:00
Yagami ad619c4909 * Code for story and requirement. 2020-08-25 11:09:42 +08:00
holan20180123 7f194f36ce Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-25 09:40:17 +08:00
holan20180123 6abb1f2aae * Add block for program statistic. 2020-08-25 09:37:08 +08:00
tianshujie98 485eb371fe Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x 2020-08-25 08:58:20 +08:00
tianshujie98 d62d93baa7 * Finish task #7628. 2020-08-25 08:57:39 +08:00
leiyong d7e9aa82f7 * Block add operation button. 2020-08-24 17:59:08 +08:00
Yagami 74d5aa7981 Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x 2020-08-24 15:34:55 +08:00