 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
|
05a4a31426
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-31 13:05:49 +08:00 |
|
|
Yagami
|
bc69f6fb81
|
* Finish task #7772.
|
2020-08-31 13:05:24 +08:00 |
|
|
leiyong
|
e2adfa9152
|
* Finish task#7718.
|
2020-08-31 11:30:05 +08:00 |
|
|
holan20180123
|
3180528d91
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-31 09:07:59 +08:00 |
|
|
holan20180123
|
a72a033748
|
* Finish task #7717.
|
2020-08-31 09:07:19 +08:00 |
|
|
Yagami
|
c9aa3463d4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-31 09:05:55 +08:00 |
|
|
leiyong
|
6b2147dbba
|
* Operation record of repairing problems.
|
2020-08-31 08:34:32 +08:00 |
|
|
Yagami
|
49316f308b
|
* Rename program method name.
|
2020-08-29 13:20:27 +08:00 |
|
|
Yagami
|
fe63c96aee
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2020-08-28 11:38:51 +08:00 |
|
|
Yagami
|
283acfe49f
|
* Fix code style.
|
2020-08-28 11:37:40 +08:00 |
|
|
leiyong
|
23a7880bad
|
* Adjust code.
|
2020-08-28 09:09:22 +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
|
8197765c51
|
* Add cron sql.
|
2020-08-27 13:21:50 +08:00 |
|
|
leiyong
|
f0276c001b
|
* Finish task#7705.
|
2020-08-27 11:18:30 +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 |
|
|
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 |
|