Commit Graph
15062 Commits
Author SHA1 Message Date
wangyidong f08d1deb40 * finish task #5441. 2019-04-29 15:44:17 +08:00
wangyidong 5c90c57f46 * adjust code. 2019-04-29 15:36:17 +08:00
wangyidong 060559f1ae * finish task #5439. 2019-04-29 15:35:04 +08:00
wangyidong 0bedfad8a5 * fix for en lang. 2019-04-29 12:03:17 +08:00
wangyidong 1d1f43d2cd * change for task #5384. 2019-04-29 09:03:04 +08:00
wangyidong 77346a6d66 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-29 08:57:30 +08:00
wangyidong 726a412270 * code for task #5384. 2019-04-29 08:57:00 +08:00
wangyidong 8c78ea1612 * adjust for task #5387. 2019-04-29 08:52:08 +08:00
yfl b61f20d071 * Modify batchCreate task link 2019-04-29 08:43:54 +08:00
yfl 052ef61fe6 * Fix task #5380 2019-04-29 08:39:53 +08:00
yfl 526e5298b4 * Finish task #5380 2019-04-28 17:44:49 +08:00
wangyidong 3da462675a Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-28 17:16:06 +08:00
wangyidong a7e7e81b32 * adjust for merge xuanxuan. 2019-04-28 09:47:05 +08:00
yfl 6afe04a2b2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-28 08:47:36 +08:00
wangyidong 240c241282 * move sendDownHeader method to model. 2019-04-26 17:58:15 +08:00
wangyidong 9bc0c3d7f2 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-26 17:54:19 +08:00
wangyidong ab3da55671 * fix bug. 2019-04-26 17:43:55 +08:00
yfl 602a7af067 * Finish task #5399 2019-04-26 15:52:03 +08:00
yfl 43ffe4b49f * Finish task #5401 2019-04-26 15:25:22 +08:00
yfl 92fecca3c6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-26 15:08:00 +08:00
yfl b47d53fee6 * Finish Task #5379,#5398 2019-04-26 15:00:16 +08:00
wangyidong bd90f185d8 * fix bug for doc crumb title. 2019-04-26 14:59:07 +08:00
wangyidong c5920e112a * finish task #5404. 2019-04-26 14:58:30 +08:00
wangyidong dff082a3e7 * code for task #5392. 2019-04-26 14:17:48 +08:00
wangyidong e825abcc97 * finish task #5410. 2019-04-26 13:59:45 +08:00
reneeteng a76aa3d43e Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-26 09:49:41 +08:00
reneeteng 917e54d4df * U-W lang changed. 2019-04-26 09:48:57 +08:00
yfl fdc4d29d3c * Finish Task #5405 2019-04-26 09:40:57 +08:00
wangyidong 33cd15e960 * change for en lang and zh-tw lang. zentaopms_11.4.2_20190426 2019-04-26 09:32:48 +08:00
wangyidong 94e5db6789 * upgrade for xuanxuan. 2019-04-26 09:07:07 +08:00
wangyidong 36a5af36d8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-25 17:10:49 +08:00
wangyidong 81ea311f66 * code for task #5381. 2019-04-25 17:10:15 +08:00
reneeteng c8e9c0dc20 * R-T lang files changed. 2019-04-25 16:56:22 +08:00
reneeteng 9699865906 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-25 10:59:34 +08:00
reneeteng d5a11709c4 * Q-S file lang changed. 2019-04-25 10:54:41 +08:00
wangyidong e44484c7b4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-25 09:11:22 +08:00
wangyidong 75ebcb18dc * code for task #5387. 2019-04-25 09:10:42 +08:00
wangyidong 1daead8b6c * code for task #5388. 2019-04-25 08:20:49 +08:00
yfl 76c8a2d56b * Finish Task #5396 2019-04-24 17:29:44 +08:00
yfl 1c67650da6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-24 16:02:01 +08:00
yfl d35eb8dfaf * Finsish task #5379,#5385,#5389,#5393,#5403,5409 2019-04-24 15:59:56 +08:00
wangyidong afb83acbb1 * adjust for lang. 2019-04-24 14:41:32 +08:00
wangyidong 4a6ec03672 Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-24 13:32:07 +08:00
wangyidong bd29dcdf7d * finish task #5390. 2019-04-24 13:30:42 +08:00
reneeteng 49a0969c0e * M-P lang file updates. 2019-04-24 11:17:17 +08:00
reneeteng 0a944337b4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-23 16:40:44 +08:00
reneeteng 7d759bbc1d * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. * Lang updated. 2019-04-23 16:40:15 +08:00
Yagami 1432c13d18 * Fix lang file error. 2019-04-23 16:24:49 +08:00
Yagami ca08c6879d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-23 16:24:02 +08:00
reneeteng e5ff8615cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-23 16:21:02 +08:00