Commit Graph
946 Commits
Author SHA1 Message Date
wangyidong 429b8f30a3 * fix bug for upgrade.php security code. 2015-03-30 16:31:12 +08:00
wangyidong b80b3620ef * change for zh-tw. 2015-03-09 12:02:54 +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 5b7075f444 * adjust menuOrder of admin. 2015-02-27 08:38:28 +08:00
xia0ta0 fc495455bf * adjust submenu of admin. 2015-02-26 16:11:35 +08:00
wangyidong 30c1ab399a * adjust for paste image. 2015-02-04 17:35:09 +08:00
wangyidong 6d9aa57ec7 Merge branch 'master' of github.com:easysoft/zentaopms 2015-02-04 15:43:45 +08:00
wangyidong c9f0b9f861 * change for zh-tw. 2015-02-04 15:43:19 +08:00
wangyidong c3e0d714f0 * adjust code. 2015-02-04 10:14:53 +08:00
Catouse cf330a9264 * chosen suppot change dropmenu direction. 2015-02-02 16:04:33 +08:00
wangyidong 03dae63dd0 * code for bug #2202. 2015-01-29 17:16:46 +08:00
wangyidong 5c1c020f25 Merge branch 'master' of github.com:easysoft/zentaopms 2015-01-29 16:56:54 +08:00
wangyidong 3c8a5cc6fd * finish task #2202. 2015-01-29 16:03:32 +08:00
Catouse 3dd4e0b94d Merge branch 'master' of https://github.com/easysoft/zentaopms 2015-01-29 09:43:34 +08:00
Catouse 1863fc5987 * fix datetimepick textbox with value "0000-00-00". 2015-01-29 09:36:27 +08:00
wangyidong fb4eed1c39 * finish task #2190. 2015-01-28 16:31:03 +08:00
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong b0dd0d75b8 * adjust for comment in mail. 2015-01-28 13:46:37 +08:00
wangyidong 3f86de68ac * finish task #2197. 2015-01-27 14:24:04 +08:00
wangyidong 6b092dbde9 * add file header in backup file. 2013-12-22 07:51:50 +00:00
wangyidong a1a587a2af * adjust code. 2014-12-19 06:51:59 +00:00
wangyidong 0c0f8d85a9 * adjust code. 2014-12-19 01:05:41 +00:00
Catouse bbaf9039d0 * enhance ui of story search modal with chosen. 2014-12-17 18:10:13 +08:00
wangyidong d75f50e691 * change for zh-tw lang. 2014-12-16 09:03:36 +00:00
wangyidong 8ce86eddbe * finish task #660. 2014-12-16 01:18:39 +00:00
wangyidong 88a59254a0 * finish task #2157. 2014-12-12 09:31:23 +00:00
xia0ta0 c4f4e10717 Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-11 15:58:27 +08:00
xia0ta0 b3e936ba9e * code for task#1302: adjust link style. 2014-12-11 15:57:34 +08:00
wangyidong 0c687fcc6d Merge branch 'master' of github.com:easysoft/zentaopms 2014-12-11 02:46:00 +00:00
wangyidong 33cb9fb781 * finish task #2039,2040. 2014-12-11 01:45:10 +00:00
Catouse 123148ab3e * tab key spport jump to next chosen control. 2014-12-10 15:20:30 +08:00
Catouse eff1aed20e * finish task #2164. 2014-12-10 15:10:12 +08:00
Catouse 85ba11c7ea * finish task #1959, #1958. 2014-12-10 09:50:56 +08:00
wangyidong 9409592b73 * finish task #2168. 2014-12-09 08:22:38 +00:00
wangyidong 20f7b6285f * ajdust code for task #2151. 2014-12-09 05:05:30 +00:00
Catouse da30077232 * disabled chart animation for ie8. 2014-12-08 17:40:45 +08:00
Catouse fe9562d816 * fix function name to detect browser type. 2014-12-08 15:16:09 +08:00
wangyidong d015ef75e7 * finish task #2168. 2014-12-04 09:07:18 +00:00
Catouse c0c65ce3b8 * disabled chart in ie8 with too many sparkline to draw. 2014-12-01 17:14:16 +08:00
Catouse a28f16a8b3 * change datetime picker position when there is no space to display on the bottom side. 2014-11-25 19:45:24 +08:00
Catouse 452c4088b9 * fixed a js error in kindeditor.html.php. 2014-11-18 11:52:07 +08:00
wangyidong 268435ebe5 * adjust for lang. 2014-11-07 02:35:49 +00:00
wangyidong a8be1e9649 * fix bug and adjust code. 2014-11-06 09:06:34 +00:00
wangyidong 64d6b19a4c * finish task #2119. 2014-11-04 07:49:10 +00:00
ChuJilu 6b0b665537 * finish task #2120. 2014-11-04 09:48:30 +08:00
wangyidong 303dbe844d * finish task #2141. 2014-11-03 06:12:00 +00:00
wangyidong 7c96bd88ee * finish task #2878. 2014-11-03 05:51:43 +00:00
Catouse 08dcd6d219 - removed excess text. 2014-10-31 14:19:14 +08:00