Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
20,146 Commits 2 Branches 292 Tags
0d07b3abaed3d64d7583cbac87b67c049fe3bd11
Commit Graph
16822 Commits
Author SHA1 Message Date
holan20180123 0d07b3abae * Finish task #8498. 2020-11-25 14:21:08 +08:00
z bef3194549 * code for task #8496. 2020-11-24 15:38:21 +08:00
z 3c7da6dc60 * code for task #8496. 2020-11-24 15:38:21 +08:00
z 7f0e4e13f8 * adjust for upgrade. 2020-11-24 15:38:21 +08:00
Yagami 97ac6f0b9c * Merge code. 2020-11-24 14:46:19 +08:00
Yagami 9c59c495ee * Finish task #8525. 2020-11-24 14:46:19 +08:00
qiyu-xie e7856c6d32 * Finish task#8493. 2020-11-24 14:33:23 +08:00
holan20180123 e9fcbe9c21 * Finish task #8507. 2020-11-24 14:11:09 +08:00
tianshujie98 760733d902 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 13:56:44 +08:00
tianshujie98 8ad7105f01 * Adjust the order. 2020-11-24 13:51:42 +08:00
holan20180123 2be6076089 * Finish task 8490. 2020-11-24 13:45:40 +08:00
leiyong 8f11da1edd * Finish task#8461. 2020-11-24 13:15:27 +08:00
leiyong 54ffdaea7a * Fix edit stage error. 2020-11-24 13:05:36 +08:00
qiyu-xie 48c8c8b9a8 * Fix task#8483.#8484.#8485.#8486.#8487. 2020-11-24 13:00:36 +08:00
tianshujie98 2160ae0958 * Adjust code style. 2020-11-24 12:29:02 +08:00
tianshujie98 0697a67f16 * Merge. 2020-11-24 12:18:49 +08:00
tianshujie98 2d4fd00f8d Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 12:14:13 +08:00
tianshujie98 73d99650ab * Finish task #8492. 2020-11-24 11:40:47 +08:00
qiyu-xie 5288b68681 * Fix task#8465. 2020-11-24 11:16:58 +08:00
qiyu-xie 7995d3486e * Finish task#8483.#8484.#8485.#8486.#8487. 2020-11-24 11:10:27 +08:00
leiyong 586bdc38c6 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 10:55:46 +08:00
leiyong 94586714e6 * Finish task#8509. 2020-11-24 10:54:37 +08:00
leiyong 371543edcd * Add query condition. 2020-11-24 10:44:23 +08:00
holan20180123 9a552de3f2 * Finish task #8452. 2020-11-24 10:44:08 +08:00
leiyong 8cead79b18 * Adjust getProjectPairs to getExecutionPairsByProduct. 2020-11-24 10:40:18 +08:00
z 3ec0aacb61 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 09:49:21 +08:00
leiyong e9677d8db4 * The programplan module add language item. 2020-11-24 09:21:06 +08:00
leiyong 09c4d92750 * Fix bug. 2020-11-24 09:14:49 +08:00
hufangzhou ef684a132a Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-11-24 09:08:26 +08:00
hufangzhou 6d25f07fa8 * Finish task#8467. 2020-11-24 09:08:13 +08:00
holan20180123 40630c75a8 * Finish task #8451. 2020-11-24 09:05:28 +08:00
holan20180123 41b1d9931a * Finish task #8450. 2020-11-24 08:56:14 +08:00
z 1d26396b9d * adjust for merge. 2020-11-24 08:49:08 +08:00
z 6b6f4d95f4 Merge branch 'master' of github.com:easysoft/zentaopms 2020-11-24 08:42:31 +08:00
z 7328fa8d30 * adjust for merge. 2020-11-24 08:30:29 +08:00
leiyong 6f8d41b767 * Adjust install. 2020-11-24 00:17:32 +08:00
qiyu-xie fa4bb5a280 * Conflict resolution. 2020-11-23 21:04:41 +08:00
qiyu-xie c658c271f4 * Finish task#8465. 2020-11-23 20:56:34 +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