Commit Graph
6755 Commits
Author SHA1 Message Date
wangyidong 18d8f179fe * fix a bug #683. 2015-04-14 13:08:16 +08:00
wangyidong 91d2f6be1f * fix a bug #687. 2015-04-14 11:17:58 +08:00
wangyidong ab3c3a6fbf * fix a bug #689. 2015-04-14 11:07:48 +08:00
wangyidong 614580a026 * fix a bug for #690. 2015-04-14 10:36:00 +08:00
wangyidong d096a5dde3 * fix a bug #692. 2015-04-14 09:52:41 +08:00
wangyidong 0c78e0bc62 * fix bug #693. 2015-04-14 09:39:31 +08:00
wangyidong dd3b718016 * fix bug #695. 2015-04-14 09:26:32 +08:00
wangyidong 9f6fb46686 * fix a bug #640. 2015-04-13 16:08:31 +08:00
wangyidong d8cc94b83e * fix a bug for batch create story from image. 2015-04-07 15:16:44 +08:00
wangyidong 4046ab3cdd * fix bug #691. 2015-04-01 16:25:36 +08:00
wangyidong 44161c02c0 * fix for doc tree. 2015-04-01 16:05:28 +08:00
wangyidong c60edb8f5c * fix a bug for upgrade from 6.4 2015-04-01 13:57:55 +08:00
wangyidong b1aab631c7 * fix bug. 2015-03-30 16:36:06 +08:00
wangyidong 429b8f30a3 * fix bug for upgrade.php security code. 2015-03-30 16:31:12 +08:00
wangyidong 922348465d * fix bugs. 2015-03-26 16:00:21 +08:00
wangyidong 464b388d0b * add zh-tw lang for cron. 2015-03-16 17:11:52 +08:00
wangyidong 31924d9945 * adjust code for cron. 2015-03-16 10:57:55 +08:00
wangyidong 359ce0bbf6 * adjust code. 2015-03-13 15:58:57 +08:00
wangyidong de2f33c84a * remove test code. 2015-03-13 15:21:53 +08:00
wangyidong 0d8da8c89e * adjust code for cron. 2015-03-13 15:10:18 +08:00
wangyidong 2fce1a136b * fix a bug and notice. 2015-03-13 13:55:06 +08:00
wangyidong c4ade54fc3 fix a bug for async mail. 2015-03-13 13:33:30 +08:00
wangyidong be5b818787 * fix bug #633. 2015-03-13 09:26:27 +08:00
wangyidong 02a5d0bf2b * fix bug #679. 2015-03-12 14:56:29 +08:00
wangyidong ce242a7dce * fix bug #682. 2015-03-12 14:20:52 +08:00
wangyidong cc6fcc68c1 * adjust for cron. 2015-03-12 14:20:23 +08:00
wangyidong 447476ad17 * code for dev. 2015-03-09 16:16:21 +08:00
wangyidong b80b3620ef * change for zh-tw. 2015-03-09 12:02:54 +08:00
wangyidong e7f90d0f6b * adjust for cron. 2015-03-09 12:02:40 +08:00
wangyidong 9106252a29 * change for show dev module. 2015-03-09 12:01:59 +08:00
wangyidong 83a1f6e303 * fix a bug. 2015-03-09 11:57:54 +08:00
wangyidong f2491441e2 * adjust cron. 2015-03-09 11:38:53 +08:00
wangyidong 21c77685bb * change for upgrade. 2015-03-09 11:35:42 +08:00
wangyidong 8c26498edf * adjust for show upgrade error. 2015-03-06 16:39:57 +08:00
wangyidong 22a4be0638 * fix a bug for upload extension. 2015-03-06 15:12:54 +08:00
wangyidong e06779bdad Merge branch 'master' of github.com:easysoft/zentaopms 2015-03-06 14:02:23 +08:00
wangyidong d4def96048 * fix bug. 2015-03-06 14:01:58 +08:00
xia0ta0 a94f44416c * adjust language of dev. 2015-03-05 09:38:03 +08:00
xia0ta0 ab274a4ff8 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/dev/lang/en.php
2015-03-05 09:20:44 +08:00
xia0ta0 22f0a7fb22 + add api css. 2015-03-05 09:11:11 +08:00
xia0ta0 37cfad323c + add english.
* adjust style.
2015-03-05 09:03:13 +08:00
wangyidong fdc283afd7 * adjust for upload extension file. 2015-03-04 14:42:27 +08:00
wangyidong a9e6dcc529 * change for group priv. 2015-03-02 14:24:44 +08:00
wangyidong c4a72a6b75 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/common/lang/en.php
	module/common/lang/menuOrder.php
	module/common/lang/zh-cn.php
2015-02-28 17:29:16 +08:00
wangyidong e3276297c5 * finish task #2208. 2015-02-28 17:26:27 +08:00
wangyidong c56d8e69c6 * finish task #2206, 2207. 2015-02-28 14:56:35 +08:00
xia0ta0 8e2899f62b - remove editor from extension. 2015-02-27 08:40:37 +08:00
xia0ta0 5b7075f444 * adjust menuOrder of admin. 2015-02-27 08:38:28 +08:00
xia0ta0 b34318a028 + add dev module. 2015-02-26 16:19:57 +08:00
xia0ta0 6efa9f6768 * move editor from extension to dev. 2015-02-26 16:16:46 +08:00