Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
20,105 Commits 2 Branches 292 Tags
7328fa8d30cdea618a5c77379c2fcf417873aff0
Commit Graph
20105 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
z 7328fa8d30 * adjust for merge. 2020-11-24 08:30:29 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
leiyong 6ce3a0345b The sum of the workload of the child phases cannot be greater than that of the parent phase. 2020-11-23 17:56:19 +08:00
tianshujie98 5d2c36b59a * Adjust code style. 2020-11-23 17:31:07 +08:00
tianshujie98 1b32a7385d * Finish task #8480. 2020-11-23 17:10:05 +08:00
qiyu-xie 021430208e * Finish task#8482. 2020-11-23 16:44:55 +08:00
hufangzhou 12d61dd780 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-23 16:23:50 +08:00
hufangzhou da1466c600 * Finish task#8444. 2020-11-23 16:23:44 +08:00
holan20180123 a6b21d74b7 * Finish task #3591. 2020-11-23 16:23:20 +08:00
holan20180123 eabbb2fd3f * Finish task #8449. 2020-11-23 16:13:49 +08:00
tianshujie98 6d5c727a66 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-23 15:48:47 +08:00
tianshujie98 8853626ead * Finish task #8456. 2020-11-23 15:47:58 +08:00
holan20180123 d2f0f46a07 * Finish task #8445. 2020-11-23 15:34:51 +08:00
leiyong 4051bc8353 * Adjust block module code. 2020-11-23 14:41:52 +08:00
leiyong 9dce9656fd * Adjust the language item of the my module. 2020-11-23 11:31:49 +08:00
leiyong b464df4608 * Add Comments. 2020-11-23 11:07:50 +08:00
leiyong 88440ff8cd * Show search box. 2020-11-23 09:03:37 +08:00
leiyong de0a5ba04a * Adjust PRJManageProducts method. zentaopms_13.0.alpha2_20201123 zentaopms_20.0.alpha2_20201123 2020-11-22 22:27:16 +08:00
leiyong e70ad43a6d * Modify getPGMProduct to getPGMProductPairs.: 2020-11-22 21:55:52 +08:00
qiyu-xie 0dac0319f8 * Modify the method of get project in the report. 2020-11-20 17:21:55 +08:00
Yagami 6481a780c3 * Fix doc error. 2020-11-20 15:39:21 +08:00
leiyong 83f28e4aa3 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-20 15:29:35 +08:00
leiyong ea0cff9182 * Modify upgrade model.php logic. 2020-11-20 15:29:11 +08:00
Yagami 310bf2b2c3 * Rename my project and program. 2020-11-20 14:53:33 +08:00
leiyong 4f4f6cbf9d * Adjust upgrade module. 2020-11-20 14:38:28 +08:00
leiyong 9073099a7e * Modify executionPairs to executionIdList. 2020-11-20 14:36:10 +08:00
leiyong 622a4ef4f4 Conflict resolution. 2020-11-20 14:29:07 +08:00
z 351b562cf5 * fix bug #3695. 2020-11-20 14:21:30 +08:00
hufangzhou 421bd118b1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-20 13:39:38 +08:00
hufangzhou 199646c315 * Fix a bug. 2020-11-20 13:39:20 +08:00
Yagami 90df7cd4dc * Merge code. 2020-11-20 13:09:47 +08:00
z 3e902392ac * search with account. 2020-11-20 13:09:02 +08:00
holan20180123 f90a9dbe3d * Variable renaming 'project' to 'execution'. 2020-11-20 11:23:46 +08:00
tianshujie98 fdaa19f307 * Add project link product tips. 2020-11-20 11:16:47 +08:00
holan20180123 221a3ee96d * Method Renaming 'Project' to 'Execution'. 2020-11-20 10:59:49 +08:00
tianshujie98 17653d5053 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-20 10:09:22 +08:00
tianshujie98 541e72b2bd * Modify variable name. 2020-11-20 10:08:48 +08:00
hufangzhou 45043bd0e3 * Fix a bug. 2020-11-20 10:02:07 +08:00
leiyong 3834ae66ad * Modify programID to projectID. 2020-11-20 09:59:57 +08:00
hufangzhou 8d3ce4acdd Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-20 09:07:21 +08:00
hufangzhou f49e756aca * Fix a bug. 2020-11-20 09:07:01 +08:00
tianshujie98 c9a91a432a * Change method name. 2020-11-20 08:29:35 +08:00
qiyu-xie 31032dfb66 * Fix bug. zentaopms_12.5.stable_20201120 2020-11-20 08:27:36 +08:00
holan20180123 5960e24556 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-20 08:22:16 +08:00
holan20180123 b31a5534ad Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-20 08:21:07 +08:00
tianshujie98 1bf0499e9b Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-20 08:20:37 +08:00
holan20180123 6b0c12918d * Repair code. 2020-11-20 08:20:29 +08:00
tianshujie98 1fbe0e13a2 * Fix bug. 2020-11-20 08:20:20 +08:00
qiyu-xie eb3d6f7161 * Finish task#8375. 2020-11-20 08:15:56 +08:00
qiyu-xie 09e7734adf * Finish task#8375. 2020-11-20 08:15:56 +08:00