Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,948 Commits 2 Branches 292 Tags
fd30e0a0062bb94de6cf1dba4af552da316bbc71
Commit Graph
441 Commits
Author SHA1 Message Date
Yagami 55b0a94586 * Fix code error. 2020-09-21 16:04:00 +08:00
Yagami 99fe956e4b * Merge code. 2020-09-18 16:48:19 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
leiyong 03d1e43dac * Fix add block type selection. 2020-09-14 15:22:46 +08:00
Yagami 36d7cb1c9d * Fix progress report style. 2020-09-07 15:00:57 +08:00
holan20180123 497ae934a8 * Finish task #7817. 2020-09-07 11:30:15 +08:00
leiyong 0eb5658bb7 * Finish task#7815. 2020-09-07 10:57:45 +08:00
hufangzhou 97dc590a1b * Finish task#7818. 2020-09-07 09:22:32 +08:00
Yagami 9abef9b3c7 * Adjust var name. 2020-09-04 09:48:58 +08:00
hufangzhou 0a46aa5512 * Fix problems found in code review. 2020-09-03 15:54:12 +08:00
Yagami 8041e2dc32 * Fix edit a block error. 2020-09-03 10:48:04 +08:00
leiyong d2d82ad067 * Fix add block error. 2020-09-03 09:46:30 +08:00
leiyong 47642ededd * Adjust URAndSR Judgment condition. 2020-09-02 23:26:46 +08:00
tianshujie98 f21aee1662 * Repair project manpower input block. 2020-09-02 15:18:32 +08:00
hufangzhou f88cccac65 * Adjust block code. 2020-09-01 18:37:45 +08:00
holan20180123 9406ae4b07 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-09-01 15:47:51 +08:00
holan20180123 20a09be88e * Finish task #7734. 2020-09-01 15:47:03 +08:00
z defb5f4f1a Merge branch 'master' of github.com:easysoft/zentaopms 2020-09-01 14:45:16 +08:00
z 0a6056ceac * finish task #7761,7766. 2020-09-01 14:44:09 +08:00
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