15227 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yagami	e29b7d93d2	* Finish task #5547.	2019-05-29 09:01:02 +08:00
wangyidong	2ba14afdda	* finish task #5616.	2019-05-28 17:10:43 +08:00
wangyidong	3ee2c4048d	Merge branch 'master' of github.com:easysoft/zentaopms	2019-05-28 16:41:06 +08:00
wangyidong	f0800c27a7	* finish task #5570,5571.	2019-05-28 16:40:44 +08:00
wangyidong	13e6d03e1e	* add for fix featureBar.	2019-05-28 16:40:12 +08:00
Yagami	02290075dd	* Finish task #5479.	2019-05-28 16:33:59 +08:00
Yagami	1f9ed3ae90	* Finish task #5476.	2019-05-28 16:25:08 +08:00
Yagami	b6f4b1b02f	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-28 16:22:10 +08:00
Yagami	cdaec1a613	* Finish task #5475.	2019-05-28 16:21:50 +08:00
wangyidong	d0da535125	Merge branch 'master' of github.com:easysoft/zentaopms	2019-05-28 16:00:28 +08:00
wangyidong	38033b3f54	* finish task #5445.	2019-05-28 15:59:58 +08:00
Yagami	9a8396b94f	* Finish task #5470.	2019-05-28 15:56:25 +08:00
Yagami	289eae8521	* Finish task #5460.	2019-05-28 15:40:33 +08:00
wangyidong	1986ce272e	* finish task #5579.	2019-05-28 14:21:01 +08:00
wangyidong	8f069e202a	* finish task #5580.	2019-05-28 14:16:27 +08:00
wangyidong	4ba742dd95	* finish task #5581.	2019-05-28 14:00:19 +08:00
wangyidong	4d4093e703	* finish task #5583.	2019-05-28 13:44:32 +08:00
wangyidong	539f5077eb	* finish task #5611.	2019-05-28 13:41:20 +08:00
wangyidong	d4a669511b	Merge branch 'master' of github.com:easysoft/zentaopms	2019-05-28 11:33:47 +08:00
wangyidong	8265162711	* finish task #5618.	2019-05-28 11:32:35 +08:00
wangyidong	9e281a9b15	* finish task #5587.	2019-05-28 11:20:57 +08:00
wangyidong	c83902cb92	* finish task #5585.	2019-05-28 11:20:30 +08:00
Yagami	fe37489ac7	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-28 11:08:47 +08:00
Yagami	97b3cc8c6f	* Finish task #5548.	2019-05-28 11:08:33 +08:00
reneeteng	9a29937259	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-28 10:45:43 +08:00
reneeteng	16931f4048	* Lang file update.	2019-05-28 10:45:12 +08:00
Yagami	1c0dcf4cfa	* Finish task #5549.	2019-05-28 10:21:32 +08:00
Yagami	0b9cbd75bf	* Finish task #5554.	2019-05-28 10:18:46 +08:00
Yagami	b8a0e7494f	* Finish task #5557.	2019-05-28 10:03:39 +08:00
Yagami	94a17592c8	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-28 10:00:18 +08:00
Yagami	96bda94f57	* Finish task #5557.	2019-05-28 09:59:47 +08:00
wangyidong	5aa8b55e66	Merge branch 'master' of github.com:easysoft/zentaopms	2019-05-28 09:52:40 +08:00
wangyidong	672a73dfad	* finish task #5611.	2019-05-28 09:52:24 +08:00
Yagami	f0f52d3bc6	* Finish task #5558.	2019-05-28 09:21:23 +08:00
Yagami	e8a1ee93f3	* Finish task #5560.	2019-05-28 09:08:28 +08:00
Yagami	09245b6f2f	* Fix productstatisticblock width.	2019-05-28 08:59:09 +08:00
reneeteng	95222fa49b	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-27 17:02:52 +08:00
reneeteng	f5f8e0df06	* Lang file update.	2019-05-27 17:01:57 +08:00
Yagami	ad457bdb2b	* Fix detail.	2019-05-27 16:47:30 +08:00
Yagami	1607193c43	* Code for dayup.	2019-05-27 16:42:44 +08:00
Yagami	57591a17ed	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-27 15:17:16 +08:00
Yagami	723394fd3b	* Finish task #5458.	2019-05-27 15:17:03 +08:00
wangyidong	6872573a7e	* finish task #5588.	2019-05-27 14:57:54 +08:00
wangyidong	2538f2d786	* finish task #5593.	2019-05-27 14:47:01 +08:00
wangyidong	ba70ee73f7	Merge branch 'master' of github.com:easysoft/zentaopms	2019-05-27 14:45:40 +08:00
wangyidong	14b41f4373	* finish task #5594.	2019-05-27 14:45:20 +08:00
Yagami	111d8d9afc	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-05-27 14:35:46 +08:00
Yagami	05289b06c9	* Finish task #5454.	2019-05-27 14:35:31 +08:00
wangyidong	663c975538	* finish task #5603.	2019-05-27 14:17:36 +08:00
wangyidong	7679a9d7f3	* finish task #5604.	2019-05-27 14:14:17 +08:00