Commit Graph
8572 Commits
Author SHA1 Message Date
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
wangyidong 1eeb0ca399 * change for zh-tw. 2017-12-22 10:08:54 +08:00
wangyidong 63635f8716 * fix bug. 2017-12-22 10:05:26 +08:00
滔哥 c0847347bd * Fix task page bug. 2017-12-22 09:37:24 +08:00
wangyidong 67a0089814 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-22 09:06:02 +08:00
wangyidong 60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
滔哥 31fb6383b2 * Fix bug. 2017-12-21 16:06:13 +08:00
滔哥 bb7d362acf * Format code. 2017-12-21 15:41:01 +08:00
滔哥 496e6fdca4 * Fix bug. 2017-12-21 15:38:17 +08:00
wangyidong cc8bf62fe5 * fix bug #1008. 2017-12-21 15:27:01 +08:00
wangyidong ee157b0e84 * fix bug #1342. 2017-12-21 15:18:16 +08:00
wangyidong c81d3a4ee7 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-21 14:51:28 +08:00
wangyidong c7d758b6f0 * fix bug #1337. 2017-12-21 14:50:49 +08:00
滔哥 39765cdd13 * Fix bug. 2017-12-21 14:16:45 +08:00
滔哥 7799d1ee42 * Fix bug. 2017-12-21 13:46:16 +08:00
滔哥 bc444c347d Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-21 13:06:26 +08:00
滔哥 04c33a382a * Fix bug 2017-12-21 13:06:21 +08:00
滔哥 897686168d * Fix bug 2017-12-21 12:41:42 +08:00
wangyidong 318c120538 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-21 11:22:33 +08:00
wangyidong 9e628c464b * fix bug for export with child. 2017-12-21 11:22:10 +08:00
滔哥 f1467eba02 * Fix bug 2017-12-21 09:27:39 +08:00
wangyidong c6778fdd17 * adjust for doc showfiles page. 2017-12-20 17:04:55 +08:00
wangyidong afb023fca9 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-20 16:47:01 +08:00
wangyidong a42b0008c9 * adjust for demo. 2017-12-20 16:46:42 +08:00
Your Name 2089850a63 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:26:50 +08:00
Your Name 40a653554d * Fix Bug #1245. 2017-12-20 16:25:25 +08:00
tengfei 7df4d8febf Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:13:58 +08:00
tengfei 117096919d bug open on change 2017-12-20 16:13:43 +08:00