Commit Graph
197 Commits
Author SHA1 Message Date
Catouse d27fb779c3 * refactor codes. 2018-05-21 09:08:08 +08:00
tengfei 44d87c1368 * translation changed 2018-05-17 15:07:58 +08:00
daitingting 0056609d9c * Adjust button style. 2018-05-16 17:44:42 +08:00
滔哥 e46a670ddc * Fix bug. 2018-05-14 13:57:53 +08:00
滔哥 61f56263a9 * Merge conflict. 2018-05-11 10:40:08 +08:00
滔哥 5360683bf3 * Task for Custom module. 2018-05-11 10:35:28 +08:00
wangyidong 4793ee5dd0 * adjust for custom-score. 2018-05-11 09:55:38 +08:00
wangyidong 73acd9ff66 * finish task #3997. 2018-05-10 17:43:11 +08:00
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
wangyidong d67fd9d165 * remove custom-ajaxsethomepage page. 2018-05-02 13:05:54 +08:00
wangyidong b59ac8b1a0 * finish task #3915,3917,3955. 2018-04-26 11:25:40 +08:00
wangyidong d620047bba * adjust for admin dev page. 2018-04-24 16:11:10 +08:00
wangyidong a4bc9d3287 * replace featurebar to mainMenu. 2018-04-16 15:28:21 +08:00
wumo 48b97ea292 * optimize the notes. 2018-03-26 15:33:46 +08:00
wangyidong a4b6765a3b * adjust for zh-tw lang. 2018-03-26 09:06:19 +08:00
daitingting ab7ff4024f * Adjust codes. 2018-03-23 11:33:35 +08:00
wumo 1ea17ed25d * Fix the bug of typeList of todo. 2018-03-22 23:08:55 +08:00
wumo 402861a88e * Filter the invalid key in custom module.
* Change function called to picture when edit product.
2018-03-22 16:49:51 +08:00
wumo b2cd6c62f3 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-21 16:02:42 +08:00
wumo 7ebfcde7f2 * Fix the bug of comment and setting key. 2018-03-21 16:01:12 +08:00
wangyidong 6dd688f3b7 * adjust for batch create. 2018-03-21 15:01:57 +08:00
daitingting b40e2bb9ea * Add tw language. 2018-03-21 09:30:47 +08:00
wangyidong dfe9ca2e60 * finish task #3748. 2018-03-20 17:07:07 +08:00
wumo cd918d09fd * Check the key of user when setting. 2018-03-20 10:00:30 +08:00
daitingting 2f5ac1ad32 * Adjust length checking. 2018-03-19 17:13:12 +08:00
daitingting c81e7570b3 * Fix bug #1431. 2018-03-14 16:28:32 +08:00
dajiao007 87807110d5 modify tranlate and adjust column width 2018-01-11 16:46:08 +08:00
dajiao007 fa00dc9d9c modify the translate 2018-01-10 19:39:51 +08:00
wangyidong 9cf249835e * fix bug for custom story review. 2017-12-27 17:29:20 +08:00
tengfei ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei 232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
滔哥 11ad8f1d95 * Fix bug 1315 2017-12-04 13:32:17 +08:00
tengfei 5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
wangyidong ad3ce6bab6 * change for pro. 2017-11-16 15:26:20 +08:00
wangyidong 87e4abfcb8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 16:46:51 +08:00
滔哥 40995c4dc3 * Fix bug 2017-11-09 15:12:02 +08:00
wangyidong c2e05057f5 * finish task #3341. 2017-11-09 15:11:08 +08:00
滔哥 2f2c99f346 * Fix bug 2017-11-09 10:51:03 +08:00
guanxiying 9d2861678f Format codes. 2017-11-08 16:00:24 +08:00
Xiying Guan f1ba417162 * Format codes. 2017-11-08 13:28:26 +08:00
wangyidong 49909d01c1 * adjust for required. 2017-11-06 17:46:57 +08:00
wangyidong 7293086b45 * fix for required. 2017-11-06 16:57:13 +08:00
wangyidong fbc5b38585 * change for zh-tw lang. 2017-11-06 10:13:16 +08:00
wangyidong 38073d2ad7 * finish task #3310. 2017-11-03 13:22:27 +08:00
滔哥 4446a7160b Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-11-01 19:32:12 +08:00
滔哥 7aa86734db * fix score module 2017-11-01 19:31:59 +08:00
wangyidong 1a3a404677 * fix for custom required. 2017-11-01 14:14:40 +08:00
wangyidong d4dd502c31 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-01 13:28:14 +08:00
wangyidong 8000d57e9d * adjust for save custom with global. 2017-11-01 13:26:03 +08:00
滔哥 c5d9187baf * fix score module 2017-11-01 11:29:07 +08:00