15521 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
wangyidong	e4ca8efe7b	* finish task #5827.	2019-06-21 16:12:00 +08:00
wangyidong	df0f71d7e8	Merge branch 'master' of github.com:easysoft/zentaopms	2019-06-21 08:22:44 +08:00
wangyidong	c14993f5bb	* finish task #5833.	2019-06-21 08:21:53 +08:00
Yagami	d75b6a435c	* Finish task #5819.	2019-06-20 16:19:56 +08:00
Catouse	4d646e12bd	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-20 16:12:51 +08:00
Catouse	6dfbe25641	* improve style of exported burn image.	2019-06-20 16:12:22 +08:00
wangyidong	327c4438d6	* finish task #5828.	2019-06-19 17:15:37 +08:00
wangyidong	e851644131	Merge branch 'master' of github.com:easysoft/zentaopms	2019-06-19 14:39:51 +08:00
wangyidong	008d376edc	* finish task #5832.	2019-06-19 14:39:19 +08:00
Yagami	0b09771eef	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-19 13:10:53 +08:00
Yagami	9072e52365	* Finish task #5808.	2019-06-19 13:10:28 +08:00
reneeteng	e0c5b25b7b	* Lang file update.	2019-06-19 11:16:24 +08:00
reneeteng	7c56ccda6c	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-19 11:14:46 +08:00
reneeteng	482e49c21a	* Lang file update.	2019-06-19 11:14:11 +08:00
reneeteng	14ce4572e5	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-19 11:05:48 +08:00
Yagami	771a81bc5e	* Fix menu.	2019-06-19 10:55:33 +08:00
Yagami	f0e6ad5643	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-18 18:00:34 +08:00
Yagami	5c83f0e085	* Add for trainpost.	2019-06-18 18:00:12 +08:00
wangyidong	2f8b47362d	* code for task #5831.	2019-06-18 16:10:28 +08:00
wangyidong	66861ccf0b	* finish task #5831.	2019-06-18 15:57:22 +08:00
wangyidong	b7749f73a9	* create diff lang.	2019-06-18 15:23:54 +08:00
wangyidong	2302643306	* ch	2019-06-18 15:23:14 +08:00
wangyidong	10ca8bf0e0	* finish task #5824.	2019-06-18 11:10:07 +08:00
wangyidong	f43dc5c082	* adjust for bug.	2019-06-17 09:46:27 +08:00
reneeteng	f813cda32e	* Lang file update.	2019-06-14 15:38:54 +08:00
wangyidong	811d68443c	* adjust for style.	2019-06-14 11:18:18 +08:00
wangyidong	dcac58b007	* revert dynamicAction lang.	2019-06-13 14:11:56 +08:00
wangyidong	a439ef9a26	Merge branch 'master' of github.com:easysoft/zentaopms	2019-06-12 13:15:09 +08:00
wangyidong	f937f4cb65	* adjust for page style.	2019-06-12 13:14:38 +08:00
reneeteng	22ab119017	* Lang file update.	2019-06-11 16:26:22 +08:00
reneeteng	f48d62a430	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-11 15:06:45 +08:00
reneeteng	2146affb82	* Lang file update.	2019-06-11 15:06:27 +08:00
wangyidong	fa412abc6a	* adjust for style.	2019-06-11 13:24:19 +08:00
wangyidong	0594c430ed	Merge branch 'master' of github.com:easysoft/zentaopms	2019-06-11 13:13:39 +08:00
reneeteng	80fe80c41c	* Change module lang file.	2019-06-11 13:09:45 +08:00
reneeteng	04c138ba06	* Lang file update.	2019-06-11 11:30:44 +08:00
reneeteng	e5e51fa82f	+ add en lang.	2019-06-11 11:29:50 +08:00
reneeteng	d4b7a9ac4c	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-11 11:16:22 +08:00
wangyidong	96d2cdca60	* adjust for style.	2019-06-11 10:04:25 +08:00
reneeteng	520d121bdf	* Lang file optimized.	2019-06-11 09:53:11 +08:00
wangyidong	3b54364860	* code for task #5673.	2019-06-11 08:20:49 +08:00
reneeteng	292e24acb1	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-10 17:35:07 +08:00
reneeteng	307a19cb0a	* Lang file update.	2019-06-10 17:34:41 +08:00
Catouse	b578ba3c53	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-10 16:17:31 +08:00
Catouse	1a93ba3bcb	* update zui js file.	2019-06-10 16:17:24 +08:00
reneeteng	31f6ccb02c	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-06-10 16:14:32 +08:00
reneeteng	ca5cf5f905	* Lang file update.	2019-06-10 16:14:13 +08:00
wangyidong	4ecd2b4373	* code for task #5717.	2019-06-10 13:21:26 +08:00
wangyidong	16d810d460	* code for task #5713.	2019-06-10 11:17:19 +08:00
wangyidong	293ef1bef7	* code for task #5706.	2019-06-10 11:14:24 +08:00