Commit Graph
8596 Commits
Author SHA1 Message Date
wangyidong 9a83ebe44a * adjust for custom. 2016-10-26 15:03:11 +08:00
wangyidong 89bff6c91e Merge branch 'master' of github.com:easysoft/zentaopms 2016-10-26 14:30:36 +08:00
wangyidong 0b4e00d77d * code for task #2672. 2016-10-26 14:28:55 +08:00
chenfeiCF 9cadd8f9d0 * hide open process button if cron is closed and adjust lang item for cron notice. 2016-10-26 13:55:48 +08:00
wangyidong 000addf392 * finish task #2671. 2016-10-25 15:52:23 +08:00
wangyidong 101ec01ae8 * finish task #2679. 2016-10-25 11:52:00 +08:00
wangyidong 96ccd38fd6 * finish task #2678. 2016-10-25 10:16:05 +08:00
wangyidong 67e27080a6 * finish task #2666. 2016-10-21 16:41:54 +08:00
wangyidong 148822be3d * remove save last revision. 2016-10-21 10:33:24 +08:00
wangyidong 5a95dcb1db * change for ajax save log. 2016-10-21 10:29:12 +08:00
wangyidong 7d57150231 * adjust for index page. 2016-10-20 11:12:29 +08:00
wangyidong 3bc98cb9d9 * finish task #2670. 2016-10-19 11:20:01 +08:00
wangyidong cac3f55ada * add version in doc and add priv. 2016-10-19 10:26:11 +08:00
wangyidong 37933349d8 * finish task #2674. 2016-10-17 17:14:23 +08:00
wangyidong 511d07099c * finish task #2673. 2016-10-17 14:38:00 +08:00
wangyidong f246fbeba7 * finish task #2664. 2016-10-14 15:22:41 +08:00
wangyidong ab2e6d83cb * finish task #2668. 2016-10-14 14:31:50 +08:00
wangyidong 8feda80cd9 * finish task #2667,2669. 2016-10-13 17:35:02 +08:00
wangyidong 4bcc1a7980 * adjust for doc menu. 2016-10-11 13:34:48 +08:00
wangyidong bbe0412fcd * adjust doc module when upgrade. 2016-10-11 13:32:21 +08:00
wangyidong 85e635b028 Merge branch 'master' of github.com:easysoft/zentaopms 2016-10-11 10:02:12 +08:00
wangyidong 3dd56d8fce * fix bug and adjust dao. 2016-10-11 10:01:24 +08:00
Catouse 8a604e4ebd * change getDataInJSON method. 2016-09-30 14:50:32 +08:00
chenfeiCF 0ee05de100 * delete useless directory. 2016-09-29 11:41:56 +08:00
Renee 012aace4be Create en_tf 2016-09-29 11:20:33 +08:00
wangyidong 8e30e63a1d * adjust for update user for usergroup. 2016-09-19 09:19:29 +08:00
wangyidong 2e6862256f * fix bug #910. 2016-09-18 16:12:10 +08:00
wangyidong bbee665581 * change for upgrade. zentaopms_8.2.6_20160913 2016-09-13 10:26:53 +08:00
wangyidong f916a2d8c1 Merge branch 'master' of github.com:easysoft/zentaopms 2016-09-12 17:15:56 +08:00
wangyidong c4ec0828f6 * fix bug #879. 2016-09-12 17:15:19 +08:00
chenfeiCF b33141ff02 * fix bug #881. 2016-09-12 16:09:20 +08:00
chenfeiCF dc912902bd * fix bug #871. 2016-09-12 15:41:46 +08:00
wangyidong a712b2b3e4 Merge branch 'master' of github.com:easysoft/zentaopms 2016-09-12 15:13:15 +08:00
wangyidong 8ca67c79d9 * fix bug #888. 2016-09-12 15:12:39 +08:00
chenfeiCF dfb9429eb3 * adjust notice when upload image explain. 2016-09-12 14:42:02 +08:00
chenfeiCF 34b76cb358 Merge branch 'master' of github.com:easysoft/zentaopms 2016-09-12 14:29:03 +08:00
chenfeiCF 6a3545ee95 * fix bug #903. 2016-09-12 14:28:27 +08:00
wangyidong f9bef4922c Merge branch 'master' of github.com:easysoft/zentaopms 2016-09-12 14:15:32 +08:00
wangyidong 9a5c00cf72 * fix bug #908. 2016-09-12 14:14:59 +08:00
chenfeiCF 6ad33fa6a8 * fix bug #869. 2016-09-12 14:08:42 +08:00
chenfeiCF 0851f9b274 * fix bug #886. 2016-09-12 13:31:54 +08:00
chenfeiCF 6526ecbd33 * fix bug #887. 2016-09-12 11:09:36 +08:00
chenfeiCF eb3c445728 * fix bug #901. 2016-09-12 09:57:37 +08:00
chenfeiCF 463605f225 * fix bug #906. 2016-09-12 09:40:27 +08:00
wangyidong e08432aaf2 * fix bugs. 2016-09-08 17:30:38 +08:00
reneeteng 1c0a787a16 Update README.md 2016-08-31 16:23:32 +08:00
wangyidong 82b7b35454 Merge branch 'master' of github.com:easysoft/zentaopms 2016-08-29 08:18:44 +08:00
wangyidong afe4d3311b * revert dao.class.php. 2016-08-29 08:18:05 +08:00
reneeteng fff6cd51e8 Update README.md 2016-08-16 16:20:59 +08:00
reneeteng 3a4626f924 Update README.md 2016-08-16 16:20:05 +08:00