Commit Graph
14499 Commits
Author SHA1 Message Date
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 057f9d8ece * Finish task #5209. 2019-01-22 15:58:32 +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
chenfeiCF 28f014d766 * Adjust Makefile. 2019-01-17 13:35:50 +08:00
Yagami 608257fdb0 * Delete some file which move to xuanxuan. 2019-01-17 10:30:18 +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
Yagami 574f7fba01 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-16 16:52:43 +08:00
Yagami 2b2fb9840f * Fix chat lang. 2019-01-16 16:52:18 +08:00
chenfeiCF cd3422f865 * Modified Makefile. 2019-01-16 16:50:41 +08:00
Yagami 4b33485a7f * Change xuanxuan lang file. 2019-01-16 15:05:00 +08:00
Yagami f5cdd0a16e Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-15 14:25:09 +08:00
Yagami 29659ce40f * Delete chat/downloadxxd.php. 2019-01-15 14:24:48 +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 426073c758 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-09 15:36:03 +08:00
reneeteng b0e8cd02cb * Lang change for 11.1. 2019-01-09 15:35:10 +08:00
wangyidong b2d8a9537f * fix bug #2345. 2019-01-09 14:23:19 +08:00
wangyidong 9285458d46 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-09 10:10:54 +08:00
wangyidong 8d2e67a507 * fix for delete product and project. 2019-01-09 10:09:57 +08:00
chenfeiCF 04312accd6 * Fix bug: When edit module tree should show product. 2019-01-07 09:06:33 +08:00
reneeteng 87d021776d Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-04 15:11:36 +08:00
reneeteng 0b348c617c * Upgrade lang change. 2019-01-04 15:10:35 +08:00
wangyidong f4ec5d266e * change new version and upgrade. zentaopms_11.1.stable_20190104 2019-01-04 13:25:22 +08:00
wangyidong 6824d95b43 Merge branch 'master' of github.com:easysoft/zentaopms 2019-01-03 17:38:54 +08:00
wangyidong 3684846de8 * finish task #7209. 2019-01-03 17:38:13 +08:00
Yagami 4ead396cf1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-01-03 16:38:23 +08:00
Yagami da39a96bd2 * Delete feedback in open source. 2019-01-03 16:37:47 +08:00
wangyidong aba75b1083 * adjust code. 2019-01-03 16:36:24 +08:00