Commit Graph
1625 Commits
Author SHA1 Message Date
reneeteng d0b6386ca7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 11:23:19 +08:00
reneeteng bd025b6bf3 * Lang file update. 2019-05-29 11:22:29 +08:00
Yagami 98c038aaae Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 09:58:00 +08:00
Yagami 7fd493a1c3 * Finish task #5546. 2019-05-29 09:55:05 +08:00
reneeteng f5d2f4d030 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-29 09:38:17 +08:00
Yagami e29b7d93d2 * Finish task #5547. 2019-05-29 09:01:02 +08:00
reneeteng 2b8c9976c8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-28 16:25:24 +08:00
reneeteng 0d85b8c62d * Lang update. 2019-05-28 16:25:04 +08:00
Yagami 97b3cc8c6f * Finish task #5548. 2019-05-28 11:08:33 +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
wangyidong 14b41f4373 * finish task #5594. 2019-05-27 14:45:20 +08:00
reneeteng 594501f676 * Lang update. 2019-05-21 10:37:04 +08:00
reneeteng 340636b0b3 * Lang change. 2019-05-17 14:44:40 +08:00
yfl 9e3477100a * Task #5423 2019-05-06 09:14:32 +08:00
yfl b860286d04 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-05-05 08:40:25 +08:00
yfl 94aa0ca8a6 * Finish task #5443,#5442,#5441 2019-05-05 08:38:23 +08:00
wangyidong 5c90c57f46 * adjust code. 2019-04-29 15:36:17 +08:00
yfl 602a7af067 * Finish task #5399 2019-04-26 15:52:03 +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 e825abcc97 * finish task #5410. 2019-04-26 13:59:45 +08:00
wangyidong 33cd15e960 * change for en lang and zh-tw lang. 2019-04-26 09:32:48 +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
yfl d35eb8dfaf * Finsish task #5379,#5385,#5389,#5393,#5403,5409 2019-04-24 15:59:56 +08:00
reneeteng 4988a7450e * Solved lang file conflicts. 2019-04-23 16:20:29 +08:00
Yagami 31f688c2c7 * Fix code style. 2019-04-23 14:49:53 +08:00
yfl ee1d1b6aab * export all bug show module 2019-04-19 15:33:45 +08:00
reneeteng d41d552467 * Lang change. 2019-04-18 15:57:00 +08:00
reneteng 9c46bf4aa6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-16 15:17:46 +08:00
yfl 7a75a922f1 * Fix Bug 2019-04-11 08:52:06 +08:00
wangyidong 7dfdbe841d * finish task #5357. 2019-03-20 13:33:17 +08:00
reneeteng 76ece9e5eb *Lang change. 2019-03-14 14:20:48 +08:00
Yagami e05ed035f6 * Fix lastEditDate bug. 2019-03-11 17:17:11 +08:00
reneeteng cba64ef5a7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-05 16:47:18 +08:00
reneeteng c0184eca09 * Lang change. 2019-03-05 16:46:10 +08:00
chenfeiCF e171290300 * Adjust code. 2019-02-27 17:03:16 +08:00
Yagami dcc120573d * Fix get user data method. 2019-02-27 17:00:49 +08:00
wangyidong 40062df83f * adjust for zh-tw lang. 2019-02-27 13:11:25 +08:00
wangyidong 8f1b0fe119 * adjust table width for en lang. 2019-02-27 09:43:14 +08:00
Yagami efe734f04a * Code for task #5284. 2019-02-26 14:28:26 +08:00
reneeteng c05c534b12 * Lang change. 2019-02-26 10:29:53 +08:00
Yagami 3656c218a9 * Finish task #5292. 2019-02-22 15:25:22 +08:00
Yagami 1d1d64f600 * Finish task #5296. 2019-02-22 13:20:24 +08:00
wangyidong c39f83177b Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-22 10:36:54 +08:00
Yagami 70f6eafd06 * Code task #5287. 2019-02-21 17:18:44 +08:00
wangyidong 6de8f45c44 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-21 16:21:51 +08:00
wangyidong c15a28e3c4 * finish task #5274. 2019-02-21 16:17:26 +08:00
Yagami 1918e73a36 * Finish task #5287. 2019-02-21 15:46:40 +08:00