Commit Graph
10337 Commits
Author SHA1 Message Date
dajiao007 7770bab6af * fix the story of 3423 2017-12-14 14:24:30 +08:00
滔哥 e3ba0b0216 * Change Url for En Notice 2017-12-05 16:17:09 +08:00
滔哥 6376a64a93 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 14:21:49 +08:00
滔哥 f8b0050c38 * Change Url for En Notice 2017-12-05 14:21:03 +08:00
tengfei ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei 232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
滔哥 e1075f32df * Task 3481 2017-12-05 11:08:24 +08:00
滔哥 ee85a1accd * Task 3451 2017-12-04 17:45:43 +08:00
wangyidong 2d65d4a222 * change for zh-tw and upgrade. zentaopms_9.6.3_20171204 2017-12-04 16:45:16 +08:00
wangyidong e8e24b9109 * fix for datatable check. 2017-12-04 16:37:35 +08:00
滔哥 1a1321e57c * Fix bug 2017-12-04 15:57:37 +08:00
滔哥 619608946d Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:57:09 +08:00
Catouse b0feda7029 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:53:45 +08:00
wangyidong da6a23e7bc * fix bug #1132. 2017-12-04 15:24:27 +08:00
Catouse 1bd227029a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:14:52 +08:00
Catouse 5a76b904b3 * fix bug #1294. 2017-12-04 15:14:45 +08:00
wangyidong e082c20f90 * fix bug #1252. 2017-12-04 14:51:35 +08:00
滔哥 e1f20d5ef1 * Fix bug 1278 2017-12-04 14:50:09 +08:00
滔哥 aa391ba138 * Fix bug 1278 2017-12-04 14:49:54 +08:00
wangyidong 91cc9135f1 * fix bug #1262. 2017-12-04 14:21:12 +08:00
wangyidong d7ed9c0bbb * adjust code for showimport. 2017-12-04 14:09:51 +08:00
wangyidong e2333b70a2 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-04 13:38:53 +08:00
wangyidong e2070d56b1 * fix bug #1279. 2017-12-04 13:37:43 +08:00
滔哥 8165e6c31e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 13:33:03 +08:00
滔哥 11ad8f1d95 * Fix bug 1315 2017-12-04 13:32:17 +08:00
wangyidong 37aeaa887f * fix bug #1291. 2017-12-04 13:16:38 +08:00
wangyidong bf7126e3af * fix bug #1297. 2017-12-04 11:36:18 +08:00
滔哥 aaada03ccf Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-01 16:25:02 +08:00
滔哥 67c4ed6cc4 * Fix 1317 2017-12-01 16:24:56 +08:00
wangyidong ede35673b6 * fix bug #1292. 2017-12-01 15:15:38 +08:00
wangyidong 6df5ea2645 * fix bug #1293. 2017-12-01 14:45:51 +08:00
wangyidong c2fe7af6f0 * fix bug #1284. 2017-12-01 14:44:04 +08:00
wangyidong 0a45abd11e Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-01 14:28:13 +08:00
wangyidong a6aeaf2cb5 * fix bug #1285. 2017-12-01 14:27:51 +08:00
滔哥 ba7422ca22 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-01 14:24:03 +08:00
滔哥 7b9b7d4a40 * Fix bug 2017-12-01 14:23:57 +08:00
wangyidong 62cc162358 * fix bug #1286. 2017-12-01 14:10:19 +08:00
wangyidong 29f7e91a9f * fix bug #1290. 2017-12-01 14:00:21 +08:00
wangyidong be4b832909 * fix bug #1296. 2017-12-01 13:55:14 +08:00
wangyidong 18cb10cfa3 * fix bug #1306. 2017-12-01 13:48:33 +08:00
wangyidong 8be716b8a5 * fix bug #1309. 2017-12-01 13:17:16 +08:00
wangyidong eac28529d6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-01 11:26:27 +08:00
wangyidong 74adf6ae8f * fix bug #1316. 2017-12-01 11:25:51 +08:00
滔哥 c49a2c8fca * Fix bug 2017-12-01 11:24:53 +08:00
wangyidong 3664bd09c8 * fix bug #1314. 2017-12-01 10:44:21 +08:00
wangyidong 6f8543277e * fix bug #1307. 2017-12-01 10:22:25 +08:00
wangyidong ef4e8a2cbd * fix bug #1310. 2017-12-01 09:43:56 +08:00
wangyidong 66e5d7f47a * fix bug #1313. 2017-12-01 09:36:22 +08:00
wangyidong fca246824a * fix bug #1298. 2017-12-01 09:17:04 +08:00
wangyidong 057f8978b1 * fix bug #1300. 2017-12-01 09:09:15 +08:00