Commit Graph
8599 Commits
Author SHA1 Message Date
滔哥 a92a0bdb29 * Finish task#3553 2018-01-03 22:06:04 +08:00
滔哥 204639fd2b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-03 21:14:11 +08:00
滔哥 88653f881f * Finish task#3574 2018-01-03 21:14:05 +08:00
wangyidong 9f7b5146e8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-03 16:40:44 +08:00
wangyidong fad9e34e8d * finish task #3585. 2018-01-03 16:40:27 +08:00
滔哥 86a3b53329 * Fix bug. 2018-01-02 17:21:42 +08:00
滔哥 8c776b6607 * Fix bug. 2018-01-02 17:20:21 +08:00
滔哥 c2d928f58a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-01-02 10:04:37 +08:00
wangyidong 0ec4afb68b * finish task #3558. 2018-01-02 08:55:33 +08:00
滔哥 0d5b43fb5c * Task#3574 2017-12-29 17:27:58 +08:00
wangyidong b36436dcf6 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-29 17:01:57 +08:00
wangyidong 9abd1d6cf3 * finish task #3588. 2017-12-29 17:01:35 +08:00
滔哥 345178901a * Finish Task#3552. 2017-12-29 16:21:56 +08:00
滔哥 8f58d40985 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-29 16:09:12 +08:00
滔哥 71b62c922c * Finish Task#3554. 2017-12-29 16:09:04 +08:00
滔哥 ba2439d265 * Finish Task#3566. 2017-12-29 15:53:10 +08:00
wangyidong 1e547a4bed Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-29 11:27:19 +08:00
wangyidong d71d582f3d * adjust code. 2017-12-29 11:25:53 +08:00
滔哥 92601443c9 * Finish Task#3565. 2017-12-29 11:04:50 +08:00
滔哥 d88201be75 * Format code. 2017-12-29 09:26:05 +08:00
滔哥 e5b312e326 * Add upgrade for Task#3561 2017-12-29 09:11:19 +08:00
滔哥 92399590a2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-28 18:03:53 +08:00
滔哥 cbf08b828a * Task#3561 2017-12-28 18:03:48 +08:00
wangyidong a8a1d0c11c * fix bug for search in link story. 2017-12-28 10:16:44 +08:00
wangyidong ee5036c632 * fix error with zget. 2017-12-28 09:59:06 +08:00
wangyidong f1e5a2c6dd * fix bug #1362. 2017-12-27 17:55:48 +08:00
wangyidong 0dad383f67 * fix bug #1352. 2017-12-27 17:36:32 +08:00
wangyidong 9cf249835e * fix bug for custom story review. 2017-12-27 17:29:20 +08:00
wangyidong 706fc34c5a Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-27 16:22:28 +08:00
wangyidong 2bea6f457a * fix bug #1356. 2017-12-27 16:21:59 +08:00
滔哥 f71a2edc9d * Fix bug. 2017-12-27 16:19:24 +08:00
滔哥 807cd311a4 * Fix bug for devel db. 2017-12-27 16:05:56 +08:00
滔哥 89565cfbc6 * Format code. 2017-12-27 15:42:03 +08:00
滔哥 1a456cada8 * Fix bug for EN. 2017-12-27 15:05:14 +08:00
滔哥 3a59ee210c * Fix bug for EN. 2017-12-27 09:07:49 +08:00
滔哥 2450f3b4cd * Format code. 2017-12-26 17:41:19 +08:00
滔哥 f453d2337f Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-26 16:47:07 +08:00
滔哥 e585e048b9 * Format code. 2017-12-26 16:46:59 +08:00
wangyidong d09eabbad8 * fix bug and delete test code. 2017-12-26 16:40:18 +08:00
滔哥 dc8ee0995e * Fix bug. 2017-12-26 16:30:17 +08:00
滔哥 eee6b9d62f * Rollback Bug#1344. 2017-12-26 13:06:48 +08:00
滔哥 6e86db8ce4 * Fix bug 2017-12-25 17:05:43 +08:00
滔哥 cc79cf52c9 * Fix bug#1326 2017-12-25 16:57:37 +08:00
滔哥 0c39022280 * Fix bug#1126 2017-12-25 15:06:30 +08:00
滔哥 55fa326b88 * Format code. 2017-12-25 14:16:26 +08:00
wangyidong f038c37608 * fix bug for ajax custom in english. 2017-12-25 10:12:21 +08:00
wangyidong 9e06211e66 * adjust for install cron lang. 2017-12-22 16:21:11 +08:00
滔哥 e9419639d6 * Fix bug. 2017-12-22 14:23:55 +08:00
Catouse 223e0612dc Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-22 13:29:07 +08:00
Catouse 994e0b56d7 * fix js error. 2017-12-22 13:28:56 +08:00