 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 |
|
|
Catouse
|
6040241c94
|
* hide products select control on count less than 2.
|
2020-08-27 09:02:38 +08:00 |
|
|
hufangzhou
|
426ff66d8f
|
Fix a bug
|
2020-08-27 08:52:21 +08:00 |
|
|
hufangzhou
|
7f89f3426e
|
Finish task#7704. task#7696.
|
2020-08-27 08:32:33 +08:00 |
|
|
leiyong
|
9062b7e438
|
* Adjust issue module code.
|
2020-08-26 18:24:35 +08:00 |
|
|
leiyong
|
56dd7eca83
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-08-26 16:58:44 +08:00 |
|
|
leiyong
|
744dc06baa
|
* Add scrum roadmap block.
|
2020-08-26 16:56:53 +08:00 |
|
|
holan20180123
|
4a3e5fcaf1
|
* Finish Task #7694.
|
2020-08-26 16:49:30 +08:00 |
|
|
Yagami
|
b909b26194
|
* Fix details.
|
2020-08-26 16:19:28 +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 |
|
|
Yagami
|
0f7a173c85
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 14:48:13 +08:00 |
|
|
Catouse
|
e0cd53d4cf
|
* task #7660, improve UI for cmmigantt block.
|
2020-08-26 13:52:25 +08:00 |
|
|
Catouse
|
6f4f9a061e
|
* task #7660, improve UI for cmmigantt block.
|
2020-08-26 13:52:25 +08:00 |
|
|
Catouse
|
bd49215be5
|
* format code.
|
2020-08-26 13:52:25 +08:00 |
|
|
Yagami
|
a5e8c67ca7
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 13:10:11 +08:00 |
|
|
leiyong
|
17744cc4b5
|
* Merger code.
|
2020-08-26 13:09:51 +08:00 |
|
|
Yagami
|
8e4e53adfc
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-26 13:07:41 +08:00 |
|
|
Yagami
|
d6cb4f1d75
|
* Fix menu order.
|
2020-08-26 11:30:06 +08:00 |
|
|
Catouse
|
543e58ada0
|
* fix task not show in cmmigantt block sometimes.
|
2020-08-26 11:15:35 +08:00 |
|
|
tianshujie98
|
18153da73f
|
Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x
|
2020-08-26 10:55:15 +08:00 |
|
|
tianshujie98
|
aedaea4336
|
* Add English file content.
|
2020-08-26 10:52:51 +08:00 |
|
|
hufangzhou
|
fe6c181224
|
* Finish task#7652.
|
2020-08-26 10:42:31 +08:00 |
|
|
z
|
35304da79a
|
Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x
|
2020-08-26 10:11:44 +08:00 |
|
|
z
|
b55ef50a46
|
Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x
|
2020-08-26 10:11:25 +08:00 |
|
|
leiyong
|
aa6f7b5d5f
|
* Finish task#7654.
|
2020-08-26 10:11:20 +08:00 |
|
|
z
|
8eb7358131
|
* adjust for check begin and end.
|
2020-08-26 10:10:01 +08:00 |
|
|
Catouse
|
2942519ed8
|
* improve UI of recentprogram block.
|
2020-08-26 09:56:55 +08:00 |
|
|
leiyong
|
7853944cea
|
* Add scrum overview block.
|
2020-08-25 18:51:53 +08:00 |
|
|
tianshujie98
|
784a002bc0
|
* Fix bug.
|
2020-08-25 17:38:19 +08:00 |
|
|
Catouse
|
267ac8f0b7
|
* task #7651, improve UI of programteam block.
|
2020-08-25 16:54:58 +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
|
648934425c
|
* task #7660, fix progress error in cmmigantt block.
|
2020-08-25 16:02:14 +08:00 |
|
|
Catouse
|
79c2decff2
|
* task #7660, add UI for cmmigantt block.
|
2020-08-25 15:52:13 +08:00 |
|
|
holan20180123
|
b837b742ab
|
* Edit program statistic block.
|
2020-08-25 15:43:21 +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 |
|
|
holan20180123
|
cdcb944cbb
|
Merge branch '20.x' of https://github.com/easysoft/zentaopms into 20.x
|
2020-08-25 14:14:04 +08:00 |
|
|
holan20180123
|
8a403a5f3b
|
* Add field in Assigned to me block.
|
2020-08-25 14:13:29 +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 |
|