14545 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yagami	57f0779ec8	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-28 09:37:58 +08:00
Yagami	23bb5d7f54	* Finish task #5234.	2019-01-28 09:37:09 +08:00
chenfeiCF	1b83338698	* Finish task #5253.	2019-01-25 18:58:56 +08:00
Catouse	8e27c95499	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-25 17:00:07 +08:00
Catouse	c995214ff6	* fix bug #2379 and finish task #5247.	2019-01-25 16:59:57 +08:00
wangyidong	8f1c20d5ed	Merge branch 'master' of github.com:easysoft/zentaopms	2019-01-25 16:15:27 +08:00
wangyidong	dda3b52de0	* finish task #5221.	2019-01-25 16:13:58 +08:00
Catouse	9f557ce8dd	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-25 16:01:49 +08:00
Catouse	c2bd7de9b9	* finish task #5254 and fix bug #2371.	2019-01-25 16:01:30 +08:00
Yagami	ab9f7bf52d	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-25 15:16:55 +08:00
Yagami	c5bf9cf987	* Finish task #5235.	2019-01-25 15:02:34 +08:00
wangyidong	0afdc5d71d	Merge branch 'master' of github.com:easysoft/zentaopms	2019-01-25 14:14:46 +08:00
wangyidong	19629d507c	* change for task #5228.	2019-01-25 14:08:55 +08:00
wangyidong	3e0c68db85	* finish task #5222.	2019-01-25 13:27:15 +08:00
chenfeiCF	d1ace922a5	* Finish task #5261, #5262, #5265.	2019-01-25 13:17:29 +08:00
Yagami	9a19b8a177	* Fix bug getproducts.	2019-01-25 11:06:46 +08:00
Yagami	c13ea66635	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-25 10:50:40 +08:00
Yagami	0484785235	* Fix user loadlang.	2019-01-25 10:42:55 +08:00
chenfeiCF	66ce378726	* Fix bug #5248, #5260, #5263, #5266.	2019-01-25 10:36:56 +08:00
wangyidong	4842c965bc	Merge branch 'master' of github.com:easysoft/zentaopms	2019-01-25 10:05:43 +08:00
wangyidong	e4fd49e0f6	Merge branch 'master' of github.com:easysoft/zentaopms	2019-01-25 10:04:23 +08:00
wangyidong	03d3c82301	* finish task #5236.	2019-01-25 10:03:51 +08:00
Yagami	f3f9b64932	* Finish task #5250.	2019-01-25 10:03:39 +08:00
Yagami	a19de16123	* Finish task #5246.	2019-01-25 09:56:48 +08:00
wangyidong	69413ff785	Merge branch 'master' of github.com:easysoft/zentaopms	2019-01-25 09:21:06 +08:00
wangyidong	93701f583a	* finish task #5252.	2019-01-25 09:18:48 +08:00
Yagami	d81a106fad	* Fix makefile.	2019-01-25 09:07:13 +08:00
Yagami	faaf0dd1cb	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-25 09:00:11 +08:00
Yagami	9922370141	* Finish task #5249.	2019-01-25 08:59:13 +08:00
wangyidong	857871042a	* finish task #5238.	2019-01-24 17:30:55 +08:00
wangyidong	421a130e63	* finish task #5233.	2019-01-24 16:46:18 +08:00
Yagami	de0e1186ca	* Finish task #5255.	2019-01-24 16:17:18 +08:00
Yagami	e9d8249ac8	* Finish task #5259.	2019-01-24 14:24:03 +08:00
Yagami	289160ca45	* Finish task #5229.	2019-01-24 09:26:42 +08:00
Yagami	976bc31271	* Finish task #5229.	2019-01-24 09:24:17 +08:00
Yagami	fad09a3916	* Finish task #5225.	2019-01-24 09:08:34 +08:00
Yagami	b85628a43a	* Fix makefile.	2019-01-23 16:16:27 +08:00
Yagami	2678ec3433	* Fix xuanxuan https options.	2019-01-23 16:06:18 +08:00
Yagami	9fef22ee4c	* Fix makefile.	2019-01-23 15:56:03 +08:00
Yagami	2ced50d58a	* Move xuanxuan method.	2019-01-23 15:37:22 +08:00
Yagami	9d464ca6d5	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-23 15:28:01 +08:00
Yagami	353fa681cd	* Finish task #5213.	2019-01-23 15:27:37 +08:00
wangyidong	2f5909ee29	Merge branch 'master' of github.com:easysoft/zentaopms	2019-01-23 15:22:21 +08:00
wangyidong	a97b9deca2	* finish task #5219.	2019-01-23 15:21:49 +08:00
Yagami	068773ddf4	* Fix release marker bug.	2019-01-23 14:58:53 +08:00
Yagami	eff13683fb	* Finish task #5223.	2019-01-23 13:44:49 +08:00
Yagami	dfb6a386dd	* Finish task #5208.	2019-01-23 13:07:37 +08:00
Yagami	8e566448b1	* Finish task #5205.	2019-01-23 10:43:46 +08:00
Yagami	6c8a9a1d00	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-01-23 09:56:04 +08:00
Yagami	42e8537e0f	* Finish task #5206.	2019-01-23 09:55:41 +08:00