16803 Commits

Include renames

Author	SHA1	Message	Date
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
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.	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
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