Commit Graph
15206 Commits
Author SHA1 Message Date
reneeteng 0d85b8c62d * Lang update. 2019-05-28 16:25:04 +08:00
reneeteng a45e486725 * Lang files update. 2019-05-28 13:13:17 +08:00
reneeteng e611cf476d * Lang update. 2019-05-28 11:08:00 +08:00
reneeteng 9a29937259 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-28 10:45:43 +08:00
reneeteng 16931f4048 * Lang file update. 2019-05-28 10:45:12 +08:00
Yagami 1c0dcf4cfa * Finish task #5549. 2019-05-28 10:21:32 +08:00
Yagami 0b9cbd75bf * Finish task #5554. 2019-05-28 10:18:46 +08:00
Yagami b8a0e7494f * Finish task #5557. 2019-05-28 10:03:39 +08:00
Yagami 94a17592c8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-28 10:00:18 +08:00
Yagami 96bda94f57 * Finish task #5557. 2019-05-28 09:59:47 +08:00
wangyidong 5aa8b55e66 Merge branch 'master' of github.com:easysoft/zentaopms 2019-05-28 09:52:40 +08:00
wangyidong 672a73dfad * finish task #5611. 2019-05-28 09:52:24 +08:00
Yagami f0f52d3bc6 * Finish task #5558. 2019-05-28 09:21:23 +08:00
Yagami e8a1ee93f3 * Finish task #5560. 2019-05-28 09:08:28 +08:00
Yagami 09245b6f2f * Fix productstatisticblock width. 2019-05-28 08:59:09 +08:00
reneeteng 95222fa49b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-27 17:02:52 +08:00
reneeteng f5f8e0df06 * Lang file update. 2019-05-27 17:01:57 +08:00
Yagami ad457bdb2b * Fix detail. 2019-05-27 16:47:30 +08:00
Yagami 1607193c43 * Code for dayup. 2019-05-27 16:42:44 +08:00
Yagami 57591a17ed Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-27 15:17:16 +08:00
Yagami 723394fd3b * Finish task #5458. 2019-05-27 15:17:03 +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 500d35753e Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-15 14:49:24 +08:00