Commit Graph
19855 Commits
Author SHA1 Message Date
leiyong ea0cff9182 * Modify upgrade model.php logic. 2020-11-20 15:29:11 +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
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
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
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
leiyong 22a0fb1922 * Adjust the upgrade module mergeprogram.js file. 2020-11-19 17:50:18 +08:00
leiyong 55976aeb26 * Query the program and project logic when upgrading. 2020-11-19 17:32:08 +08:00
Yagami ec2c0c7a26 * Adjust code. 2020-11-19 17:29:06 +08:00
Yagami 9b5c484cf9 * Add no product logic. 2020-11-19 17:29:06 +08:00
Yagami 877bab9140 * Fix program acl. 2020-11-19 17:29:06 +08:00
holan20180123 4d842f4ec7 * Init products. 2020-11-19 17:19:55 +08:00
holan20180123 b9d0d22ada Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-19 16:46:44 +08:00
holan20180123 ec3a2ff4ff * Init products. 2020-11-19 16:44:58 +08:00
tianshujie98 121effd4f9 * Fix bug. 2020-11-19 16:37:54 +08:00
leiyong c2d2f13354 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-19 16:20:57 +08:00
leiyong 3617c47256 * Show the source of the projects being copied. 2020-11-19 16:20:32 +08:00
holan20180123 3f752243f6 * Method renaming 'getPairs' to 'getExecutionPairs'. 2020-11-19 16:14:04 +08:00
holan20180123 c5f8e7b2e4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-19 15:56:58 +08:00
holan20180123 77af51dacd * Method renaming 'getParis' to 'getExecutionPairs'. 2020-11-19 15:53:33 +08:00
leiyong def7c10ea5 * Modify replicable projects. 2020-11-19 15:48:32 +08:00
holan20180123 7c8ec20264 * Rename project to execution. 2020-11-19 15:22:58 +08:00
holan20180123 2912170c06 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-19 15:15:39 +08:00
leiyong d2d690fd12 * Adjust the block module language file. 2020-11-19 15:15:22 +08:00
leiyong a615e511f5 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-19 15:12:55 +08:00
holan20180123 b48d870e13 * Modify method 'getPairs' to 'getExecutionPairs'. 2020-11-19 15:07:44 +08:00
holan20180123 0dad2445f1 * Rename project to execution. 2020-11-19 15:03:50 +08:00
leiyong 54853f38fe * Create waterfall projects with multi-product single product removal. 2020-11-19 14:59:51 +08:00
Yagami bbe210c2a0 * Fix create story bug. 2020-11-19 14:52:32 +08:00
Yagami dcf420bd9c * Adjust code. 2020-11-19 14:52:32 +08:00
holan20180123 d071fcae02 * Rename project to execution. 2020-11-19 14:27:29 +08:00
leiyong 72a2b18c20 * Adjust the block module language file and model.php Logic. 2020-11-19 14:07:58 +08:00
Yagami f2c6dba226 * Rename project function name. 2020-11-19 14:02:50 +08:00
tianshujie98 9b176b2e0e * Finish task #8413. 2020-11-19 13:35:05 +08:00