Commit Graph
11976 Commits
Author SHA1 Message Date
chenfeiCF 66ce378726 * Fix bug #5248, #5260, #5263, #5266. 2019-01-25 10:36:56 +08:00
wangyidong 4842c965bc Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-25 10:05:43 +08:00
wangyidong e4fd49e0f6 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-25 10:04:23 +08:00
wangyidong 03d3c82301 * finish task #5236. 2019-01-25 10:03:51 +08:00
Yagami f3f9b64932 * Finish task #5250. 2019-01-25 10:03:39 +08:00
Yagami a19de16123 * Finish task #5246. 2019-01-25 09:56:48 +08:00
wangyidong 69413ff785 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-25 09:21:06 +08:00
wangyidong 93701f583a * finish task #5252. 2019-01-25 09:18:48 +08:00
Yagami faaf0dd1cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-25 09:00:11 +08:00
Yagami 9922370141 * Finish task #5249. 2019-01-25 08:59:13 +08:00
wangyidong 857871042a * finish task #5238. 2019-01-24 17:30:55 +08:00
Yagami de0e1186ca * Finish task #5255. 2019-01-24 16:17:18 +08:00
Yagami e9d8249ac8 * Finish task #5259. 2019-01-24 14:24:03 +08:00
Yagami 289160ca45 * Finish task #5229. 2019-01-24 09:26:42 +08:00
Yagami 976bc31271 * Finish task #5229. 2019-01-24 09:24:17 +08:00
Yagami fad09a3916 * Finish task #5225. 2019-01-24 09:08:34 +08:00
Yagami 9d464ca6d5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-23 15:28:01 +08:00
Yagami 353fa681cd * Finish task #5213. 2019-01-23 15:27:37 +08:00
wangyidong 2f5909ee29 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-23 15:22:21 +08:00
wangyidong a97b9deca2 * finish task #5219. 2019-01-23 15:21:49 +08:00
Yagami 068773ddf4 * Fix release marker bug. 2019-01-23 14:58:53 +08:00
Yagami eff13683fb * Finish task #5223. 2019-01-23 13:44:49 +08:00
Yagami dfb6a386dd * Finish task #5208. 2019-01-23 13:07:37 +08:00
Yagami 8e566448b1 * Finish task #5205. 2019-01-23 10:43:46 +08:00
Yagami 6c8a9a1d00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-23 09:56:04 +08:00
Yagami 42e8537e0f * Finish task #5206. 2019-01-23 09:55:41 +08:00
reneeteng b7f7e7c484 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-23 09:54:32 +08:00
reneeteng 7a5e06ba65 *Lang chane. 2019-01-23 09:54:00 +08:00
wangyidong eb05f0a745 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-23 09:15:16 +08:00
wangyidong bace517b74 * adjust code for saveLogs. 2019-01-23 09:14:36 +08:00
Yagami 2e35f9b4cd Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-23 08:59:26 +08:00
Yagami 71e04e17ae * Finish task #5211. 2019-01-23 08:59:04 +08:00
wangyidong 097c1ec481 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-22 16:27:10 +08:00
wangyidong 30fc17cb14 * finish task #5207. 2019-01-22 16:26:45 +08:00
Yagami 7ebc837443 * Finish task #5213. 2019-01-22 15:45:20 +08:00
wangyidong 235b242290 * finish task #5203. 2019-01-22 14:29:05 +08:00
reneeteng 36fced872a * Lang change. 2019-01-22 13:16:06 +08:00
Yagami ed6172aab0 * Finish task #5210. 2019-01-21 15:55:36 +08:00
Yagami 042f217f27 * Finish task #5214. 2019-01-21 15:31:22 +08:00
Yagami 5eb78a1246 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-21 15:09:00 +08:00
Yagami ad15fff7ee * Finish task #5217. 2019-01-21 15:08:33 +08:00
reneeteng e01d3f34cc Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-18 10:45:18 +08:00
reneeteng 2ba3fbfa8a *Change lang. 2019-01-18 10:44:50 +08:00
wangyidong 91bb4a4ae2 * change init lang of svn and git to common. 2019-01-18 10:33:06 +08:00
reneeteng 8beb1b1459 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-17 09:52:44 +08:00
reneeteng 885dbd44b0 * Lang change. 2019-01-17 09:52:15 +08:00
wangyidong 7418523c13 * adjust code. 2019-01-15 10:20:54 +08:00
wangyidong ee4766e699 * Adjust for copy story desc when batch create task. 2019-01-15 10:03:38 +08:00
wangyidong cada6c243b * adjust for showDeleted custom. 2019-01-11 15:57:01 +08:00
reneeteng b0e8cd02cb * Lang change for 11.1. 2019-01-09 15:35:10 +08:00