15735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Catouse	7bcbb43707	* update zui.	2019-07-12 09:39:08 +08:00
jinianlan	29fe42ca80	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-12 09:20:49 +08:00
jinianlan	1c5352888f	* finish task #5934	2019-07-12 09:19:01 +08:00
wangyidong	959d82222f	* finish task #5992.	2019-07-12 09:03:00 +08:00
wangyidong	5bf20a96ff	* finish task #5993.	2019-07-12 08:59:45 +08:00
wangyidong	8c8bd5acee	* finish task #5994.	2019-07-12 08:54:10 +08:00
wangyidong	f577da645d	* finish task #6053.	2019-07-12 08:23:27 +08:00
wangyidong	7234603458	* finish task #5569.	2019-07-11 17:14:19 +08:00
wangyidong	3a2c9e1e1b	* finish task #5710.	2019-07-11 16:43:59 +08:00
wangyidong	6d434b7ed5	* finish task #5717.	2019-07-11 16:26:40 +08:00
wangyidong	142d505325	* finish task #5960.	2019-07-11 16:03:49 +08:00
wangyidong	24bfb20185	* finish task #5978.	2019-07-11 16:00:05 +08:00
wangyidong	004b69fa4e	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 15:58:12 +08:00
wangyidong	6b58d9a1cf	* finish task #5982.	2019-07-11 15:57:45 +08:00
jinianlan	b19d42966c	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 15:54:09 +08:00
jinianlan	8678256c4c	* finish task #6020	2019-07-11 15:52:20 +08:00
wangyidong	d1846f9a53	* finish task #5991.	2019-07-11 15:37:46 +08:00
wangyidong	f578ad80e7	* finish task #5992.	2019-07-11 15:07:14 +08:00
wangyidong	f01121bb7c	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 14:35:45 +08:00
wangyidong	bfb979c4fe	* finish task #5993.	2019-07-11 14:35:15 +08:00
Catouse	26643f3b79	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-07-11 14:29:40 +08:00
Catouse	22de5cc42c	* fix orders incorrect.	2019-07-11 14:29:33 +08:00
wangyidong	92a3d4519c	* finish task #5997.	2019-07-11 13:49:24 +08:00
wangyidong	d8076812d1	* finish task #6016.	2019-07-11 13:46:43 +08:00
wangyidong	f47be36c0c	* finish task #6017.	2019-07-11 13:41:06 +08:00
wangyidong	ecaf5cd872	* finish task #6046.	2019-07-11 11:44:33 +08:00
wangyidong	6baea29991	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 10:38:03 +08:00
wangyidong	5672a29d64	* finish task #5928, #5911.	2019-07-11 10:36:00 +08:00
jinianlan	3a52611b0d	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 09:50:25 +08:00
jinianlan	ebbd1bcb94	* finish task #5933	2019-07-11 09:49:10 +08:00
wangyidong	0682f928ac	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 09:45:47 +08:00
wangyidong	d55f0d9407	* finish task #5932.	2019-07-11 09:45:20 +08:00
jinianlan	5315f8e3e5	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-11 09:31:21 +08:00
jinianlan	580a926e73	* finish task #5933	2019-07-11 09:27:47 +08:00
wangyidong	bf9f78d040	* finish task #5940.	2019-07-11 09:10:31 +08:00
wangyidong	bf47c90326	* finish task #5935.	2019-07-10 17:39:31 +08:00
wangyidong	07f976db1a	* finish task #5939.	2019-07-10 17:28:58 +08:00
wangyidong	55875dec1c	* finish task #5942.	2019-07-10 17:23:11 +08:00
wangyidong	ec9aaab1e2	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-10 17:16:11 +08:00
wangyidong	4453ebcac0	* finish task #5943.	2019-07-10 17:15:43 +08:00
jinianlan	093e3de746	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-10 16:31:53 +08:00
jinianlan	673656fe47	* finish task #5953	2019-07-10 16:19:09 +08:00
wangyidong	549828eaca	* finish task #5950.	2019-07-10 16:09:11 +08:00
wangyidong	be2b3b1dd3	* finish task #5951.	2019-07-10 16:03:16 +08:00
wangyidong	836c00918b	* finish task #5956.	2019-07-10 15:56:35 +08:00
wangyidong	eee86c0de3	* adjust for zh-cn by en.	2019-07-10 15:37:18 +08:00
wangyidong	47e23892c0	* finish task #5957.	2019-07-10 14:42:54 +08:00
wangyidong	4e85182b8f	* finish task #5959.	2019-07-10 14:38:38 +08:00
wangyidong	514e0a679e	* finish task #5960.	2019-07-10 14:20:58 +08:00
wangyidong	cc28630782	* finish task #5961.	2019-07-10 14:19:07 +08:00