Commit Graph

12456 Commits

Author SHA1 Message Date
wangyidong
672a73dfad * finish task #5611. 2019-05-28 09:52:24 +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
wangyidong
3c61de8e74 * finish task #5605. 2019-05-27 14:12:15 +08:00
Yagami
b948ee4cb6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-27 14:06:15 +08:00
Yagami
8f36146059 * Finish task #5448. 2019-05-27 14:05:43 +08:00
wangyidong
9cf8241de6 * finish task #5615. 2019-05-27 14:01:09 +08:00
wangyidong
6a970871be Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-24 14:22:34 +08:00
wangyidong
faf0003840 * fix bug #2570. 2019-05-24 14:22:04 +08:00
reneeteng
c724ee8fac * Lang file update. 2019-05-24 10:04:23 +08:00
reneeteng
2eadd680d7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-23 09:38:37 +08:00
reneeteng
819778ee27 * Calendar lang file update. 2019-05-23 09:37:22 +08:00
Yagami
787172c3b8 * Fix en lang file. 2019-05-22 14:14:18 +08:00
wangyidong
5d360e97bf Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-21 13:30:40 +08:00
wangyidong
3bdd40ece0 * adjust for plan desc in browse. 2019-05-21 13:28:11 +08:00
reneeteng
594501f676 * Lang update. 2019-05-21 10:37:04 +08:00
reneeteng
fd632d5389 * Lang update. 2019-05-20 15:10:34 +08:00
reneeteng
c94b2f94cd * Lang updated. 2019-05-17 15:51:31 +08:00
reneeteng
cd352a105b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-17 14:45:13 +08:00
reneeteng
340636b0b3 * Lang change. 2019-05-17 14:44:40 +08:00
wangyidong
27b5991f94 * fix bug. 2019-05-17 09:33:00 +08:00
reneeteng
027c72c80a * Lang update. 2019-05-16 13:23:18 +08:00
reneeteng
69797316cf * Lang file is updated. 2019-05-15 16:10:32 +08:00
reneeteng
c4c756e0de * Update lang file. 2019-05-15 14:48:59 +08:00
reneeteng
be2e7dcf47 * Lang update. 2019-05-14 14:19:50 +08:00
reneeteng
ecfb7578a3 * Lang file update. 2019-05-14 14:13:47 +08:00
reneeteng
a6c2eb6d67 * Lang update. 2019-05-14 13:43:59 +08:00
reneeteng
d4b7114d0b * Lang update. 2019-05-14 11:24:41 +08:00
reneeteng
a79faea9a1 * Update lang. 2019-05-13 17:00:47 +08:00
reneeteng
c213d45dff * Lang update. 2019-05-13 16:12:59 +08:00
reneeteng
5ddc98d8d7 * Lang update. 2019-05-13 14:55:18 +08:00
reneeteng
8a94d3781c * Lang update. 2019-05-13 14:14:46 +08:00
reneeteng
2e6e00a61f * Lang update. 2019-05-13 13:19:55 +08:00
reneeteng
130209edaa * Lang change. 2019-05-13 11:19:37 +08:00
reneeteng
ad6bdc17d7 * Lang update. 2019-05-13 09:32:26 +08:00
reneeteng
7b58ee0721 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-10 16:56:11 +08:00
reneeteng
9d7cafc47d * Lang update. 2019-05-10 16:55:21 +08:00
wangyidong
a83f3ca95e * fix for upgrade. 2019-05-10 12:26:26 +08:00
wangyidong
60dc40cdba * adjust for upgrade. 2019-05-09 17:02:18 +08:00
wangyidong
81bd7174af * adjust for style. 2019-05-09 09:11:51 +08:00
wangyidong
fe5866bea0 + add new version and upgrade. 2019-05-08 16:09:29 +08:00
wangyidong
f8bf771562 * adjust for xuanxuan. 2019-05-08 14:32:33 +08:00
wangyidong
610a19d880 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-08 13:27:02 +08:00
wangyidong
5bebd42783 * add for xuanxuan priv. 2019-05-08 13:26:25 +08:00