12937 Commits

Include renames

Author	SHA1	Message	Date
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
wangyidong	833e8b75ae	* finish task #5962.	2019-07-10 14:01:52 +08:00
wangyidong	2277a17ee6	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-10 13:51:59 +08:00
wangyidong	81b6a7036f	* finish task #5965.	2019-07-10 13:51:27 +08:00
jinianlan	60e7014ef7	* finish task #6020,#6009,#6007,#5949	2019-07-10 13:41:13 +08:00
wangyidong	e5bdaba463	* finish task #5967.	2019-07-10 13:27:10 +08:00
wangyidong	eb5e30e2fa	* finish task #5968.	2019-07-10 13:14:31 +08:00
wangyidong	014c61e4e6	* finish task #5969.	2019-07-10 13:04:12 +08:00
wangyidong	f4153b7623	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-10 12:15:52 +08:00
wangyidong	23922ac917	* finish task #5993.	2019-07-10 12:15:19 +08:00
reneeteng	4fc6ae4314	* Lang file update.	2019-07-09 16:45:18 +08:00
reneeteng	c1fd84b6f8	* Drag lang file update.	2019-07-09 16:25:10 +08:00
reneeteng	d082ebafad	* Remove space in lang file.	2019-07-09 16:12:03 +08:00
reneeteng	29b399cbeb	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-07-09 16:05:13 +08:00
reneeteng	a0a9d0fb39	* Lang file update.	2019-07-09 16:03:50 +08:00
wangyidong	0655c5f22d	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-09 11:09:26 +08:00
wangyidong	b884536307	* finish task #5990.	2019-07-09 11:08:21 +08:00
reneeteng	61beb0fa31	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-07-09 09:43:38 +08:00
reneeteng	7efd22a0ab	* Lang file update.	2019-07-09 09:42:01 +08:00
wangyidong	a600039a67	Merge branch 'master' of github.com:easysoft/zentaopms	2019-07-08 17:16:53 +08:00
wangyidong	ef17ab7f01	* finish task #5992.	2019-07-08 17:16:20 +08:00
jinianlan	13ae00955c	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-07-08 16:33:31 +08:00
wangyidong	6e1774bdc2	* finish task #5996.	2019-07-08 16:22:56 +08:00
wangyidong	4aad227e76	* finish task #5997.	2019-07-08 16:20:03 +08:00
wangyidong	8f7a54de05	* finish task #5999.	2019-07-08 15:44:40 +08:00