Commit Graph
11976 Commits
Author SHA1 Message Date
wangyidong d95ba0b181 * fix bug #2419. 2019-02-11 15:23:32 +08:00
Yagami e4322d65b6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-02-11 14:56:24 +08:00
Yagami 287b4a04ac * Fix bug #2409. 2019-02-11 14:55:59 +08:00
wangyidong 41dd1959c4 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-11 14:53:33 +08:00
Yagami ad642ab62d * Fix bug #2414. 2019-02-11 14:18:45 +08:00
Yagami 6109ba1950 * Fix download client group. 2019-02-11 09:09:08 +08:00
wangyidong 6d30d1814f * adjust for count project task. 2019-02-01 14:59:30 +08:00
wangyidong bb591824cb fix bug #2333. 2019-02-01 10:17:06 +08:00
wangyidong 9706530521 * adjust for get commiter in git. 2019-01-31 13:26:36 +08:00
wangyidong d9fe07cb9a * adjust for upgrade. 2019-01-31 09:53:17 +08:00
wangyidong f60a6c481a * adjust for build package. 2019-01-30 11:38:29 +08:00
wangyidong e156be97f4 * fix bug. 2019-01-29 15:55:05 +08:00
wangyidong 84ddbd48df * fix for upgrade. 2019-01-29 15:50:28 +08:00
chenfeiCF 4c07c91260 * Adjust for task #5214. 2019-01-29 14:39:08 +08:00
wangyidong 4092d82094 * fix bug. 2019-01-29 13:28:44 +08:00
wangyidong 699dc4fc37 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-29 10:37:08 +08:00
wangyidong 204cd00e3e * adjust for xuanxuan. 2019-01-29 10:36:34 +08:00
Yagami 4e897f0914 * Finish task #5258. 2019-01-29 10:31:34 +08:00
Yagami f76185bab5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-29 09:41:27 +08:00
Yagami 8eb79bba13 * Finish task #5258. 2019-01-29 09:40:35 +08:00
chenfeiCF d0f2e14326 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-28 16:34:52 +08:00
chenfeiCF c760545647 * Change version and prepare for upgrade. 2019-01-28 16:31:27 +08:00
Yagami 6924b5359d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-28 15:56:25 +08:00
Yagami cf27f925ac * Fix project modules. 2019-01-28 15:55:56 +08:00
wangyidong 7b5768932c * fix for backup. 2019-01-28 15:52:17 +08:00
wangyidong 851b4d32c1 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-28 11:19:20 +08:00
wangyidong 0e8e7f4bf6 * fix bug #2008. 2019-01-28 11:18:48 +08:00
wangyidong 9534cd636e * fix bug #2008. 2019-01-28 11:08:24 +08:00
Yagami 4e82acf5e7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-28 10:52:30 +08:00
Yagami 4a0c061c1f * Finish task #5259. 2019-01-28 10:18:42 +08:00
chenfeiCF 7c658705e1 * Code for task #5218. 2019-01-28 10:13:12 +08:00
wangyidong 0906b11d2b * finish task #5241. 2019-01-28 10:07:37 +08:00
wangyidong 8099c45eec Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-28 10:04:23 +08:00
wangyidong 97659beb32 * adjust for backup. 2019-01-28 10:03:32 +08:00
Yagami 57f0779ec8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-28 09:37:58 +08:00
Yagami 23bb5d7f54 * Finish task #5234. 2019-01-28 09:37:09 +08:00
chenfeiCF 1b83338698 * Finish task #5253. 2019-01-25 18:58:56 +08:00
Catouse 8e27c95499 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-25 17:00:07 +08:00
wangyidong 8f1c20d5ed Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-25 16:15:27 +08:00
wangyidong dda3b52de0 * finish task #5221. 2019-01-25 16:13:58 +08:00
Catouse 9f557ce8dd Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-25 16:01:49 +08:00
Catouse c2bd7de9b9 * finish task #5254 and fix bug #2371. 2019-01-25 16:01:30 +08:00
Yagami ab9f7bf52d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-25 15:16:55 +08:00
Yagami c5bf9cf987 * Finish task #5235. 2019-01-25 15:02:34 +08:00
wangyidong 0afdc5d71d Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-25 14:14:46 +08:00
wangyidong 19629d507c * change for task #5228. 2019-01-25 14:08:55 +08:00
chenfeiCF d1ace922a5 * Finish task #5261, #5262, #5265. 2019-01-25 13:17:29 +08:00
Yagami 9a19b8a177 * Fix bug getproducts. 2019-01-25 11:06:46 +08:00
Yagami c13ea66635 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-25 10:50:40 +08:00
Yagami 0484785235 * Fix user loadlang. 2019-01-25 10:42:55 +08:00